[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 676cc7a1dcf1634005c67f76f17390cc8fe44f00 Merge: ff61c7f8b0cbe6f0173720e08a63142a3146cc53 86535d84cc3cffeee1dcd8545343f234e7285530 Author: Stephane Glondu Date: Mon Jun 4 12:29:12 2012 +0200 Merge tag 'upstream/8.4_gamma0+really8.4beta2+dfsg' into experimental/master Upstream version 8.4~gamma0+really8.4beta2+dfsg -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 3a10a27a477f3df2f3f51a1011fef318ff4f5f58 Author: Stephane Glondu Date: Mon Jun 4 12:26:25 2012 +0200 New upstream beta release diff --git a/debian/changelog b/debian/changelog index 5f36510..698bd42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coq (8.4~gamma0+really8.4beta2+dfsg-1) UNRELEASED; urgency=low + + * New upstream beta release + + -- Stéphane Glondu Mon, 04 Jun 2012 12:26:18 +0200 + coq (8.4~beta+dfsg-4) experimental; urgency=low * Recompile with camlp5 6.05 (no changes) -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 4c3793181d62c1e4c883cea7547ee04ea423fbe4 Author: Stephane Glondu Date: Mon Jun 4 12:28:06 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Add-distclean-back-to-test-suite-Makefile.patch b/debian/patches/0001-Add-distclean-back-to-test-suite-Makefile.patch deleted file mode 100644 index 80cd27a..000 --- a/debian/patches/0001-Add-distclean-back-to-test-suite-Makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Stephane Glondu -Date: Thu, 12 Jan 2012 16:30:10 +0100 -Subject: Add distclean back to test-suite/Makefile - - test-suite/Makefile |3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/test-suite/Makefile b/test-suite/Makefile -index cd5886f..f3013c0 100644 a/test-suite/Makefile -+++ b/test-suite/Makefile -@@ -97,6 +97,9 @@ clean: - -name '*.stamp' -o -name '*.vo' -o -name '*.log' \ - \) -print0 | xargs -0 rm -f - -+distclean: clean -+ $(HIDE)find . -name '*.log' -print0 | xargs -0 rm -f -+ - ### - # Per-subsystem targets - ### --- diff --git a/debian/patches/0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch similarity index 94% rename from debian/patches/0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch rename to debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch index 6969f7d..722ab00 100644 --- a/debian/patches/0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch +++ b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch @@ -5,7 +5,7 @@ Subject: test-suite/success/Nsatz.v: comment out Ceva This lemma uses too much memory for many buildds... --- test-suite/success/Nsatz.v |2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) diff --git a/test-suite/success/Nsatz.v b/test-suite/success/Nsatz.v index d316e4a..d783b2a 100644 diff --git a/debian/patches/0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch b/debian/patches/0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch deleted file mode 100644 index 3307023..000 --- a/debian/patches/0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Stephane Glondu -Date: Sat, 14 Jan 2012 01:24:30 +0100 -Subject: coq_micromega.ml: fix order of recursive calls to rconstant - -Some tests were failing on architectures without native code because -the evaluation order of arguments in a function call is not the same -on bytecode, leading to different behaviours for the psatzl tactic. - plugins/micromega/coq_micromega.ml |8 ++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/plugins/micromega/coq_micromega.ml b/plugins/micromega/coq_micromega.ml -index 1ad49bb..543ab1b 100644 a/plugins/micromega/coq_micromega.ml -+++ b/plugins/micromega/coq_micromega.ml -@@ -991,8 +991,12 @@ struct - else raise ParseError - | App(op,args) -> - begin --try -- (assoc_const op rconst_assoc) (rconstant args.(0)) (rconstant args.(1)) -+try -+(* the evaluation order is important in the following *) -+let f = assoc_const op rconst_assoc in -+let a = rconstant args.(0) in -+let b = rconstant args.(1) in -+f a b - with - ParseError -> - match op with --- diff --git a/debian/patches/series b/debian/patches/series index b0df385..53d51a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -0001-Add-distclean-back-to-test-suite-Makefile.patch -0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch -0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch +0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit c467035933a683a7b7ac214fc511604735f15e7f Author: Stephane Glondu Date: Mon Jun 4 14:18:02 2012 +0200 Update ABI diff --git a/debian/rules b/debian/rules index 4ed4e3a..d885ece 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT= PACKAGES := $(shell dh_listpackages) -COQ_VERSION := 8.4beta +COQ_VERSION := 8.4beta2 COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI) CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \ -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 9ba360bc40800295fd8f706a4d561805c2e4c8db Author: Stephane Glondu Date: Mon Jun 4 15:03:22 2012 +0200 Dp plugin has been dropped diff --git a/debian/libcoq-ocaml.install.in b/debian/libcoq-ocaml.install.in index c650772..07fca0a 100644 --- a/debian/libcoq-ocaml.install.in +++ b/debian/libcoq-ocaml.install.in @@ -13,7 +13,6 @@ usr/lib/coq/plugins/syntax/ascii_syntax_plugin.cma usr/lib/coq/plugins/funind/recdef_plugin.cma usr/lib/coq/plugins/nsatz/nsatz_plugin.cma usr/lib/coq/plugins/xml/xml_plugin.cma -usr/lib/coq/plugins/dp/dp_plugin.cma usr/lib/coq/plugins/romega/romega_plugin.cma usr/lib/coq/plugins/firstorder/ground_plugin.cma usr/lib/coq/plugins/subtac/subtac_plugin.cma @@ -37,7 +36,6 @@ DYN: usr/lib/coq/plugins/syntax/ascii_syntax_plugin.cmxs DYN: usr/lib/coq/plugins/funind/recdef_plugin.cmxs DYN: usr/lib/coq/plugins/nsatz/nsatz_plugin.cmxs DYN: usr/lib/coq/plugins/xml/xml_plugin.cmxs -DYN: usr/lib/coq/plugins/dp/dp_plugin.cmxs DYN: usr/lib/coq/plugins/romega/romega_plugin.cmxs DYN: usr/lib/coq/plugins/firstorder/ground_plugin.cmxs DYN: usr/lib/coq/plugins/subtac/subtac_plugin.cmxs -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 509d6d4b58f50b86ca482d49fb6b2fee7fc3dfe9 Author: Stephane Glondu Date: Tue Jun 5 07:38:34 2012 +0200 Prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index 698bd42..a67dc78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -coq (8.4~gamma0+really8.4beta2+dfsg-1) UNRELEASED; urgency=low +coq (8.4~gamma0+really8.4beta2+dfsg-1) experimental; urgency=low * New upstream beta release - -- Stéphane Glondu Mon, 04 Jun 2012 12:26:18 +0200 + -- Stéphane Glondu Tue, 05 Jun 2012 07:38:25 +0200 coq (8.4~beta+dfsg-4) experimental; urgency=low -- coq 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] coq packaging branch, pristine-tar, updated. 3062db87a56cf1e4af52466720793441076814df
The following commit has been merged in the pristine-tar branch: commit 2e05cd4282367de0ac40d4db953c41cd727b1cbf Author: Stephane Glondu Date: Mon Jun 4 12:07:56 2012 +0200 pristine-tar data for coq_8.4~gamma0+really8.4beta2.orig.tar.gz diff --git a/coq_8.4~gamma0+really8.4beta2.orig.tar.gz.delta b/coq_8.4~gamma0+really8.4beta2.orig.tar.gz.delta new file mode 100644 index 000..83f0517 Binary files /dev/null and b/coq_8.4~gamma0+really8.4beta2.orig.tar.gz.delta differ diff --git a/coq_8.4~gamma0+really8.4beta2.orig.tar.gz.id b/coq_8.4~gamma0+really8.4beta2.orig.tar.gz.id new file mode 100644 index 000..0f0f647 --- /dev/null +++ b/coq_8.4~gamma0+really8.4beta2.orig.tar.gz.id @@ -0,0 +1 @@ +d88d05baf35b9b09a034233300f35a694f9fa6c2 -- coq 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] coq packaging branch, pristine-tar, updated. 3062db87a56cf1e4af52466720793441076814df
The following commit has been merged in the pristine-tar branch: commit 3062db87a56cf1e4af52466720793441076814df Author: Stephane Glondu Date: Tue Jun 5 09:54:43 2012 +0200 pristine-tar data for coq_8.4~gamma0+really8.4beta2+dfsg.orig.tar.gz diff --git a/coq_8.4~gamma0+really8.4beta2+dfsg.orig.tar.gz.delta b/coq_8.4~gamma0+really8.4beta2+dfsg.orig.tar.gz.delta new file mode 100644 index 000..274ad69 Binary files /dev/null and b/coq_8.4~gamma0+really8.4beta2+dfsg.orig.tar.gz.delta differ diff --git a/coq_8.3.pl4+dfsg.orig.tar.gz.id b/coq_8.4~gamma0+really8.4beta2+dfsg.orig.tar.gz.id similarity index 100% copy from coq_8.3.pl4+dfsg.orig.tar.gz.id copy to coq_8.4~gamma0+really8.4beta2+dfsg.orig.tar.gz.id -- coq 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] coq packaging annotated tag, upstream/8.4_gamma0+really8.4beta2, created. upstream/8.4_gamma0+really8.4beta2
The annotated tag, upstream/8.4_gamma0+really8.4beta2 has been created at fda93360cbda05d3f0a26066dcb7b26e32fab0b5 (tag) tagging 61dc740ed1c3780cccaec00d059a28f0d31d0052 (commit) replaces upstream/8.4_beta tagged by Stephane Glondu on Mon Jun 4 12:07:56 2012 +0200 - Shortlog Upstream version 8.4~gamma0+really8.4beta2 Stephane Glondu (1): Imported Upstream version 8.4~gamma0+really8.4beta2 --- -- coq 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] coq packaging annotated tag, upstream/8.4_gamma0+really8.4beta2+dfsg, created. upstream/8.4_gamma0+really8.4beta2+dfsg
The annotated tag, upstream/8.4_gamma0+really8.4beta2+dfsg has been created at 909bac0c7e3afc6cd15448aefcdda439ec4b9e0d (tag) tagging 86535d84cc3cffeee1dcd8545343f234e7285530 (commit) replaces upstream/8.4_beta+dfsg tagged by Stephane Glondu on Mon Jun 4 12:25:22 2012 +0200 - Shortlog Upstream version 8.4~gamma0+really8.4beta2+dfsg Stephane Glondu (2): Imported Upstream version 8.4~gamma0+really8.4beta2 Remove non-DFSG contents --- -- coq 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] camlp5 packaging branch, master, updated. debian/6.05-1-4-ga929c61
The following commit has been merged in the master branch: commit caeb691f83f9cc5ebfafb80afdbee2cbd8c2b20c Merge: 47f01f3967cd0c0668f607ac92de88ed52b2c1a4 0eea230fe53e21a8921b5d6174548d7b908db367 Author: Stephane Glondu Date: Tue Jun 5 10:13:39 2012 +0200 Merge tag 'upstream/6.06' Upstream version 6.06 -- camlp5 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] camlp5 packaging branch, master, updated. debian/6.05-1-4-ga929c61
The following commit has been merged in the master branch: commit 7d731368b51173bc6d160b8ad3bee39a100875b3 Author: Stephane Glondu Date: Tue Jun 5 10:13:46 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index dc044ab..13c3cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +camlp5 (6.06-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Tue, 05 Jun 2012 10:13:42 +0200 + camlp5 (6.05-1) unstable; urgency=low * New upstream release -- camlp5 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] camlp5 packaging branch, master, updated. debian/6.05-1-4-ga929c61
The following commit has been merged in the master branch: commit a929c61251b319979778520f816d822e42686197 Author: Stephane Glondu Date: Tue Jun 5 10:15:04 2012 +0200 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 13c3cfe..2be7615 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -camlp5 (6.06-1) UNRELEASED; urgency=low +camlp5 (6.06-1) unstable; urgency=low * New upstream release - -- Stéphane Glondu Tue, 05 Jun 2012 10:13:42 +0200 + -- Stéphane Glondu Tue, 05 Jun 2012 10:15:02 +0200 camlp5 (6.05-1) unstable; urgency=low -- camlp5 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] camlp5 packaging branch, pristine-tar, updated. 97fab2f68da03feae9c0d8649479038b8177dad5
The following commit has been merged in the pristine-tar branch: commit 97fab2f68da03feae9c0d8649479038b8177dad5 Author: Stephane Glondu Date: Tue Jun 5 10:13:39 2012 +0200 pristine-tar data for camlp5_6.06.orig.tar.gz diff --git a/camlp5_6.06.orig.tar.gz.delta b/camlp5_6.06.orig.tar.gz.delta new file mode 100644 index 000..8a795ec Binary files /dev/null and b/camlp5_6.06.orig.tar.gz.delta differ diff --git a/camlp5_6.06.orig.tar.gz.id b/camlp5_6.06.orig.tar.gz.id new file mode 100644 index 000..b04ae15 --- /dev/null +++ b/camlp5_6.06.orig.tar.gz.id @@ -0,0 +1 @@ +3bce5495b0c31951b75ef997be2c00e7c3e84b90 -- camlp5 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] camlp5 packaging annotated tag, upstream/6.06, created. upstream/6.06
The annotated tag, upstream/6.06 has been created at 8ed4214b790e48464a147aa383d881f0e38d0393 (tag) tagging 0eea230fe53e21a8921b5d6174548d7b908db367 (commit) replaces upstream/6.05 tagged by Stephane Glondu on Tue Jun 5 10:13:39 2012 +0200 - Shortlog Upstream version 6.06 Stephane Glondu (1): Imported Upstream version 6.06 --- -- camlp5 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] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit 93e069bdad63034e5089ddd3f5f7b214b29cc094 Merge: df5e005184a5a08d0e3672c6e75f062781bbc94f ab72b872572793778e5276796add719af4d71a44 Author: Stephane Glondu Date: Tue Jun 5 11:12:17 2012 +0200 Merge tag 'upstream/1.3.1' Upstream version 1.3.1 -- findlib 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] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit c4d50331333455368c42fc10042946ec8ce0b490 Author: Stephane Glondu Date: Tue Jun 5 11:12:28 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index bb19307..71e09ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +findlib (1.3.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Tue, 05 Jun 2012 11:12:22 +0200 + findlib (1.2.8+debian-1) unstable; urgency=low * New upstream release -- findlib 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] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit 1d5ee1e1597c600d69022f17b79919a863bf81ba Author: Stephane Glondu Date: Tue Jun 5 11:23:39 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch index 090d6d0..8d67103 100644 --- a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch +++ b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch @@ -11,7 +11,7 @@ Forwarded: not-needed Signed-off-by: Stephane Glondu --- findlib.conf.in |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/findlib.conf.in b/findlib.conf.in index 261d2c8..05f6c3d 100644 diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch index 6f80b50..f81e68a 100644 --- a/debian/patches/0002-Extra-configuration-search-path.patch +++ b/debian/patches/0002-Extra-configuration-search-path.patch @@ -10,13 +10,13 @@ Signed-off-by: Stephane Glondu --- src/findlib/findlib.ml |9 - src/findlib/findlib_config.mlp |1 + - 2 files changed, 9 insertions(+), 1 deletions(-) + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml -index 28c86a0..8894ed6 100644 +index 8f99932..4f8fe9f 100644 --- a/src/findlib/findlib.ml +++ b/src/findlib/findlib.ml -@@ -106,6 +106,8 @@ let init +@@ -108,6 +108,8 @@ let init let configd_file = config_file ^ ".d" in @@ -25,7 +25,7 @@ index 28c86a0..8894ed6 100644 let vars_of_file f = let ch = open_in f in try -@@ -143,12 +145,17 @@ let init +@@ -151,12 +153,17 @@ let init vars_of_file config_file else [] in @@ -42,8 +42,8 @@ index 28c86a0..8894ed6 100644 - let vars = config_vars @ configd_vars in + let vars = config_vars @ configd_vars @ extra_configd_vars in if vars <> [] then ( + let found = ref false in let lookup name default = - try Fl_metascanner.lookup name config_preds vars diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp index 5b4ab69..09d0089 100644 --- a/src/findlib/findlib_config.mlp diff --git a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch index f1c8f17..8bf41b3 100644 --- a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch +++ b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch @@ -6,7 +6,7 @@ Subject: META.num*: bugfix, moved "directory" directive outside "core" --- site-lib-src/num-top/META.in |1 + site-lib-src/num/META.in |2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/site-lib-src/num-top/META.in b/site-lib-src/num-top/META.in index 184d65f..1b18b74 100644 diff --git a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch index 6e5dc32..a38056c 100644 --- a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch +++ b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch @@ -4,14 +4,14 @@ Subject: Camlp4 depends on Dynlink on every architecture --- site-lib-src/camlp4.310/META.in |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site-lib-src/camlp4.310/META.in b/site-lib-src/camlp4.310/META.in -index 637d848..a490ab1 100644 +index abd..1bd6fc2 100644 --- a/site-lib-src/camlp4.310/META.in +++ b/site-lib-src/camlp4.310/META.in @@ -6,7 +6,7 @@ dnl This file is input of the m4 macro processor. - `directory = "'camlp4_dir`"' + `directory = "+camlp4"' `# For the toploop:' -`requires(byte,toploop) = "'camlp4_dynlink`"' diff --git a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch index 4ce9e6c..38b0447 100644 --- a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch +++ b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch @@ -4,10 +4,10 @@ Subject: Do not use an absolute path in META.camlp4 --- configure |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index bdb3379..d2bf393 100755 +index 52199b6..fc803a0 100755 --- a/configure +++ b/configure @@ -416,7 +416,7 @@ fi diff --git a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch b/debian/patches/0006-Disable-graphics-and-lablt
[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit 26b9c5160aeb8ccded50c440d1121ce617a849fc Author: Stephane Glondu Date: Tue Jun 5 11:20:39 2012 +0200 Update debian/copyright diff --git a/debian/copyright b/debian/copyright index f7b04f3..05e6d73 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,19 +3,15 @@ Upstream-Contact: Gerd Stolpmann Source: http://projects.camlcity.org/projects/findlib.html Files: * -Copyright: 1999-2012, Gerd Stolpmann -License: other - -Files: src/findlib/num_top* -Copyright: 2003, Stefano Zacchiroli -License: LGPL-2.1+ +Copyright: 1999-2012, Gerd Stolpmann and others +License: findlib Files: debian/* Copyright: 2001-2009, Stefano Zacchiroli 2009-2012, Stéphane Glondu -License: LGPL-2.1+ +License: findlib -License: other +License: findlib Permission is hereby granted, free of charge, to any person obtaining a copy of this document and the "findlib" software (the "Software"), to deal in the Software without restriction, including without @@ -35,11 +31,117 @@ License: other tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the software. -License: LGPL-2.1+ - This is free software! you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - . - On Debian systems, the complete text of the GNU Lesser General Public - License can be found in `/usr/share/common-licenses/LGPL-2.1'. +Files: tools/make-package-macosx +Copyright: 2003, Inria +License: ocaml + The Compiler is distributed under the terms of the Q Public License + version 1.0 with a change to choice of law (included below). + . + As a special exception to the Q Public Licence, you may develop + application programs, reusable components and other software items + that link with the original or modified versions of the Compiler and + are not made available to the general public, without any of the + additional requirements listed in clause 6c of the Q Public licence. + . +THE Q PUBLIC LICENSE version 1.0 + . + Copyright (C) 1999 Troll Tech AS, Norway. + Everyone is permitted to copy and + distribute this license document. + . + The intent of this license is to establish freedom to share and change + the software regulated by this license under the open source model. + . + This license applies to any software containing a notice placed by the + copyright holder saying that it may be distributed under the terms of + the Q Public License version 1.0. Such software is herein referred to + as the Software. This license covers modification and distribution of + the Software, use of third-party application programs based on the + Software, and development of free software which uses the Software. + . + Granted Rights + . + 1. You are granted the non-exclusive rights set forth in this license + provided you agree to and comply with any and all conditions in this + license. Whole or partial distribution of the Software, or software + items that link with the Software, in any form signifies acceptance of + this license. + . + 2. You may copy and distribute the Software in unmodified form + provided that the entire package, including - but not restricted to - + copyright, trademark notices and disclaimers, as released by the + initial developer of the Software, is distributed. + . + 3. You may make modifications to the Software and distribute your + modifications, in a form that is separate from the Software, such as + patches. The following restrictions apply to modifications: + . + a. Modifications must not alter or remove any copyright notices + in the Software. + . + b. When modifications to the Software are released under this + license, a non-exclusive royalty-free right is granted to the + initial developer of the Software to distribute your + modification in future versions of the Software provided such + versions remain available under these terms in addition to any + other license(s) of the initial developer. + . + 4. You may distribute machine-executable forms of the Software or + machine-executable forms of modified versions of the Software, + provided that you meet these restrictions: + . + a. You must include this license document in the distribution. + . + b. You must ensure that all recipients of the machine-executable + forms are also able to receive the complete machine-readable + source code to the distributed Software, including all + modifications, without any charge beyond the costs of data + transfer, and place prominent notices in the distribution + explaining this. + . + c. You must ensure that all modifications included in the +
[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit a4ca03a16435aec1137f21a44bf47adfca6c9a06 Author: Stephane Glondu Date: Tue Jun 5 11:26:28 2012 +0200 Misc updates diff --git a/debian/rules b/debian/rules index d8f0594..32df080 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,6 @@ endif .PHONY: override_dh_auto_clean override_dh_auto_clean: if [ -f Makefile.config ]; then $(MAKE) clean; fi - ln -sf doc/README README -find . -name META -delete -rm -f src/findlib/depend src/findlib/fl_metascanner.ml -rm -f Makefile.config ocargs.log src/findlib/ocaml_args.ml -- findlib 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] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit e7e1d87c99fdb8727d9412d3392d477c55208b85 Author: Stephane Glondu Date: Tue Jun 5 11:22:23 2012 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 71e09ca..43278b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -findlib (1.3.1-1) UNRELEASED; urgency=low +findlib (1.3.1-1) unstable; urgency=low * New upstream release +- documentation sources are now included in the official upstream + tarball, repackaging is no longer needed + * Update debian/copyright - -- Stéphane Glondu Tue, 05 Jun 2012 11:12:22 +0200 + -- Stéphane Glondu Tue, 05 Jun 2012 11:24:23 +0200 findlib (1.2.8+debian-1) unstable; urgency=low -- findlib 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] findlib packaging branch, pristine-tar, updated. 42ef13d38433d90a590c7af81db4d4abb98e0c9f
The following commit has been merged in the pristine-tar branch: commit 05c3f112a7454027c4fb85c7dc8cf1350bffe463 Author: Stephane Glondu Date: Tue Jun 5 11:12:14 2012 +0200 pristine-tar data for findlib_1.3.0.orig.tar.gz diff --git a/findlib_1.3.0.orig.tar.gz.delta b/findlib_1.3.0.orig.tar.gz.delta new file mode 100644 index 000..857f1a7 Binary files /dev/null and b/findlib_1.3.0.orig.tar.gz.delta differ diff --git a/findlib_1.3.0.orig.tar.gz.id b/findlib_1.3.0.orig.tar.gz.id new file mode 100644 index 000..331d5cf --- /dev/null +++ b/findlib_1.3.0.orig.tar.gz.id @@ -0,0 +1 @@ +da299cebf5187a121eb110278e69c7674571e536 -- findlib 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] findlib packaging branch, pristine-tar, updated. 42ef13d38433d90a590c7af81db4d4abb98e0c9f
The following commit has been merged in the pristine-tar branch: commit 42ef13d38433d90a590c7af81db4d4abb98e0c9f Author: Stephane Glondu Date: Tue Jun 5 11:12:17 2012 +0200 pristine-tar data for findlib_1.3.1.orig.tar.gz diff --git a/findlib_1.3.1.orig.tar.gz.delta b/findlib_1.3.1.orig.tar.gz.delta new file mode 100644 index 000..67b8b58 Binary files /dev/null and b/findlib_1.3.1.orig.tar.gz.delta differ diff --git a/findlib_1.3.1.orig.tar.gz.id b/findlib_1.3.1.orig.tar.gz.id new file mode 100644 index 000..a94fbe5 --- /dev/null +++ b/findlib_1.3.1.orig.tar.gz.id @@ -0,0 +1 @@ +c79c16e17e8b1449568fac52bb334ec1b43bfe03 -- findlib 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] findlib packaging annotated tag, upstream/1.3.0, created. upstream/1.3.0
The annotated tag, upstream/1.3.0 has been created at c5fea3d72acf00a25bcc735c4e3f548140bd26ca (tag) tagging 6c69c5c7498d23de15a2f3fb9e63bacaeee243b0 (commit) replaces upstream/1.2.8+debian tagged by Stephane Glondu on Tue Jun 5 11:12:14 2012 +0200 - Shortlog Upstream version 1.3.0 Stephane Glondu (1): Imported Upstream version 1.3.0 --- -- findlib 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] findlib packaging annotated tag, upstream/1.3.1, created. upstream/1.3.1
The annotated tag, upstream/1.3.1 has been created at 7bb41253cadcb728f0474ad827d4a1e6c67753da (tag) tagging ab72b872572793778e5276796add719af4d71a44 (commit) replaces upstream/1.3.0 tagged by Stephane Glondu on Tue Jun 5 11:12:17 2012 +0200 - Shortlog Upstream version 1.3.1 Stephane Glondu (1): Imported Upstream version 1.3.1 --- -- findlib 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] camlp5 packaging annotated tag, debian/6.06-1, created. debian/6.06-1
The annotated tag, debian/6.06-1 has been created at 5da17ae366a85bc47b486ac00408006bb97f8cc9 (tag) tagging a929c61251b319979778520f816d822e42686197 (commit) replaces debian/6.05-1 tagged by Stephane Glondu on Tue Jun 5 11:46:48 2012 +0200 - Shortlog Debian release 6.06-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABCgAGBQJPzdWIAAoJEHhT2k1JiBrTo0cQAIsyfiz82QMNdWNFI5p0YBwU /FhPNl+4f/gwQgB8R83fr4q1IOnceoYSfgL+edFDu+8FjtE1Q0cTwmiHmhAKyZTI Axe065eW7A8smADs/6bj9qavybTWF6jgdVPv1bga32ECccd5pvSVKX7Yj8DwVV+B KRIv1SnyzRE8RTU9GzDZporsEirKKetebBP5PsI2dxGNUJ908hhkacmLXnCb08yv +Y5QopVB1vHxHflv1WVMhumIUkd7xTA3J203BeElzyhtPZHaJV1KSY8BRbbXgwRG SZUpboAgEAK6fODmC1v4t5o4iss4Hp/wL52n9q+G5Zil2PzREQd7H80MjcFpnieP OFvMCrrw1u9dCXsPu09fZSfwOAynDzk9ZcdJJ16wh0ZJcFACUYuiovgWgBgh6vS1 DYp9gkWLTnhm+DzedzfdlK7GyHyej8UicXmSvEAbG/Xjtzom03XqTl3exWITqGlQ GsaEHuKfN2g87rD2Wh+q5C64ZP0mQiIYZlB9lt5o9gja6U8RoFQl+Sp/PnIm2sM1 SM9+Dq4aM2VcDPWXPhzOFNTaoc5LgYS8unomiQlzA1oBb4nlXjnsurdpF1jGiVcS jrrCrIxJXt6vaNo8m8pib8sARqNhOSek5djKDjOTFhUp7TWMoYH2szV/noRi6lTo 3yFopJFet+N1Yj17bZ9v =JlGK -END PGP SIGNATURE- Stephane Glondu (4): Imported Upstream version 6.06 Merge tag 'upstream/6.06' New upstream release Prepare upload to unstable --- -- camlp5 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] findlib packaging annotated tag, debian/1.3.1-1, created. debian/1.3.1-1
The annotated tag, debian/1.3.1-1 has been created at 304a4c27363a9a76d23c089890f7ca111cf4a6a3 (tag) tagging e7e1d87c99fdb8727d9412d3392d477c55208b85 (commit) replaces debian/1.2.8+debian-1 tagged by Stephane Glondu on Tue Jun 5 11:49:03 2012 +0200 - Shortlog Debian release 1.3.1-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABCgAGBQJPzdYPAAoJEHhT2k1JiBrTvbsP/1ZW5SKKK9nebigIdVxip223 f0Gd29n/Iuq3haVPRVXPYY9RaNgXsd6MHYKtmLaacgKzG1kuJYuWBWm0onUd5a9b dAvbbf1qELEf7d6yYn3tL1hfynExGESpAJzY67eMvhuYA+QtPj8zn92BxBgBSAKq WJ/t3jw1moOgoaTmv648Sle68CXSa+3+BjqFfMJ2fA49gn5soqw6SYuNd3k7x8gK Bjh0U/ioJilSMKxQvnSb8a+KqYXpdJuIjVt0CWijntlkEd/z4hEezC1RSRh/ZGPD +1R8apRKzQej/heu/MIeBlRcQApAFnpTsJD00Uq+mSQtN+9A+YAxOdDxonmOm2lB yhZV0VvSaIWqGg1Su+BMVaP3sKZQahbrBNFZcOQbtKVuaIp+ySn58VxviL9vbvQJ +UbE9qhjINhpv6wfqttvvDFpjfDmIgIGQelQMQatHMWvvDhuvQ+cI+afy9pjbans VGqeieQQJ81S2p0D1IbKAhXpY+VyPO9WDhpCGwGGzeXMyN3vtnZmID7B/S63JgFL gXoJeIgdJ4N2fREGR61pAFN+57SAjBtFAsv8Jw74ozB3pWW4O+G3VYuLTnnHMc3+ 4KNTE2NIGI0ejh9jQyA1pgWlY+AofvjsOcyCVJ/qw9K4i52DDueyo6LOv0NnU9Wc pqPOVXhXXac4q3lDZDiO =e0bi -END PGP SIGNATURE- Stephane Glondu (8): Imported Upstream version 1.3.0 Imported Upstream version 1.3.1 Merge tag 'upstream/1.3.1' New upstream release Refresh patches Update debian/copyright Misc updates Update changelog and prepare upload to unstable --- -- findlib 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] ocamlsdl packaging branch, master, updated. debian/0.8.0-4-9-g6be0ff1
The following commit has been merged in the master branch: commit a6cfb37ab43a0720fdd3408b34e2ca51f7b3ffa8 Author: Stephane Glondu Date: Tue Jun 5 11:51:59 2012 +0200 Simplify debian/watch diff --git a/debian/watch b/debian/watch index ae75332..0d8580e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -http://sf.net/ocamlsdl/ocamlsdl-(.*)\.tar\.gz debian uupdate +http://sf.net/ocamlsdl/ocamlsdl-(.*)\.tar\.gz -- ocamlsdl 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] ocamlsdl packaging branch, master, updated. debian/0.8.0-4-9-g6be0ff1
The following commit has been merged in the master branch: commit 48a9d2723e76eb9faa18973b90c099919072c481 Merge: a6cfb37ab43a0720fdd3408b34e2ca51f7b3ffa8 4c3c89d6891780f86bae4119c60d43aa8c8f8b1b Author: Stephane Glondu Date: Tue Jun 5 11:52:14 2012 +0200 Merge tag 'upstream/0.9.0' Upstream version 0.9.0 -- ocamlsdl 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] ocamlsdl packaging branch, master, updated. debian/0.8.0-4-9-g6be0ff1
The following commit has been merged in the master branch: commit 1885a49693455b22ae7ed90b94d9e71559bc52c6 Author: Stephane Glondu Date: Tue Jun 5 11:52:21 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 4d6408f..7176db9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlsdl (0.9.0-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Tue, 05 Jun 2012 11:52:18 +0200 + ocamlsdl (0.8.0-4) unstable; urgency=low * Build-Depend on libpng-dev instead of libpng12-dev (Closes: #662449) -- ocamlsdl 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] ocamlsdl packaging branch, master, updated. debian/0.8.0-4-9-g6be0ff1
The following commit has been merged in the master branch: commit 4590bfd98c3cc764670dbc31226bfd63751450cc Author: Stephane Glondu Date: Tue Jun 5 11:52:56 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Fix-build-on-bytecode-architectures.patch b/debian/patches/0001-Fix-build-on-bytecode-architectures.patch index 0438891..054ac7b 100644 --- a/debian/patches/0001-Fix-build-on-bytecode-architectures.patch +++ b/debian/patches/0001-Fix-build-on-bytecode-architectures.patch @@ -1,12 +1,12 @@ From: Stephane Glondu Date: Mon, 21 Jun 2010 13:54:48 -0700 -Subject: [PATCH] Fix build on bytecode architectures +Subject: Fix build on bytecode architectures Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586619 Signed-off-by: Stephane Glondu --- src/Makefile |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 3f53e3d..e1f77e1 100644 -- ocamlsdl 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] ocamlsdl packaging branch, master, updated. debian/0.8.0-4-9-g6be0ff1
The following commit has been merged in the master branch: commit 6be0ff10e2b8a6b9d6dcefd7f92fb91caf2d48f3 Author: Stephane Glondu Date: Tue Jun 5 11:57:35 2012 +0200 Fix runtime error due to missing sdlvideo (Closes: #667447) diff --git a/debian/patches/0002-Fix-runtime-error-due-to-missing-sdlvideo.patch b/debian/patches/0002-Fix-runtime-error-due-to-missing-sdlvideo.patch new file mode 100644 index 000..14581fd --- /dev/null +++ b/debian/patches/0002-Fix-runtime-error-due-to-missing-sdlvideo.patch @@ -0,0 +1,33 @@ +From: Stephane Glondu +Date: Tue, 5 Jun 2012 11:54:47 +0200 +Subject: Fix runtime error due to missing sdlvideo + +Bug-Mageia: https://bugs.mageia.org/show_bug.cgi?id=4460 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667447 +--- + src/Makefile |4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index e1f77e1..a60d7f4 100644 +--- a/src/Makefile b/src/Makefile +@@ -14,6 +14,8 @@ loader_MODULES = sdlloader + mixer_MODULES = sdlmixer + ttf_MODULES= sdlttf + gfx_MODULES= sdlgfx ++video_MODULES = sdlvideo ++gfx_C_SRC = common.c + + TARGETS = sdl.cma $(patsubst %,sdl%.cma,$(PARTS)) + TARGETS += libsdlstub.$(A) $(patsubst %,libsdl%stub.$(A),$(PARTS)) +@@ -55,7 +57,7 @@ sdlgfx.cma : $(call ML_OBJS,gfx) + $(call MKCMA,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx)) + sdlgfx.cmxa : $(call ML_OPT_OBJS,gfx) + $(call MKCMXA,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx)) +-libsdlgfxstub.$(A) dllsdlgfxstub.so : $(call STUB_OBJS,gfx) ++libsdlgfxstub.$(A) dllsdlgfxstub.so : $(call STUB_OBJS,gfx) $(call STUB_OBJS,video) + $(call MKCLIB,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx)) + + +-- diff --git a/debian/patches/series b/debian/patches/series index c6c94b1..d8d3184 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Fix-build-on-bytecode-architectures.patch +0002-Fix-runtime-error-due-to-missing-sdlvideo.patch -- ocamlsdl 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] ocamlsdl packaging branch, pristine-tar, updated. 301cc9f021c2ff058ce7e69f11c6047805b9da8a
The following commit has been merged in the pristine-tar branch: commit 301cc9f021c2ff058ce7e69f11c6047805b9da8a Author: Stephane Glondu Date: Tue Jun 5 11:52:14 2012 +0200 pristine-tar data for ocamlsdl_0.9.0.orig.tar.gz diff --git a/ocamlsdl_0.9.0.orig.tar.gz.delta b/ocamlsdl_0.9.0.orig.tar.gz.delta new file mode 100644 index 000..58ac1f4 Binary files /dev/null and b/ocamlsdl_0.9.0.orig.tar.gz.delta differ diff --git a/ocamlsdl_0.9.0.orig.tar.gz.id b/ocamlsdl_0.9.0.orig.tar.gz.id new file mode 100644 index 000..7b9ba1d --- /dev/null +++ b/ocamlsdl_0.9.0.orig.tar.gz.id @@ -0,0 +1 @@ +1bd94b7e904c8128d6c8a3766f4c4b4967bf786a -- ocamlsdl 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] ocamlsdl packaging annotated tag, upstream/0.9.0, created. upstream/0.9.0
The annotated tag, upstream/0.9.0 has been created at 759b1f4133ec71926e1e2554d835224653ee8b19 (tag) tagging 4c3c89d6891780f86bae4119c60d43aa8c8f8b1b (commit) replaces upstream/0.8.0 tagged by Stephane Glondu on Tue Jun 5 11:52:14 2012 +0200 - Shortlog Upstream version 0.9.0 Stephane Glondu (1): Imported Upstream version 0.9.0 --- -- ocamlsdl 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] ocaml-extunix packaging branch, master, updated. debian/0.0.3-2-8-ga19d396
The following commit has been merged in the master branch: commit bae134cf288d2b8d78b736cf890a8567c50a0124 Merge: 5bd704cbadee9c55a6ffc645e7d9d321f920ebd0 3c9c8ba745a7d622f9949b07a893a761ff928e96 Author: Mehdi Dogguy Date: Tue Jun 5 17:11:28 2012 +0200 Merge tag 'upstream/0.0.4' Upstream version 0.0.4 -- ocaml-extunix 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] ocaml-extunix packaging branch, master, updated. debian/0.0.3-2-8-ga19d396
The following commit has been merged in the master branch: commit ac37cb3a7db3efb3f7604b2381380e386fb54bbc Author: Mehdi Dogguy Date: Tue Jun 5 17:15:00 2012 +0200 New upstream release (Closes: #675505) diff --git a/debian/changelog b/debian/changelog index 3e967c8..eee9af8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low + + * New upstream release (Closes: #675505) + + -- Mehdi Dogguy Tue, 05 Jun 2012 17:14:54 +0200 + ocaml-extunix (0.0.3-2) unstable; urgency=low * Team upload -- ocaml-extunix 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] ocaml-extunix packaging branch, master, updated. debian/0.0.3-2-8-ga19d396
The following commit has been merged in the master branch: commit 977cb656e7f00990f53d9cf702fe3e31ff96eacd Author: Mehdi Dogguy Date: Tue Jun 5 17:36:44 2012 +0200 Install extunix.cmxs diff --git a/debian/changelog b/debian/changelog index 3d225e6..b0fc6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low * New upstream release (Closes: #675505) - Rebase patches + * Install extunix.cmxs, when available -- Mehdi Dogguy Tue, 05 Jun 2012 17:14:54 +0200 diff --git a/debian/libextunix-ocaml.install.in b/debian/libextunix-ocaml.install.in index 6d71302..36574c9 100644 --- a/debian/libextunix-ocaml.install.in +++ b/debian/libextunix-ocaml.install.in @@ -1,3 +1,4 @@ @OCamlStdlibDir@/extunix/*.so @OCamlDllDir@ @OCamlStdlibDir@/extunix/META @OCamlStdlibDir@/extunix/*.cm[ao] +DYN: @OCamlStdlibDir@/extunix/extunix.cmxs -- ocaml-extunix 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] ocaml-extunix packaging branch, master, updated. debian/0.0.3-2-8-ga19d396
The following commit has been merged in the master branch: commit 839cc552e7f6d5833b61eaeab29c2ea86e1ba2a4 Author: Mehdi Dogguy Date: Tue Jun 5 17:27:06 2012 +0200 Rebase patches diff --git a/debian/changelog b/debian/changelog index eee9af8..3d225e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low * New upstream release (Closes: #675505) +- Rebase patches -- Mehdi Dogguy Tue, 05 Jun 2012 17:14:54 +0200 diff --git a/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch index cbd85c9..a0b32ea 100644 --- a/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch +++ b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch @@ -11,13 +11,13 @@ Forwarded: not-needed Signed-off-by: Stephane Glondu --- test/test.ml |9 ++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/test.ml b/test/test.ml -index 2501bab..840d4b5 100644 +index 4bc468e..0d7ea8c 100644 --- a/test/test.ml +++ b/test/test.ml -@@ -228,7 +228,7 @@ let () = +@@ -495,7 +495,7 @@ let () = let wrap test = with_unix_error (fun () -> test (); Gc.compact ()) in @@ -26,7 +26,7 @@ index 2501bab..840d4b5 100644 "eventfd" >:: test_eventfd; "uname" >:: test_uname; "fadvise" >:: test_fadvise; -@@ -239,10 +239,13 @@ let () = +@@ -506,7 +506,10 @@ let () = "resource" >::: test_resource; "strtime" >:: test_strtime; "pts" >:: test_pts; @@ -38,8 +38,12 @@ index 2501bab..840d4b5 100644 "statvfs" >:: test_statvfs; "setenv" >:: test_setenv; "mkdtemp" >:: test_mkdtemp; -- ]) in -+ ])) in +@@ -522,6 +525,6 @@ let () = + "mkstemp" >:: test_mkstemp; + "mkostemp" >:: test_mkostemp; + "memalign" >:: test_memalign; +-]) in ++])) in ignore (run_test_tt_main (test_decorate wrap tests)) -- -- ocaml-extunix 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] ocaml-extunix packaging branch, master, updated. debian/0.0.3-2-8-ga19d396
The following commit has been merged in the master branch: commit 7a99f684e6cadec85f82bc6b5e0153e2986bc8b8 Author: Mehdi Dogguy Date: Tue Jun 5 17:42:02 2012 +0200 Mention that it is a Team upload diff --git a/debian/changelog b/debian/changelog index b0fc6ba..3d6a0ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low + * Team upload. * New upstream release (Closes: #675505) - Rebase patches * Install extunix.cmxs, when available -- ocaml-extunix 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] ocaml-extunix packaging branch, master, updated. debian/0.0.3-2-8-ga19d396
The following commit has been merged in the master branch: commit abf6ba6506f4f1db1a80692143a1ec3e977054b6 Author: Mehdi Dogguy Date: Tue Jun 5 17:44:07 2012 +0200 Bump Standards-Version to 3.9.3, no changes needed. diff --git a/debian/changelog b/debian/changelog index 3d6a0ae..fb5b225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low * New upstream release (Closes: #675505) - Rebase patches * Install extunix.cmxs, when available + * Bump Standards-Version to 3.9.3, no changes needed. -- Mehdi Dogguy Tue, 05 Jun 2012 17:14:54 +0200 diff --git a/debian/control b/debian/control index 75be82b..b3b2eda 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: dh-ocaml (>= 0.9~), debhelper (>= 7.0.50~), camlp4 -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://extunix.forge.ocamlcore.org/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-extunix.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-extunix.git -- ocaml-extunix 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] ocaml-extunix packaging branch, master, updated. debian/0.0.3-2-8-ga19d396
The following commit has been merged in the master branch: commit a19d39615093208b1a3a68a6302e443ed7aafd75 Author: Mehdi Dogguy Date: Tue Jun 5 17:37:13 2012 +0200 Release to unstable diff --git a/debian/changelog b/debian/changelog index fb5b225..330b1bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low +ocaml-extunix (0.0.4-1) unstable; urgency=low * Team upload. * New upstream release (Closes: #675505) @@ -6,7 +6,7 @@ ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low * Install extunix.cmxs, when available * Bump Standards-Version to 3.9.3, no changes needed. - -- Mehdi Dogguy Tue, 05 Jun 2012 17:14:54 +0200 + -- Mehdi Dogguy Tue, 05 Jun 2012 17:37:13 +0200 ocaml-extunix (0.0.3-2) unstable; urgency=low -- ocaml-extunix 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] ocaml-extunix packaging branch, pristine-tar, updated. 383460068a292e85e521713d00bc0a7a7fa7bb29
The following commit has been merged in the pristine-tar branch: commit 383460068a292e85e521713d00bc0a7a7fa7bb29 Author: Mehdi Dogguy Date: Tue Jun 5 17:11:28 2012 +0200 pristine-tar data for ocaml-extunix_0.0.4.orig.tar.gz diff --git a/ocaml-extunix_0.0.4.orig.tar.gz.delta b/ocaml-extunix_0.0.4.orig.tar.gz.delta new file mode 100644 index 000..5756c66 Binary files /dev/null and b/ocaml-extunix_0.0.4.orig.tar.gz.delta differ diff --git a/ocaml-extunix_0.0.4.orig.tar.gz.id b/ocaml-extunix_0.0.4.orig.tar.gz.id new file mode 100644 index 000..b8bec7d --- /dev/null +++ b/ocaml-extunix_0.0.4.orig.tar.gz.id @@ -0,0 +1 @@ +f917e686feb9182764de06077b5cff54cd0f22ab -- ocaml-extunix 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] ocaml-extunix packaging annotated tag, debian/0.0.4-1, created. debian/0.0.4-1
The annotated tag, debian/0.0.4-1 has been created at 75b5bb00c74be120555bb7f749a19720ca1b82e9 (tag) tagging a19d39615093208b1a3a68a6302e443ed7aafd75 (commit) replaces debian/0.0.3-2 tagged by Mehdi Dogguy on Tue Jun 5 18:31:39 2012 +0200 - Shortlog Debian release 0.0.4-1 Mehdi Dogguy (8): Imported Upstream version 0.0.4 Merge tag 'upstream/0.0.4' New upstream release (Closes: #675505) Rebase patches Install extunix.cmxs Mention that it is a Team upload Bump Standards-Version to 3.9.3, no changes needed. Release to unstable --- -- ocaml-extunix 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] ocaml-extunix packaging annotated tag, upstream/0.0.4, created. upstream/0.0.4
The annotated tag, upstream/0.0.4 has been created at f7f83bc2b65eddf4d68f8deac4a2544ab665cb9b (tag) tagging 3c9c8ba745a7d622f9949b07a893a761ff928e96 (commit) replaces upstream/0.0.3 tagged by Mehdi Dogguy on Tue Jun 5 17:11:28 2012 +0200 - Shortlog Upstream version 0.0.4 Mehdi Dogguy (1): Imported Upstream version 0.0.4 --- -- ocaml-extunix 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 23038a85699a91724d56b9b1fb773078e5f8dd44 Merge: d68768b43f629068b5c0d133081da23c9558f431 889ff5dee3584843c7648dc3a842439e8cef49ec Author: Mehdi Dogguy Date: Tue Jun 5 18:03:18 2012 +0200 Merge tag 'upstream/1.1.1' Upstream version 1.1.1 -- mysql-ocaml 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 1860c2e77c4f3260215dc8dd58013f27904f5d09 Author: Mehdi Dogguy Date: Tue Jun 5 18:06:14 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 901d309..bee5055 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Mehdi Dogguy Tue, 05 Jun 2012 18:06:10 +0200 + mysql-ocaml (1.0.4-7) unstable; urgency=low * Set maintainer as "Debian OCaml Maintainers" and Samuel as Uploader -- mysql-ocaml 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 7ed667bf0e83e747598c05af587bfb859986abb5 Author: Mehdi Dogguy Date: Tue Jun 5 18:06:48 2012 +0200 Add a Homepage field in debian/control. diff --git a/debian/changelog b/debian/changelog index bee5055..db8cdfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low * New upstream release + * Add a Homepage field in debian/control. -- Mehdi Dogguy Tue, 05 Jun 2012 18:06:10 +0200 diff --git a/debian/control b/debian/control index 6cba0da..88b357d 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: ocaml-findlib (>= 1.2.4), quilt (>= 0.46-7~) Standards-Version: 3.8.3 +Homepage: http://ocaml-mysql.forge.ocamlcore.org/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mysql-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mysql-ocaml.git -- mysql-ocaml 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit f6a4f22d83391492c2519f6778cbfe93ff9a205b Author: Mehdi Dogguy Date: Tue Jun 5 18:08:20 2012 +0200 Update debian/watch file. diff --git a/debian/changelog b/debian/changelog index db8cdfa..62b0143 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low * New upstream release * Add a Homepage field in debian/control. + * Update debian/watch file. -- Mehdi Dogguy Tue, 05 Jun 2012 18:06:10 +0200 diff --git a/debian/watch b/debian/watch index a3d3d19..a9e0b9e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ -version=2 -http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-(.*)\.tar\.gz debian uupdate +version=3 +http://forge.ocamlcore.org/frs/?group_id=137 \ +.*/ocaml-mysql-([\d\.]*)\.tar\.gz -- mysql-ocaml 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch:
commit 982482e2702ea698c2c9cf7e06fa8043a8f14e0e
Author: Mehdi Dogguy
Date: Tue Jun 5 18:16:58 2012 +0200
Remove local patches, integrated by upstream.
diff --git a/debian/changelog b/debian/changelog
index 62b0143..7a8da62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
* New upstream release
* Add a Homepage field in debian/control.
* Update debian/watch file.
+ * Remove local patches, integrated by upstream.
-- Mehdi Dogguy Tue, 05 Jun 2012 18:06:10 +0200
diff --git a/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
b/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
deleted file mode 100644
index e552ad6..000
--- a/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Samuel Mimram
-Date: Sat, 31 Oct 2009 22:43:37 +0100
-Subject: [PATCH] Fix creation of insecure temporary files
-
-shtool creates temporary files in an insecure manner, which can be
-exploited through symlink attacks. Please see these URLs for details:
-http://www.zataz.net/adviso/shtool-05252005.txt
-http://bugs.gentoo.org/show_bug.cgi?id=93782
- etc/shtool |7 +++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/etc/shtool b/etc/shtool
-index 1253148..9a793da 100755
a/etc/shtool
-+++ b/etc/shtool
-@@ -379,6 +379,13 @@ if [ ".$gen_tmpfile" = .yes ]; then
- fi
- fi
- tmpfile="$tmpdir/.shtool.$$"
-+if mkdir "$tmpdir/.shtool.$$"; then
-+tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
-+else
-+echo "$msgprefix:Error: failed to create temporary file" 1>&2
-+exit 1
-+fi
-+tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
- rm -f $tmpfile >/dev/null 2>&1
- touch $tmpfile
- fi
---
diff --git a/debian/patches/0002-Add-mysql_real_escape_string-to-the-API.patch
b/debian/patches/0002-Add-mysql_real_escape_string-to-the-API.patch
deleted file mode 100644
index b26b1fd..000
--- a/debian/patches/0002-Add-mysql_real_escape_string-to-the-API.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From: Mehdi Dogguy
-Date: Thu, 1 Oct 2009 22:34:22 +0200
-Subject: [PATCH] Add mysql_real_escape_string to the API
-
- mysql.ml | 18 --
- mysql.mli |5 +
- mysql_stubs.c | 27 +++
- 3 files changed, 44 insertions(+), 6 deletions(-)
-
-diff --git a/mysql.ml b/mysql.ml
-index ae6b6ed..324380c 100644
a/mysql.ml
-+++ b/mysql.ml
-@@ -333,6 +333,7 @@ external exec : dbd -> string -> result
= "db_exec"
- external real_status : dbd -> int = "db_status"
- external errmsg : dbd -> string option = "db_errmsg"
- external escape : string -> string = "db_escape"
-+external real_escape: dbd -> string -> string = "db_real_escape"
- external fetch : result -> string option array option = "db_fetch"
- external to_row : result -> int64 -> unit = "db_to_row"
- external size : result -> int64 = "db_size"
-@@ -516,7 +517,9 @@ let column result =
-the corresponding type *)
-
- let ml2str str = "'" ^ escape str ^ "'"
-+let ml2rstr conn str = "'" ^ real_escape conn str ^ "'"
- let ml2blob = ml2str
-+let ml2rblob= ml2rstr
- let ml2int x= string_of_int x
- let ml2decimal x= x
- let ml322int x = Int32.to_string x
-@@ -524,12 +527,15 @@ let ml642int x = Int64.to_string x
- let mlnative2int x = Nativeint.to_string x
- let ml2float x = string_of_float x
- let ml2enum x = escape x
--let ml2set x= let rec loop arg = match arg with
--| []-> ""
--| [x] -> escape x
--| x::y::ys -> escape x ^ "," ^ loop (y::ys)
-- in
--loop x
-+let ml2renum x = real_escape x
-+let ml2set_filter f x =
-+ let rec loop f = function
-+ | []-> ""
-+ | [x] -> f x
-+ | x::y::ys -> f x ^ "," ^ loop f (y::ys)
-+ in loop f x
-+let ml2set x = ml2set_filter escape x
-+let ml2rset conn x = ml2set_filter (real_escape conn) x
-
- let ml2datetimel ~year ~month ~day ~hour ~min ~sec =
- Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'"
-diff --git a/mysql.mli b/mysql.mli
-index 226bc05..2d01108 100644
a/mysql.mli
-+++ b/mysql.mli
-@@ -230,6 +230,7 @@ val fetch_field_dir : result -> int -> field option
- (** [escape str] returns the same string as [str] in MySQL syntax with
- special characters quoted to not confuse the MySQL parser *)
- val escape : string -> string
-+val real_escape : dbd -> string -> string
-
- (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding
- OCaml value *)
-@@ -277,14 +278,18 @@ val not_null : ('a -> 'b) -> 'a option -> 'b
- (** [ml2xxx v] encodes [v] into MySQL s
[Pkg-ocaml-maint-commits] [SCM] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit d2b05dafe216cc66168bd99bf3f2f3763bc405f3 Author: Mehdi Dogguy Date: Tue Jun 5 18:23:52 2012 +0200 Various packaging updates * Bump standards version to 3.9.3 * Switch source package format to 3.0 (quilt) * ... diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 25f8895..000 --- a/debian/README.source +++ /dev/null @@ -1,5 +0,0 @@ -This package uses quilt for patching the source. - -Please consider reading quilt manpage to patch the source. - - -- Mehdi Dogguy , Sat, 31 Oct 2009 23:00:13 +0100 diff --git a/debian/changelog b/debian/changelog index 7a8da62..4431f0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low * Add a Homepage field in debian/control. * Update debian/watch file. * Remove local patches, integrated by upstream. + * Bump standards version to 3.9.3 + * Switch source package format to 3.0 (quilt) -- Mehdi Dogguy Tue, 05 Jun 2012 18:06:10 +0200 diff --git a/debian/control b/debian/control index 88b357d..9bdfc63 100644 --- a/debian/control +++ b/debian/control @@ -11,9 +11,8 @@ Build-Depends: dh-ocaml (>= 0.9), ocaml-nox (>= 3.11), camlp4 (>= 3.11), - ocaml-findlib (>= 1.2.4), - quilt (>= 0.46-7~) -Standards-Version: 3.8.3 + ocaml-findlib (>= 1.2.4) +Standards-Version: 3.9.3 Homepage: http://ocaml-mysql.forge.ocamlcore.org/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mysql-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mysql-ocaml.git diff --git a/debian/rules b/debian/rules index 79500a9..0a15396 100755 --- a/debian/rules +++ b/debian/rules @@ -45,4 +45,4 @@ override_dh_installchangelogs: dh_installchangelogs CHANGES %: - dh --with quilt,ocaml $@ + dh --with ocaml $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- mysql-ocaml 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 659bf2d61ccef17481717fcced6b42fd27485579 Author: Mehdi Dogguy Date: Tue Jun 5 18:38:43 2012 +0200 Generate ref doc using dh_ocamldoc diff --git a/debian/libmysql-ocaml-dev.doc-base b/debian/libmysql-ocaml-dev.doc-base deleted file mode 100644 index 12ba604..000 --- a/debian/libmysql-ocaml-dev.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: libmysql-ocaml-dev-ocamldoc-api-reference -Title: libmysql-ocaml-dev OCamldoc API Reference -Abstract: API reference manual for libmysql-ocaml-dev -Section: Programming/OCaml - -Format: HTML -Index: /usr/share/doc/libmysql-ocaml-dev/html/index.html -Files: /usr/share/doc/libmysql-ocaml-dev/html/* diff --git a/debian/libmysql-ocaml-dev.docs b/debian/libmysql-ocaml-dev.docs deleted file mode 100644 index cecaa8e..000 --- a/debian/libmysql-ocaml-dev.docs +++ /dev/null @@ -1,2 +0,0 @@ -README -doc/html diff --git a/debian/libmysql-ocaml-dev.ocamldoc b/debian/libmysql-ocaml-dev.ocamldoc new file mode 100644 index 000..f6e1841 --- /dev/null +++ b/debian/libmysql-ocaml-dev.ocamldoc @@ -0,0 +1 @@ +# ref doc is generated using dh_ocamldoc(1) -- mysql-ocaml 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch:
commit d78787b7663d9ea009f2debbe778bb4b8ffdd4ec
Author: Mehdi Dogguy
Date: Tue Jun 5 18:45:55 2012 +0200
Fix lintian's duplicate-short-description libmysql-ocaml{,-dev}
diff --git a/debian/changelog b/debian/changelog
index 4431f0f..d1b574c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
* Remove local patches, integrated by upstream.
* Bump standards version to 3.9.3
* Switch source package format to 3.0 (quilt)
+ * Fix lintian's duplicate-short-description libmysql-ocaml{,-dev}
-- Mehdi Dogguy Tue, 05 Jun 2012 18:06:10 +0200
diff --git a/debian/control b/debian/control
index 9bdfc63..933a9ea 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Depends:
${shlibs:Depends}
Provides:
${ocaml:Provides}
-Description: OCaml bindings for MySql
+Description: OCaml bindings for MySql (runtime package)
This OCaml library interfaces the MySql C library. It can be used to access
and modify MySql databases from OCaml programs.
.
@@ -40,7 +40,7 @@ Depends:
libmysqlclient15-dev
Provides:
${ocaml:Provides}
-Description: OCaml bindings for MySql
+Description: OCaml bindings for MySql (development package)
This OCaml library interfaces the MySql C library. It can be used to access
and modify MySql databases from OCaml programs.
.
--
mysql-ocaml 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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch:
commit 3927e7ffcb833c701014c5e024b46e1fe65ee41f
Author: Mehdi Dogguy
Date: Tue Jun 5 18:44:32 2012 +0200
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index d1b574c..d135bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
+mysql-ocaml (1.1.1-1) unstable; urgency=low
* New upstream release
* Add a Homepage field in debian/control.
@@ -8,7 +8,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
* Switch source package format to 3.0 (quilt)
* Fix lintian's duplicate-short-description libmysql-ocaml{,-dev}
- -- Mehdi Dogguy Tue, 05 Jun 2012 18:06:10 +0200
+ -- Mehdi Dogguy Tue, 05 Jun 2012 18:44:32 +0200
mysql-ocaml (1.0.4-7) unstable; urgency=low
--
mysql-ocaml 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] mysql-ocaml packaging branch, pristine-tar, updated. bedb6cc6dcd1bb642d0be889b7abd83b729c45f4
The following commit has been merged in the pristine-tar branch: commit bedb6cc6dcd1bb642d0be889b7abd83b729c45f4 Author: Mehdi Dogguy Date: Tue Jun 5 18:03:18 2012 +0200 pristine-tar data for mysql-ocaml_1.1.1.orig.tar.gz diff --git a/mysql-ocaml_1.1.1.orig.tar.gz.delta b/mysql-ocaml_1.1.1.orig.tar.gz.delta new file mode 100644 index 000..eb156ba Binary files /dev/null and b/mysql-ocaml_1.1.1.orig.tar.gz.delta differ diff --git a/mysql-ocaml_1.1.1.orig.tar.gz.id b/mysql-ocaml_1.1.1.orig.tar.gz.id new file mode 100644 index 000..d068998 --- /dev/null +++ b/mysql-ocaml_1.1.1.orig.tar.gz.id @@ -0,0 +1 @@ +20247e3544f0fe380085e0a0491f85ad9d641bfa -- mysql-ocaml 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] mysql-ocaml packaging annotated tag, debian/1.1.1-1, created. debian/1.1.1-1
The annotated tag, debian/1.1.1-1 has been created
at 46c16605fa472e38373e5e7ff517d3173d7e8411 (tag)
tagging 3927e7ffcb833c701014c5e024b46e1fe65ee41f (commit)
replaces debian/1.0.4-7
tagged by Mehdi Dogguy
on Tue Jun 5 18:51:55 2012 +0200
- Shortlog
Debian release 1.1.1-1
Mehdi Dogguy (10):
Imported Upstream version 1.1.1
Merge tag 'upstream/1.1.1'
New upstream release
Add a Homepage field in debian/control.
Update debian/watch file.
Remove local patches, integrated by upstream.
Various packaging updates
Generate ref doc using dh_ocamldoc
Fix lintian's duplicate-short-description libmysql-ocaml{,-dev}
Release to unstable
---
--
mysql-ocaml 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] mysql-ocaml packaging annotated tag, upstream/1.1.1, created. upstream/1.1.1
The annotated tag, upstream/1.1.1 has been created at d4fe4d3e118e2373fc80a7beed3ef0f5a8ed75ba (tag) tagging 889ff5dee3584843c7648dc3a842439e8cef49ec (commit) replaces upstream/1.0.4 tagged by Mehdi Dogguy on Tue Jun 5 18:03:18 2012 +0200 - Shortlog Upstream version 1.1.1 Mehdi Dogguy (1): Imported Upstream version 1.1.1 --- -- mysql-ocaml 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit d79001972e14a50a95225e0061da901aaf60b974 Merge: c520b2777ccbcb353780547489077a4bf199c540 cbb86997d27b057b0f3e7e1bdc9fc99fce72b54b Author: Mehdi Dogguy Date: Tue Jun 5 21:28:09 2012 +0200 Merge tag 'upstream/1.4.2' Upstream version 1.4.2 -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit f2c3c0b6f14ddb8f61a9c3c18fe4e906788e9914 Merge: d79001972e14a50a95225e0061da901aaf60b974 7bc9541a02fc4c5e231bec52f7ff488ad22046ef Author: Mehdi Dogguy Date: Tue Jun 5 21:28:21 2012 +0200 Merge tag 'upstream/1.4.3' Upstream version 1.4.3 -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit 05ced90ed3af9c74b5a110ae250a2ac802d076e4 Author: Mehdi Dogguy Date: Tue Jun 5 21:31:16 2012 +0200 New upstream release (Closes: 668027) diff --git a/debian/changelog b/debian/changelog index 6f11053..cb08171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-batteries (1.4.3-1) UNRELEASED; urgency=low + + * New upstream release (Closes: 668027) + + -- Mehdi Dogguy Tue, 05 Jun 2012 21:31:12 +0200 + ocaml-batteries (1.4.1-1) unstable; urgency=low * New upstream release. -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit c17c479f73433e1cc699c246efb2bf560498b824 Author: Mehdi Dogguy Date: Tue Jun 5 21:52:01 2012 +0200 Set DOCROOT when building diff --git a/debian/rules b/debian/rules index d13cc96..db5286d 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ export BATTERIES_NATIVE_SHLIB=false endif override_dh_auto_build: - make all + make DOCROOT=$(BATTERIES_DOCROOT) all ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages))) make doc endif -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit e1aeed3ae0fce5def71bafdd7f1374890bbf9d09 Author: Mehdi Dogguy Date: Tue Jun 5 22:20:08 2012 +0200 Rebase local patches (git update) diff --git a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch index 60e5f2b..a7fa9b6 100644 --- a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch +++ b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch @@ -1,16 +1,16 @@ From: Mehdi Dogguy Date: Wed, 14 Jul 2010 22:22:08 +0200 -Subject: [PATCH] Do not enforce sanity-check rules +Subject: Do not enforce sanity-check rules --- Makefile |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 0e186d5..f59c7e9 100644 +index f359e95..29fc6e3 100644 --- a/Makefile +++ b/Makefile -@@ -71,7 +71,7 @@ clean: +@@ -72,7 +72,7 @@ clean: $(OCAMLBUILD) -clean doc: -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit dbfc9efec3542b253ed85358250e669ddd2811e3 Author: Mehdi Dogguy Date: Tue Jun 5 22:35:55 2012 +0200 Add two patches to fix minor issues diff --git a/debian/changelog b/debian/changelog index cb08171..acb7f6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ocaml-batteries (1.4.3-1) UNRELEASED; urgency=low * New upstream release (Closes: 668027) +- add 0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch +- add 0003-Fix-doc-batteries-html-extensions.html.patch -- Mehdi Dogguy Tue, 05 Jun 2012 21:31:12 +0200 diff --git a/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch b/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch new file mode 100644 index 000..7ab0ef9 --- /dev/null +++ b/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch @@ -0,0 +1,23 @@ +From: Mehdi Dogguy +Date: Tue, 5 Jun 2012 22:21:14 +0200 +Subject: Use mirror of ocaml-tutorial.org, which is dead + +--- + doc/batteries/language.idex |4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/batteries/language.idex b/doc/batteries/language.idex +index 0eedbf7..78af91b 100644 +--- a/doc/batteries/language.idex b/doc/batteries/language.idex +@@ -1,7 +1,7 @@ + "the tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html"; + "The tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html"; + "The Tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html"; +-"For programmers": "http://www.ocaml-tutorial.org"; +-"for programmers": "http://www.ocaml-tutorial.org"; ++"For programmers": "http://mirror.ocamlcore.org/ocaml-tutorial.org/"; ++"for programmers": "http://mirror.ocamlcore.org/ocaml-tutorial.org/"; + "directives": "html/toplevel.html#directives" + "batteries":"html/index.html" +-- diff --git a/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch b/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch new file mode 100644 index 000..d836579 --- /dev/null +++ b/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch @@ -0,0 +1,33 @@ +From: Mehdi Dogguy +Date: Tue, 5 Jun 2012 22:34:22 +0200 +Subject: Fix doc/batteries/html/extensions.html + +--- + doc/batteries/html/extensions.html |7 +-- + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/doc/batteries/html/extensions.html b/doc/batteries/html/extensions.html +index 1f19e2f..cca8cbd 100644 +--- a/doc/batteries/html/extensions.html b/doc/batteries/html/extensions.html +@@ -111,7 +111,7 @@ Again, immutable latin-1 strings are automatically optimized. + + The same syntax may be used to pattern-match against ropes, UTF-8 strings and string with capabilities. + +- Lazy List syntax ++ Lazy List syntax + + A few new constructs are added to make using lazy lists easier. As an expression, [%] is a shortcut for lazy BatLazyList.Nil, the empty lazy list. + +@@ -123,10 +123,5 @@ BatLazyList.Cons(a,b). + + + +-Summary of new keywords +- +-where, defined by pa_where +- +- + + +-- diff --git a/debian/patches/series b/debian/patches/series index 98d1f0e..cc47de0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-Do-not-enforce-sanity-check-rules.patch +0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch +0003-Fix-doc-batteries-html-extensions.html.patch -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit 5140612caa9e1f4621f0f6a0436233ab493a57f8 Author: Mehdi Dogguy Date: Tue Jun 5 22:51:41 2012 +0200 Release to unstable diff --git a/debian/changelog b/debian/changelog index acb7f6b..4d8d39b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -ocaml-batteries (1.4.3-1) UNRELEASED; urgency=low +ocaml-batteries (1.4.3-1) unstable; urgency=low * New upstream release (Closes: 668027) - add 0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch - add 0003-Fix-doc-batteries-html-extensions.html.patch - -- Mehdi Dogguy Tue, 05 Jun 2012 21:31:12 +0200 + -- Mehdi Dogguy Tue, 05 Jun 2012 22:51:41 +0200 ocaml-batteries (1.4.1-1) unstable; urgency=low -- ocaml-batteries 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] ocaml-batteries packaging branch, pristine-tar, updated. ba40c918666461365cc98fda9a9484cbec258998
The following commit has been merged in the pristine-tar branch: commit b3c723447e123766a6a3cb921f24ea4b3fb9b069 Author: Mehdi Dogguy Date: Tue Jun 5 21:28:09 2012 +0200 pristine-tar data for ocaml-batteries_1.4.2.orig.tar.gz diff --git a/ocaml-batteries_1.4.2.orig.tar.gz.delta b/ocaml-batteries_1.4.2.orig.tar.gz.delta new file mode 100644 index 000..5cda264 Binary files /dev/null and b/ocaml-batteries_1.4.2.orig.tar.gz.delta differ diff --git a/ocaml-batteries_1.4.2.orig.tar.gz.id b/ocaml-batteries_1.4.2.orig.tar.gz.id new file mode 100644 index 000..1cfaa53 --- /dev/null +++ b/ocaml-batteries_1.4.2.orig.tar.gz.id @@ -0,0 +1 @@ +d93e8efa33f9eeaf585a6eb10a48477d1d913edd -- ocaml-batteries 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] ocaml-batteries packaging branch, pristine-tar, updated. ba40c918666461365cc98fda9a9484cbec258998
The following commit has been merged in the pristine-tar branch: commit ba40c918666461365cc98fda9a9484cbec258998 Author: Mehdi Dogguy Date: Tue Jun 5 21:28:21 2012 +0200 pristine-tar data for ocaml-batteries_1.4.3.orig.tar.gz diff --git a/ocaml-batteries_1.4.3.orig.tar.gz.delta b/ocaml-batteries_1.4.3.orig.tar.gz.delta new file mode 100644 index 000..842aa2d Binary files /dev/null and b/ocaml-batteries_1.4.3.orig.tar.gz.delta differ diff --git a/ocaml-batteries_1.4.3.orig.tar.gz.id b/ocaml-batteries_1.4.3.orig.tar.gz.id new file mode 100644 index 000..1c01106 --- /dev/null +++ b/ocaml-batteries_1.4.3.orig.tar.gz.id @@ -0,0 +1 @@ +a57551c7a6656159854432a71ed708a799f04e9b -- ocaml-batteries 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] ocaml-batteries packaging annotated tag, debian/1.4.3-1, created. debian/1.4.3-1
The annotated tag, debian/1.4.3-1 has been created at 5c33189865e89380580668de29df5be888f6bbfd (tag) tagging 5140612caa9e1f4621f0f6a0436233ab493a57f8 (commit) replaces debian/1.4.1-1 tagged by Mehdi Dogguy on Tue Jun 5 22:55:08 2012 +0200 - Shortlog Debian release 1.4.3-1 Mehdi Dogguy (9): Imported Upstream version 1.4.2 Merge tag 'upstream/1.4.2' Imported Upstream version 1.4.3 Merge tag 'upstream/1.4.3' New upstream release (Closes: 668027) Set DOCROOT when building Rebase local patches (git update) Add two patches to fix minor issues Release to unstable --- -- ocaml-batteries 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] ocaml-batteries packaging annotated tag, upstream/1.4.2, created. upstream/1.4.2
The annotated tag, upstream/1.4.2 has been created at 2c0e7be053e77168dedb2d4d9293968bc11cc391 (tag) tagging cbb86997d27b057b0f3e7e1bdc9fc99fce72b54b (commit) replaces upstream/1.4.1 tagged by Mehdi Dogguy on Tue Jun 5 21:28:09 2012 +0200 - Shortlog Upstream version 1.4.2 Mehdi Dogguy (1): Imported Upstream version 1.4.2 --- -- ocaml-batteries 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] ocaml-batteries packaging annotated tag, upstream/1.4.3, created. upstream/1.4.3
The annotated tag, upstream/1.4.3 has been created at 3f540de1d76e07a232627b5d1657770976bfe663 (tag) tagging 7bc9541a02fc4c5e231bec52f7ff488ad22046ef (commit) replaces upstream/1.4.2 tagged by Mehdi Dogguy on Tue Jun 5 21:28:21 2012 +0200 - Shortlog Upstream version 1.4.3 Mehdi Dogguy (1): Imported Upstream version 1.4.3 --- -- ocaml-batteries 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
