[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.40.102-1-2-g6baf87d
The following commit has been merged in the master branch: commit 81f3c9dd25e2d20b9a9d798dda701fb82a3266ce Author: Stephane Glondu st...@glondu.net Date: Sat May 11 12:02:54 2013 +0200 Bump Standards-Version to 3.9.4 diff --git a/debian/control b/debian/control index 59daf46..f1347b6 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: cdbs (= 0.4.23), librsvg2-bin (= 2.18.2), imagemagick, dh-ocaml (= 0.9.1) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/unison.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/unison.git Homepage: http://www.cis.upenn.edu/~bcpierce/unison/ -- unison 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] unison packaging branch, master, updated. debian/2.40.102-1-2-g6baf87d
The following commit has been merged in the master branch: commit 6baf87d8314aedd5c7443e03d3b2cc9ed5f80f36 Author: Stephane Glondu st...@glondu.net Date: Sat May 11 12:03:18 2013 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index e66830c..5e7af29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +unison (2.40.102-2) unstable; urgency=low + + * Bump Standards-Version to 3.9.4 + * Upload to unstable + + -- Stéphane Glondu glo...@debian.org Sat, 11 May 2013 12:03:12 +0200 + unison (2.40.102-1) experimental; urgency=low * New upstream release -- unison 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] unison packaging annotated tag, debian/2.40.102-2, created. debian/2.40.102-2
The annotated tag, debian/2.40.102-2 has been created at 368f722cdc98914c761149e7c7b1f0a1515d12c3 (tag) tagging 6baf87d8314aedd5c7443e03d3b2cc9ed5f80f36 (commit) replaces debian/2.40.102-1 tagged by Stephane Glondu on Sat May 11 12:08:41 2013 +0200 - Shortlog unison Debian release 2.40.102-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRjhipAAoJEHhT2k1JiBrTYo0QAJ+h4M8uulwR3xEGa4D/15S+ O5PXM2+b5Q+yQPBgNpHODoch8pJ1aTNZsyrNh6eQEAEqDsC5GQ3qJD1h0jqrZ4bC i/FA0r4h/wr8YD/I0vfDTYcDuhmkifIJmkEDXOC37MVacRD89BsA2IBTKZ/W4VqH omLnZxQvtufJTSII899uFCVBJveIvE/gUR9ObcCRpNOeRD5LhmUgVaxBoHOL4NbI at/v80tObV5wVBGBp8chDEr8JYXv8C7mqqHWL6e4RnXPhIuE9fHZ5pvom7RDe5no eqYq91nnMra0B+yiL6fZ4NxLesiJj6phJVxt9IxZ6gjhJnI85symRS9mda5XZwq2 rS5fwDKnuS2Xdma80+oKxd7/S0Wev9o4j4uGQtNLLajqGdGP59Urc/kIELrFGiKp tQcVuYNnJSlmuQ3ZFikuVHO8LjXBF0RBiTXhtF5ySiAXGIrluu3eXhRgXYthbaPi Z64xe/rc0Mlyrf5DOZZt8XVhTw7omAw4GNQBtCB8OrZk5KNeOzYaj641dOx30PnO qiOljJ+zKNZSZmgLAf7w4Q4RmUyafNjFijDMRh/D/fuMtb83vswlA6vEB3ZFcXGD ScJ/8mIJBHEg3QYTAYwMm4uTXq+I/tdEkFKqvlVrQS5BDktTTHuwfJR4n9gsCrcK Ym3ACm93x9vD+efp4p+q =+Tqa -END PGP SIGNATURE- Stephane Glondu (2): Bump Standards-Version to 3.9.4 Update changelog and prepare upload to unstable --- -- unison 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] unison packaging branch, 2.32.52/master, updated. debian/unison2.32.52-2.32.52-6-3-g4cd9b79
The following commit has been merged in the 2.32.52/master branch:
commit 9c6c0f28219106dd6af22c9fb35ff424a761ea66
Author: Stephane Glondu st...@glondu.net
Date: Sat May 11 12:28:43 2013 +0200
OCaml 4 hash compatibility
diff --git a/debian/patches/0008-OCaml-4-hash-compatibility.patch
b/debian/patches/0008-OCaml-4-hash-compatibility.patch
new file mode 100644
index 000..810727d
--- /dev/null
+++ b/debian/patches/0008-OCaml-4-hash-compatibility.patch
@@ -0,0 +1,151 @@
+From: Stephane Glondu st...@glondu.net
+Date: Sat, 11 May 2013 12:22:15 +0200
+Subject: OCaml 4 hash compatibility
+
+This is a backport of a patch introduced in Unison 2.40.102.
+
+Signed-off-by: Stephane Glondu st...@glondu.net
+---
+ name.ml |2 +-
+ path.ml |2 --
+ path.mli|1 -
+ props.ml|6 +++---
+ update.ml |4 ++--
+ uutil.ml|4
+ uutil.mli |2 ++
+ xferhint.ml |4 ++--
+ 8 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/name.ml b/name.ml
+index 020c496..3de893b 100644
+--- a/name.ml
b/name.ml
+@@ -42,4 +42,4 @@ let fromString s =
+ s
+
+ let hash n =
+- Hashtbl.hash (if Case.insensitive () then String.lowercase (Case.normalize
n) else n)
++ Uutil.hash (if Case.insensitive () then String.lowercase (Case.normalize n)
else n)
+diff --git a/path.ml b/path.ml
+index fb05bc3..05f9f3c 100644
+--- a/path.ml
b/path.ml
+@@ -191,8 +191,6 @@ let addPrefixToFinalName path prefix =
+ assert (not (isEmpty path));
+ prefix ^ path
+
+-let hash p = Hashtbl.hash p
+-
+ (* Pref controlling whether symlinks are followed. *)
+ let follow = Pred.create follow
+ (Including the preference \\texttt{-follow \\ARG{pathspec}} causes
Unison to \
+diff --git a/path.mli b/path.mli
+index dd75b05..5113fdd 100644
+--- a/path.mli
b/path.mli
+@@ -31,7 +31,6 @@ val addSuffixToFinalName : local - string - local
+ val addPrefixToFinalName : local - string - local
+
+ val compare : t - t - int
+-val hash : local - int
+
+ val followLink : local - bool
+
+diff --git a/props.ml b/props.ml
+index c4b9b84..8fad0b9 100644
+--- a/props.ml
b/props.ml
+@@ -277,7 +277,7 @@ let hash id h =
+ (match id with
+IdIgnored - -1
+ | IdNumeric i - i
+- | IdNamed nm - Hashtbl.hash nm)
++ | IdNamed nm - Uutil.hash nm)
+ h
+
+ let similar id id' =
+@@ -429,7 +429,7 @@ let moduloOneHour t =
+ let hash t h =
+ Uutil.hash2
+ (match t with
+- Synced f- Hashtbl.hash (moduloOneHour (approximate f))
++ Synced f- Uutil.hash (moduloOneHour (approximate f))
+ | NotSynced _ - 0)
+ h
+
+@@ -597,7 +597,7 @@ type t = string option
+
+ let dummy = None
+
+-let hash t h = Uutil.hash2 (Hashtbl.hash t) h
++let hash t h = Uutil.hash2 (Uutil.hash t) h
+
+ let similar t t' =
+ not (Prefs.read Osx.rsrc) || t = t'
+diff --git a/update.ml b/update.ml
+index 5e58f65..493bf7f 100644
+--- a/update.ml
b/update.ml
+@@ -234,9 +234,9 @@ let rec checkArchive (top: bool) (path: Path.t) (arch:
archive) (h: int): int =
+(checkArchive false (Path.child path n) a h))
+ children (Props.hash desc h)
+ | ArchiveFile (desc, dig, _, ress) -
+- Uutil.hash2 (Hashtbl.hash dig) (Props.hash desc h)
++ Uutil.hash2 (Uutil.hash dig) (Props.hash desc h)
+ | ArchiveSymlink content -
+- Uutil.hash2 (Hashtbl.hash content) h
++ Uutil.hash2 (Uutil.hash content) h
+ | NoArchive -
+ 135
+
+diff --git a/uutil.ml b/uutil.ml
+index 84d8762..75cf8cb 100644
+--- a/uutil.ml
b/uutil.ml
+@@ -34,6 +34,10 @@ let myNameAndVersion = myName ^ ^ myVersion
+
+ let hash2 x y = (17 * x + 257 * y) land 0x3FFF
+
++external hash_param : int - int - 'a - int = caml_hash_univ_param
noalloc
++
++let hash x = hash_param 10 100 x
++
+
(*)
+ (* File sizes
*)
+
(*)
+diff --git a/uutil.mli b/uutil.mli
+index 369e577..f7dd78e 100644
+--- a/uutil.mli
b/uutil.mli
+@@ -13,6 +13,8 @@ val myNameAndVersion : string
+
+ (* Hashing *)
+ val hash2 : int - int - int
++(* Hash function (OCaml 3.x version) *)
++val hash : 'a - int
+
+ module type FILESIZE = sig
+ type t
+diff --git a/xferhint.ml b/xferhint.ml
+index abe3dd6..ad74fb4 100644
+--- a/xferhint.ml
b/xferhint.ml
+@@ -32,7 +32,7 @@ module PathMap =
+ (struct
+type t = Fspath.t * Path.local
+let hash (fspath, path) =
+- (Hashtbl.hash (Fspath.toString fspath) + 13217 * Path.hash path)
++ (Uutil.hash (Fspath.toString fspath) + 13217 * Uutil.hash path)
+land
+ 0x3FFF
+let equal = (=)
+@@ -41,7 +41,7 @@ module FPMap =
+ Hashtbl.Make
+ (struct
+type t = Os.fullfingerprint
+- let hash = Hashtbl.hash
++ let hash = Uutil.hash
+
[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, 2.32.52/master, updated. debian/unison2.32.52-2.32.52-6-3-g4cd9b79
The following commit has been merged in the 2.32.52/master branch: commit 4cd9b79141d5ff6b69c4cc9225a0a96fb31cfb28 Author: Stephane Glondu st...@glondu.net Date: Sat May 11 12:30:17 2013 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index a9f158a..fc7863e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +unison2.32.52 (2.32.52-7) unstable; urgency=low + + * Backport a patch from Unison 2.40.102 to fix compatibility with +OCaml = 4 + + -- Stéphane Glondu glo...@debian.org Sat, 11 May 2013 12:30:14 +0200 + unison2.32.52 (2.32.52-6) unstable; urgency=low * Suggest unison-all -- unison 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] unison packaging branch, 2.32.52/master, updated. debian/unison2.32.52-2.32.52-6-3-g4cd9b79
The following commit has been merged in the 2.32.52/master branch: commit 0ce47ea3be50a68729907f6d1ee8cace1e945574 Author: Stephane Glondu st...@glondu.net Date: Sat May 11 12:13:57 2013 +0200 Refresh patches diff --git a/debian/patches/0001-Typo-in-ignore-Regex-help.patch b/debian/patches/0001-Typo-in-ignore-Regex-help.patch index 5213e2e..5c446df 100644 --- a/debian/patches/0001-Typo-in-ignore-Regex-help.patch +++ b/debian/patches/0001-Typo-in-ignore-Regex-help.patch @@ -5,7 +5,7 @@ Subject: Typo in ignore Regex help Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=129478 --- strings.ml |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings.ml b/strings.ml index 36861d9..1275399 100644 diff --git a/debian/patches/0002-Fix-obsolete-help-about-ssh.patch b/debian/patches/0002-Fix-obsolete-help-about-ssh.patch index 6c81352..309f88a 100644 --- a/debian/patches/0002-Fix-obsolete-help-about-ssh.patch +++ b/debian/patches/0002-Fix-obsolete-help-about-ssh.patch @@ -5,7 +5,7 @@ Subject: Fix obsolete help about ssh Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=137960 --- strings.ml | 11 --- - 1 files changed, 4 insertions(+), 7 deletions(-) + 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/strings.ml b/strings.ml index 1275399..b856170 100644 diff --git a/debian/patches/0003-Typo-missing-o-in-follow.patch b/debian/patches/0003-Typo-missing-o-in-follow.patch index b000e4b..10d6913 100644 --- a/debian/patches/0003-Typo-missing-o-in-follow.patch +++ b/debian/patches/0003-Typo-missing-o-in-follow.patch @@ -5,7 +5,7 @@ Subject: Typo: missing o in follow Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466173 --- strings.ml |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings.ml b/strings.ml index b856170..0976703 100644 diff --git a/debian/patches/0004-Fix-silent-behaviour.patch b/debian/patches/0004-Fix-silent-behaviour.patch index c9ea757..3363465 100644 --- a/debian/patches/0004-Fix-silent-behaviour.patch +++ b/debian/patches/0004-Fix-silent-behaviour.patch @@ -5,7 +5,7 @@ Subject: Fix -silent behaviour Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=497729 --- uitext.ml |3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uitext.ml b/uitext.ml index d00fd7e..cc6a839 100644 diff --git a/debian/patches/0005-Fix-build-with-OCaml-3.12.patch b/debian/patches/0005-Fix-build-with-OCaml-3.12.patch index 3a87f3f..e29e0dc 100644 --- a/debian/patches/0005-Fix-build-with-OCaml-3.12.patch +++ b/debian/patches/0005-Fix-build-with-OCaml-3.12.patch @@ -5,7 +5,7 @@ Subject: Fix build with OCaml 3.12 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585453 --- update.mli |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.mli b/update.mli index dc1e018..c99c704 100644 diff --git a/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch b/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch index c839105..f2dc637 100644 --- a/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch +++ b/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch @@ -6,7 +6,7 @@ Origin: https://bugs.archlinux.org/task/20877 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620031 --- terminal.ml |1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) diff --git a/terminal.ml b/terminal.ml index 657f3d2..aafa425 100644 diff --git a/debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch b/debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch index 907276d..4647195 100644 --- a/debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch +++ b/debian/patches/0007-Fix-link-order-to-list-C-objects-before-the-librarie.patch @@ -8,7 +8,7 @@ Last-Update: 2011-09-10 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657423 --- Makefile.OCaml |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.OCaml b/Makefile.OCaml index 00d6756..0fec866 100644 -- unison 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] extlib packaging branch, master, updated. debian/1.5.2-1-9-g4259745
The following commit has been merged in the master branch: commit 3a527ff71695ac1a9d3240ec839378dd6309520b Merge: f0ab99a4f80d3f6d84736bdb13a09402a8ba6c55 b41472c90f70ea675f05913994b94568db5ab29e Author: Lifeng Sun lifong...@gmail.com Date: Sun May 12 07:44:52 2013 +0800 Merge tag 'upstream/1.5.4' Upstream version 1.5.4 -- extlib 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] extlib packaging branch, pristine-tar, updated. c73f5240cb2c1180afb1bff2390797dec7c59c73
The following commit has been merged in the pristine-tar branch: commit c73f5240cb2c1180afb1bff2390797dec7c59c73 Author: Lifeng Sun lifong...@gmail.com Date: Sun May 12 07:44:52 2013 +0800 pristine-tar data for extlib_1.5.4.orig.tar.gz diff --git a/extlib_1.5.4.orig.tar.gz.delta b/extlib_1.5.4.orig.tar.gz.delta new file mode 100644 index 000..f3680d7 Binary files /dev/null and b/extlib_1.5.4.orig.tar.gz.delta differ diff --git a/extlib_1.5.4.orig.tar.gz.id b/extlib_1.5.4.orig.tar.gz.id new file mode 100644 index 000..e05fee3 --- /dev/null +++ b/extlib_1.5.4.orig.tar.gz.id @@ -0,0 +1 @@ +05a981182d01faf989291a1e0b55a1de04d9846f -- extlib 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] extlib packaging branch, master, updated. debian/1.5.2-1-9-g4259745
The following commit has been merged in the master branch: commit 4259745932e4e1b56a9c00be334ab5613e5d7bd6 Author: Lifeng Sun lifong...@gmail.com Date: Sun May 12 07:48:08 2013 +0800 Bump Standards-Version to 3.9.4. diff --git a/debian/changelog b/debian/changelog index e1c7440..707d3b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -extlib (1.5.4-1) UNRELEASED; urgency=low +extlib (1.5.4-1) unstable; urgency=low [ Mehdi Dogguy ] * Team upload. @@ -7,6 +7,7 @@ extlib (1.5.4-1) UNRELEASED; urgency=low [ Lifeng Sun ] * New upstream release. + * Bump Standards-Version to 3.9.4. -- Lifeng Sun lifong...@gmail.com Sun, 12 May 2013 07:46:22 +0800 diff --git a/debian/control b/debian/control index 2da5eb1..a323012 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (= 8), cdbs, dh-ocaml (= 0.9) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/extlib.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/extlib.git Homepage: http://code.google.com/p/ocaml-extlib/ -- extlib 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] extlib packaging annotated tag, upstream/1.5.4, created. upstream/1.5.4
The annotated tag, upstream/1.5.4 has been created at 0a847af24337485727f79d8578fdd1eb30f67476 (tag) tagging b41472c90f70ea675f05913994b94568db5ab29e (commit) replaces upstream/1.5.2 tagged by Lifeng Sun on Sun May 12 07:44:52 2013 +0800 - Shortlog Upstream version 1.5.4 Lifeng Sun (1): Imported Upstream version 1.5.4 --- -- extlib 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 lifong...@gmail.com 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
[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 lifong...@gmail.com 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 $ *) -#loadunix.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 c6fd9fc59cfaf79d8e9cf12ed3ece9180cfb1021 Author: Lifeng Sun lifong...@gmail.com 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 me...@debian.org Mon, 22 Feb 2010 21:07:43 +0100 + -- Lifeng Sun lifong...@gmail.com 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 e914f0b97dc42c4c9a4110cc40f650c17fce9777 Author: Lifeng Sun lifong...@gmail.com 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 garri...@kurims.kyoto-u.ac.jp -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 garri...@kurims.kyoto-u.ac.jp + 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 d03717707b51d3b2bcb01b60c001868eb5514dc9 Author: Lifeng Sun lifong...@gmail.com 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, pristine-tar, updated. 1c7de9e4ca19b174f71fee10beafb1d6bd52b3d5
The following commit has been merged in the pristine-tar branch: commit 1c7de9e4ca19b174f71fee10beafb1d6bd52b3d5 Author: Lifeng Sun lifong...@gmail.com Date: Wed May 8 19:07:56 2013 +0800 pristine-tar data for lablgl_20120306.orig.tar.gz diff --git a/lablgl_20120306.orig.tar.gz.delta b/lablgl_20120306.orig.tar.gz.delta new file mode 100644 index 000..c4abbd2 Binary files /dev/null and b/lablgl_20120306.orig.tar.gz.delta differ diff --git a/lablgl_20120306.orig.tar.gz.id b/lablgl_20120306.orig.tar.gz.id new file mode 100644 index 000..89e4b33 --- /dev/null +++ b/lablgl_20120306.orig.tar.gz.id @@ -0,0 +1 @@ +4de09efbb6939348342a440c40a3c5e6ca8f -- 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 annotated tag, upstream/20120306, created. upstream/20120306
The annotated tag, upstream/20120306 has been created at f1abf1c1b6c507deed1fff337d17f9a538f8b7fd (tag) tagging f103ecfb7cabb7d5a54c583952a4a867a4891f0e (commit) replaces upstream/1.04 tagged by Lifeng Sun on Wed May 8 19:07:56 2013 +0800 - Shortlog Upstream version 20120306 Lifeng Sun (1): Imported Upstream version 20120306 --- -- 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] lablgtk2 packaging branch, master, updated. debian/2.14.2+dfsg-3-7-g4cc6e9c
The following commit has been merged in the master branch: commit 78a98fad766c88b8fb655ae0e53b086069f8921c Author: Lifeng Sun lifong...@gmail.com Date: Sun May 12 08:30:34 2013 +0800 Fix install path. diff --git a/debian/liblablgtk2-gl-ocaml.install.in b/debian/liblablgtk2-gl-ocaml.install.in index f6f3e64..0ae766f 100644 --- a/debian/liblablgtk2-gl-ocaml.install.in +++ b/debian/liblablgtk2-gl-ocaml.install.in @@ -1,4 +1,4 @@ debian/META.lablgtk2-gl@OCamlStdlibDir@/METAS -@OCamlDllDir@/dlllablgtkgl2.so +@OCamlStdlibDir@/lablgtk2/dlllablgtkgl2.so @OCamlDllDir@ @OCamlStdlibDir@/lablgtk2/lablgtkgl.cma DYN: @OCamlStdlibDir@/lablgtk2/lablgtkgl.cmxs diff --git a/debian/liblablgtk2-gnome-ocaml.install.in b/debian/liblablgtk2-gnome-ocaml.install.in index d55fb33..538c9ac 100644 --- a/debian/liblablgtk2-gnome-ocaml.install.in +++ b/debian/liblablgtk2-gnome-ocaml.install.in @@ -1,7 +1,7 @@ debian/META.lablgtk2-gnome@OCamlStdlibDir@/METAS -@OCamlDllDir@/dlllablgnomecanvas.so -@OCamlDllDir@/dlllablgnomeui.so -@OCamlDllDir@/dlllablrsvg.so +@OCamlStdlibDir@/lablgtk2/dlllablgnomecanvas.so @OCamlDllDir@ +@OCamlStdlibDir@/lablgtk2/dlllablgnomeui.so @OCamlDllDir@ +@OCamlStdlibDir@/lablgtk2/dlllablrsvg.so @OCamlDllDir@ @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cma @OCamlStdlibDir@/lablgtk2/lablgnomeui.cma @OCamlStdlibDir@/lablgtk2/lablrsvg.cma diff --git a/debian/liblablgtk2-ocaml.install.in b/debian/liblablgtk2-ocaml.install.in index d06c709..d20b23d 100644 --- a/debian/liblablgtk2-ocaml.install.in +++ b/debian/liblablgtk2-ocaml.install.in @@ -1,7 +1,7 @@ -debian/META @OCamlStdlibDir@/lablgtk2 -@OCamlDllDir@/dlllablgtkspell.so -@OCamlDllDir@/dlllablglade2.so -@OCamlDllDir@/dlllablgtk2.so +debian/META @OCamlStdlibDir@/lablgtk2 +@OCamlStdlibDir@/lablgtk2/dlllablgtkspell.so @OCamlDllDir@ +@OCamlStdlibDir@/lablgtk2/dlllablglade2.so @OCamlDllDir@ +@OCamlStdlibDir@/lablgtk2/dlllablgtk2.so @OCamlDllDir@ @OCamlStdlibDir@/lablgtk2/lablglade.cma @OCamlStdlibDir@/lablgtk2/lablgtk.cma @OCamlStdlibDir@/lablgtk2/lablgtkspell.cma diff --git a/debian/liblablgtksourceview2-ocaml.install.in b/debian/liblablgtksourceview2-ocaml.install.in index 8722f99..b08101c 100644 --- a/debian/liblablgtksourceview2-ocaml.install.in +++ b/debian/liblablgtksourceview2-ocaml.install.in @@ -1,4 +1,4 @@ debian/META.lablgtksourceview2 @OCamlStdlibDir@/METAS -@OCamlDllDir@/dlllablgtksourceview2.so +@OCamlStdlibDir@/lablgtk2/dlllablgtksourceview2.so @OCamlDllDir@ @OCamlStdlibDir@/lablgtk2/lablgtksourceview2.cma DYN: @OCamlStdlibDir@/lablgtk2/lablgtksourceview2.cmxs diff --git a/debian/patches/0002-fix-install-path.patch b/debian/patches/0002-fix-install-path.patch new file mode 100644 index 000..dbaf12d --- /dev/null +++ b/debian/patches/0002-fix-install-path.patch @@ -0,0 +1,14 @@ +--- a/src/Makefile b/src/Makefile +@@ -427,9 +427,9 @@ + then \ + echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \ + fi` +- $(RANLIB) $(CLIBS:%=`ocamlfind query lablgtk2 | tr -d '\r'`/%) ++ $(RANLIB) $(CLIBS:%=$(OCAMLFIND_DESTDIR)/lablgtk2/%) + @if test -f lablgtk.cmxa; \ +-then ($(RANLIB) $(MLLIBS:%.cma=`ocamlfind query lablgtk2 | tr -d '\r'`/%$(XA)) $(EXTRA_MLLIBS:%.cma=`ocamlfind query lablgtk2 | tr -d '\r'`/%$(XA)) ); fi ++then ($(RANLIB) $(MLLIBS:%.cma=$(OCAMLFIND_DESTDIR)/lablgtk2/%$(XA)) $(EXTRA_MLLIBS:%.cma=$(OCAMLFIND_DESTDIR)/lablgtk2/%$(XA)) ); fi + rm lablgtk2$(XB) + $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB) + cp lablgtk2$(XB) $(BINDIR) diff --git a/debian/patches/series b/debian/patches/series index 08b30ba..53b7513 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Disable-svgz.patch +0002-fix-install-path.patch diff --git a/debian/rules b/debian/rules index 1b03dd0..3e7717e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,8 @@ include /usr/share/ocaml/ocamlvars.mk DESTDIR := $(CURDIR)/debian/tmp +export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_LDCONF=ignore %: dh $@ --with ocaml @@ -33,6 +35,7 @@ override_dh_auto_clean: .PHONY: override_dh_auto_install override_dh_auto_install: + mkdir -p '$(OCAMLFIND_DESTDIR)' $(MAKE) install DESTDIR=$(DESTDIR) # remove files related to gtksourceview1 (uncompiled anyway... and # make dh_ocamldoc fail) -- lablgtk2 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] lablgtk2 packaging branch, master, updated. debian/2.14.2+dfsg-3-7-g4cc6e9c
The following commit has been merged in the master branch: commit 22d6bf6a50e1210662e673c315bbb9d17f7040cd Author: Lifeng Sun lifong...@gmail.com Date: Sun May 12 08:28:08 2013 +0800 New upstream release. diff --git a/debian/changelog b/debian/changelog index 7eee313..b2d5b36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -lablgtk2 (2.14.2+dfsg-4) UNRELEASED; urgency=low +lablgtk2 (2.16.0+dfsg-1) UNRELEASED; urgency=low + [ Lifeng Sun ] + * Team upload. + * New upstream release. + + [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders - -- Sylvain Le Gall gil...@debian.org Fri, 21 Sep 2012 01:15:45 + + -- Lifeng Sun lifong...@gmail.com Sun, 12 May 2013 08:27:39 +0800 lablgtk2 (2.14.2+dfsg-3) unstable; urgency=low -- lablgtk2 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] lablgtk2 packaging branch, pristine-tar, updated. 4c18dc82f906ba7fc3e7ec3121a52cdefc95d471
The following commit has been merged in the pristine-tar branch: commit 4c18dc82f906ba7fc3e7ec3121a52cdefc95d471 Author: Lifeng Sun lifong...@gmail.com Date: Tue May 7 18:38:18 2013 +0800 pristine-tar data for lablgtk2_2.16.0+dfsg.orig.tar.gz diff --git a/lablgtk2_2.16.0+dfsg.orig.tar.gz.delta b/lablgtk2_2.16.0+dfsg.orig.tar.gz.delta new file mode 100644 index 000..422d891 Binary files /dev/null and b/lablgtk2_2.16.0+dfsg.orig.tar.gz.delta differ diff --git a/lablgtk2_2.16.0+dfsg.orig.tar.gz.id b/lablgtk2_2.16.0+dfsg.orig.tar.gz.id new file mode 100644 index 000..1ce13fd --- /dev/null +++ b/lablgtk2_2.16.0+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +555b407d2b5a29feb8f155e6a333ea5cad15f6cd -- lablgtk2 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] lablgtk2 packaging branch, master, updated. debian/2.14.2+dfsg-3-7-g4cc6e9c
The following commit has been merged in the master branch: commit 13adf9469527929b0b067ecc10d639041f6a88df Merge: b4732fa83a3b99106d1c5091aafcf39a333f2755 3ab5891cc585078162a9fbc347481f99eb579654 Author: Lifeng Sun lifong...@gmail.com Date: Tue May 7 18:38:26 2013 +0800 Merge tag 'upstream/2.16.0+dfsg' Upstream version 2.16.0+dfsg Conflicts: -- lablgtk2 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] lablgtk2 packaging branch, master, updated. debian/2.14.2+dfsg-3-8-g50a4c0d
The following commit has been merged in the master branch: commit 50a4c0d638a2770a0a83579e637b6ba294da109b Author: Lifeng Sun lifong...@gmail.com Date: Sun May 12 09:00:58 2013 +0800 Build depends on ocaml-findlib. diff --git a/debian/changelog b/debian/changelog index 975d803..f4509e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lablgtk2 (2.16.0+dfsg-1) unstable; urgency=low * Team upload. * New upstream release. * Bump Standards-Version to 3.9.4. + * Build depends on ocaml-findlib. [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders diff --git a/debian/control b/debian/control index fc71f76..8b74491 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,8 @@ Build-Depends: libgnomecanvas2-dev, libgtkspell-dev, libgnomeui-dev, - libgtksourceview2.0-dev (= 2.10) + libgtksourceview2.0-dev (= 2.10), + ocaml-findlib Standards-Version: 3.9.4 Homepage: http://forge.ocamlcore.org/projects/lablgtk/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git -- lablgtk2 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
