[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch:
commit 34d12626730dd16b1be74f158e1eb17572b59aa7
Author: Lifeng Sun
Date: Sun May 12 08:15:58 2013 +0800
Revise package description.
diff --git a/debian/control b/debian/control
index 8498c78..b8d43cd 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Provides: ${ocaml:Provides}
-Description: an OpenGL interface for Objective Caml
+Description: OpenGL interface for Objective Caml
LablGL gives access to the OpenGL interface from Objective Caml. Since it
includes support for the Togl widget, you can comfortably use it with
LablTk. A GtkGlarea binding for use with lablgtk is also provided.
--
lablgl packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch: commit d03717707b51d3b2bcb01b60c001868eb5514dc9 Author: Lifeng Sun Date: Sun May 12 08:16:46 2013 +0800 Bump Standards-Version to 3.9.4. diff --git a/debian/changelog b/debian/changelog index b1cb3fd..fec4a64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -lablgl (20120306-1) UNRELEASED; urgency=low +lablgl (20120306-1) unstable; urgency=low [ Lifeng Sun ] * Team upload. * New upstream release. + * Bump Standards-Version to 3.9.4. [ Ralf Treinen ] * Minor language corrections in package descriptions. diff --git a/debian/control b/debian/control index b8d43cd..4e7bf97 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends: xsltproc, camlp4, dh-ocaml (>= 0.9) -Standards-Version: 3.8.3 +Standards-Version: 3.9.4 Homepage: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgl.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lablgl.git -- lablgl packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch: commit e914f0b97dc42c4c9a4110cc40f650c17fce9777 Author: Lifeng Sun Date: Sun May 12 08:14:14 2013 +0800 Include BSD license verbatim. diff --git a/debian/copyright b/debian/copyright index 941e51f..78c87cc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,16 +3,36 @@ Sun, 3 Dec 2000 11:06:58 +0100. It was downloaded from: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html -Upstream Authors: -Jacques Garrigue -Isaac Trotts -Erick Tryzelaar -Christophe Raffali - -Copyright (c) 1997-2001 Jacques Garrigue and Kyoto University. - -LablGL is distributed under the terms of a BSD style licence, which can be -found in the /usr/share/common-licenses/BSD file on debian systems. +Files: * +Copyright: 1997-2001 Jacques Garrigue + 1997-2001 Kyoto University. + Isaac Trotts + Erick Tryzelaar + Christophe Raffali +License: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors +may be used to endorse or promote products derived from this software +without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. Other copyright holders: LablGlut/examples/caml-images/OCamlMakefile: -- lablgl packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch: commit df58fa429c5d2c86fd63516a3f16104856c56eae Author: Lifeng Sun Date: Sun May 12 07:56:13 2013 +0800 Revert commit a6a7309dff692a14a43856c7b4e772b9040854bf. diff --git a/Togl/examples/Makefile b/Togl/examples/Makefile index da2168f..86fe6ca 100644 --- a/Togl/examples/Makefile +++ b/Togl/examples/Makefile @@ -1,16 +1,4 @@ # Makefile for examples subdir -PACKAGES = lablgl.togl,unix -DERIVEDML = $(patsubst %.ml.gz,%.ml,$(wildcard *.ml.gz)) - -all: $(patsubst %.ml,%.opt,$(wildcard *.ml) $(DERIVEDML)) - -%.ml : %.ml.gz - gunzip -c $^ > $@ - -%.opt : %.ml - ocamlfind ocamlopt -package $(PACKAGES) -c $^ - ocamlfind ocamlopt -package $(PACKAGES) -linkpkg -o $@ $^ - clean: - rm -f *.cm* *.o *.opt $(DERIVEDML) + rm -f *.cm* *.o *.opt diff --git a/Togl/examples/planet.ml b/Togl/examples/planet.ml index 9d84849..0a0f3fb 100644 --- a/Togl/examples/planet.ml +++ b/Togl/examples/planet.ml @@ -1,6 +1,6 @@ (* $Id: planet.ml,v 1.17 2001-09-07 06:50:01 garrigue Exp $ *) -open Unix +#load"unix.cma";; class planet togl = object (self) val togl = togl -- lablgl packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch: commit c6fd9fc59cfaf79d8e9cf12ed3ece9180cfb1021 Author: Lifeng Sun Date: Sun May 12 07:58:19 2013 +0800 New upstream release. diff --git a/debian/changelog b/debian/changelog index c28d10b..b1cb3fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,8 @@ -lablgl (1.04-6) UNRELEASED; urgency=low +lablgl (20120306-1) UNRELEASED; urgency=low + + [ Lifeng Sun ] + * Team upload. + * New upstream release. [ Ralf Treinen ] * Minor language corrections in package descriptions. @@ -11,7 +15,7 @@ lablgl (1.04-6) UNRELEASED; urgency=low [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders - -- Mehdi Dogguy Mon, 22 Feb 2010 21:07:43 +0100 + -- Lifeng Sun Sun, 12 May 2013 07:57:28 +0800 lablgl (1.04-5) unstable; urgency=low -- lablgl packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch: commit 473853e178fc175dcec79047b104207e80dbbb4b Author: Lifeng Sun Date: Sun May 12 07:59:24 2013 +0800 Refresh patchset. diff --git a/debian/patches/compilation-examples b/debian/patches/compilation-examples index 2f3075b..7e035c2 100644 --- a/debian/patches/compilation-examples +++ b/debian/patches/compilation-examples @@ -4,10 +4,8 @@ Fixes-bug: #425465 Description: make examples compile via "make" Sent-to-upstream: to Jacques Garrigue by Ralf Treinen, Dec 3 2009 -Index: lablgl/Togl/examples/Makefile -=== lablgl.orig/Togl/examples/Makefile 2009-12-03 21:44:29.0 +0100 -+++ lablgl/Togl/examples/Makefile 2009-12-03 21:45:29.0 +0100 +--- a/Togl/examples/Makefile b/Togl/examples/Makefile @@ -1,4 +1,16 @@ # Makefile for examples subdir @@ -26,12 +24,10 @@ Index: lablgl/Togl/examples/Makefile clean: - rm -f *.cm* *.o *.opt + rm -f *.cm* *.o *.opt $(DERIVEDML) -Index: lablgl/Togl/examples/planet.ml -=== lablgl.orig/Togl/examples/planet.ml2009-12-03 21:44:34.0 +0100 -+++ lablgl/Togl/examples/planet.ml 2009-12-03 21:44:39.0 +0100 +--- a/Togl/examples/planet.ml b/Togl/examples/planet.ml @@ -1,6 +1,6 @@ - (* $Id: planet.ml,v 1.17 2001/09/07 06:50:01 garrigue Exp $ *) + (* $Id: planet.ml,v 1.17 2001-09-07 06:50:01 garrigue Exp $ *) -#load"unix.cma";; +open Unix -- lablgl packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch: commit 6ba950e9f4e63695848d786232f5b6b1123a87bc Merge: 4206f57db902e9bd840fae2f16866e02bdaa63f2 f103ecfb7cabb7d5a54c583952a4a867a4891f0e Author: Lifeng Sun Date: Wed May 8 19:07:56 2013 +0800 Merge tag 'upstream/20120306' Upstream version 20120306 diff --combined Togl/examples/planet.ml index 751cf94,0a0f3fb..9d84849 --- a/Togl/examples/planet.ml +++ b/Togl/examples/planet.ml @@@ -1,6 -1,6 +1,6 @@@ - (* $Id: planet.ml,v 1.17 2001/09/07 06:50:01 garrigue Exp $ *) + (* $Id: planet.ml,v 1.17 2001-09-07 06:50:01 garrigue Exp $ *) -#load"unix.cma";; +open Unix class planet togl = object (self) val togl = togl -- lablgl packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-5-19-gd037177
The following commit has been merged in the master branch: commit 3fdfb86889e0f6c44b30695255ef35df009ab3c4 Author: Lifeng Sun Date: Sun May 12 07:58:45 2013 +0800 Revise watch file. diff --git a/debian/watch b/debian/watch index 43ba6ea..822b713 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html dist/lablgl-([0-9]\..*)\.tar\.gz +https://forge.ocamlcore.org/frs/?group_id=291 .*/lablgl-([0-9\.]*)\.tar\.gz -- lablgl packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
