[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, master, updated. debian/0.1.0-2-14-g239ce06
The following commit has been merged in the master branch: commit 6b0184ef2c433ca9c31c870c13a106a14e7a9836 Author: Stephane Glondu Date: Mon Jun 27 09:03:15 2011 +0200 Add myself to Uploaders, remove Stefano diff --git a/debian/control b/debian/control index 6727f47..cea9574 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fieldslib Section: ocaml Priority: extra Maintainer: Debian OCaml Maintainers -Uploaders: Stefano Zacchiroli , +Uploaders: Stéphane Glondu Build-Depends: debhelper (>= 8), ocaml-nox (>= 3.12), -- fieldslib 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] fieldslib packaging branch, master, updated. debian/0.1.0-2-14-g239ce06
The following commit has been merged in the master branch: commit 239ce066b19d1710eb2f082e271b9f01ec7e3714 Author: Stephane Glondu Date: Mon Jun 27 09:06:56 2011 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 979b941..c120f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,15 @@ -fieldslib (0.1.2-1) UNRELEASED; urgency=low +fieldslib (0.1.2-1) unstable; urgency=low * New upstream release - remove obsolete patch + * Add myself to Uploaders, remove Stefano * Rewrite debian/rules using dh with overrides * Switch source package format to 3.0 (quilt) * Bump Standards-Version to 3.9.2 * Bump debhelper compat level to 8 + * Update debian/watch - -- Stéphane Glondu Sun, 26 Jun 2011 22:57:31 +0200 + -- Stéphane Glondu Mon, 27 Jun 2011 09:06:42 +0200 fieldslib (0.1.0-2) unstable; urgency=low -- fieldslib 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] fieldslib packaging annotated tag, debian/0.1.2-1, created. debian/0.1.2-1
The annotated tag, debian/0.1.2-1 has been created at ab9a6ec225df1d0fe1082c2d74fdc22aed1cd565 (tag) tagging 239ce066b19d1710eb2f082e271b9f01ec7e3714 (commit) replaces debian/0.1.0-2 tagged by Stephane Glondu on Mon Jun 27 09:09:11 2011 +0200 - Shortlog Debian release 0.1.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOCCyXAAoJEHhT2k1JiBrTeCQQAIBTIrMGyfmw7V9hqavmUCfR CTvTgv7cHJ0XpJJs6tItdig8Eiu8tfJXEfjXZfuLkY8y7cHXEvExe/F5fiYMwnqb PwjLob1Ifg/qG+LvhjME7QqnqAQf4nJu4yu0fmuv8RoHzXZWcfqHwomOSOm03D9J u9HLP8qOnm0No3VQU/2im7cyNHD7XJ7gN5PErzyCZVUd4saV/pHyh1oDkE61wXqX FZ7f+zVj/bK9X92S+vkz6QoY5OtQ1Y95QTS/7av4huKZ1LAHJuXRz495RQxsvTUi KBIq8i060X2UeauDJxk8Sa7MiG2YgOfhf/DFXRUhHnAkIH2Iyes0up/bU0ziZLjD /o/vsNkKfN33BKLrTKx574gN0cUSqVjDtewqRhbG9hikWYJmb3vaTGbzlBU/i6IK u+qoU6SrUCIkfiaTC3f2Lb0YjHU4OvKb6fgfBQqFDxuRHvb9k+kxl0Hz0NbNDB8h 67jol5d1JzMb+ytOR6aPEkAWja0cejTZFy+OclT3avV0/Cs/yb3ppcTmoZUCil0a hPqacZPz1qu3R4aIAGPyirYIVgzAaWJVY/9r0lCOMeou5r2UDdmjhI3dpT8/KrWJ f6n1dc6W9KNYPji1JkrDmJnFehrP6+528P22b4ghwJe6/HLAn7etpgWwVOH/eVs9 Scr8+CI9koBwFiXavyxo =SzdW -END PGP SIGNATURE- Stephane Glondu (14): Fix watch file Imported Upstream version 0.1.2 Merge commit 'upstream/0.1.2' New upstream release Bump versioned build-dependencies Remove obsolete patches Bump debhelper compat level to 8 Switch source package format to 3.0 (quilt) Remove unneeded build-dependencies Bump Standards-Version to 3.9.2 (no changes) New debian/rules using dh with overrides Update changelog Add myself to Uploaders, remove Stefano Update changelog and prepare upload to unstable --- -- fieldslib 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit ac0584ab4d9c4258fb3923e063e68c6a69c266ee Merge: 0ab28856f89224ba55633b76ad11840107cee18e b5b230d22f40d90b00be545a13417e5d6987c55f Author: Stephane Glondu Date: Mon Jun 27 09:40:19 2011 +0200 Merge commit 'upstream/1.3.1' -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit 0ab28856f89224ba55633b76ad11840107cee18e Author: Stephane Glondu Date: Mon Jun 27 09:39:54 2011 +0200 Update debian/watch to follow Jane Street diff --git a/debian/watch b/debian/watch index a94fa12..6664391 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=3 -opts=filenamemangle=s/.*-(.*)\.tar\.gz/bin-prot-$1.tar.gz/ \ - http://www.ocaml.info/home/ocaml_sources.html \ - http://hg.ocaml.info/release/bin-prot/archive/release-(.*)\.tar\.gz +http://ocaml.janestcapital.com/?q=node/13 \ + http://www.janestreet.com/ocaml/bin_prot-(.*)\.tar\.gz -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit cd735bad5b5cf5367edd4e01ca379bb15c70fb1c Author: Stephane Glondu Date: Mon Jun 27 09:41:28 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 429246e..e7977c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bin-prot (1.3.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Mon, 27 Jun 2011 09:41:23 +0200 + bin-prot (1.2.24-1) unstable; urgency=low * Team upload -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit 8ba78ecc2d895b46ee2ff4a172d82895928575bf Author: Stephane Glondu Date: Mon Jun 27 09:41:55 2011 +0200 Remove obsolete patches diff --git a/debian/patches/0001-support-for-building-installing-only-bytecode.patch b/debian/patches/0001-support-for-building-installing-only-bytecode.patch deleted file mode 100644 index 85226bc..000 --- a/debian/patches/0001-support-for-building-installing-only-bytecode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Stefano Zacchiroli -Date: Sat, 3 May 2008 21:14:06 +0200 -Subject: [PATCH] support for building/installing only bytecode - - Makefile | 10 ++ - OCamlMakefile |2 +- - lib/Makefile |5 + - 3 files changed, 16 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 4c67b1a..a62fe64 100644 a/Makefile -+++ b/Makefile -@@ -3,10 +3,20 @@ all: - @cd lib && $(MAKE) - @cd lib_test && make - -+.PHONY: byte -+byte: -+ @cd lib && $(MAKE) byte -+ @cd lib_test && make -+ -+ - .PHONY: install - install: - @cd lib && $(MAKE) $@ - -+.PHONY: libinstall-byte-code -+libinstall-byte-code: -+ @cd lib && $(MAKE) $@ -+ - .PHONY: uninstall - uninstall: - @cd lib && $(MAKE) $@ -diff --git a/OCamlMakefile b/OCamlMakefile -index 830f56e..041252f 100644 a/OCamlMakefile -+++ b/OCamlMakefile -@@ -1182,7 +1182,7 @@ libinstall: all - $(QUIET)printf "\nInstallation successful.\n" - - .PHONY: libinstall-byte-code --libinstall-byte-code: all -+libinstall-byte-code: byte-code - $(QUIET)printf "\nInstalling byte-code library with ocamlfind\n" - $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \ - $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES)) -diff --git a/lib/Makefile b/lib/Makefile -index 5bcb328..0cca65f 100644 a/lib/Makefile -+++ b/lib/Makefile -@@ -44,6 +44,11 @@ all: \ - byte-code-library native-code-library \ - pa_bin_prot.cmi pa_bin_prot.cmo - -+byte: \ -+ pack-byte-code \ -+ byte-code-library \ -+ pa_bin_prot.cmi pa_bin_prot.cmo -+ - LIBINSTALL_FILES = \ - common.mli nat0.mli read_c.mli read_ml.mli size.mli \ - unsafe_common.mli unsafe_read_c.mli unsafe_write_c.mli \ --- diff --git a/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch b/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch deleted file mode 100644 index 87cc711..000 --- a/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Stefano Zacchiroli -Date: Fri, 9 May 2008 15:25:00 +0200 -Subject: [PATCH] fix OCamlMakefile to ensure -fPIC is added to build .o - -(fix FTBFS on 64 bit architectures) - OCamlMakefile |1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/OCamlMakefile b/OCamlMakefile -index 041252f..94e0c4f 100644 a/OCamlMakefile -+++ b/OCamlMakefile -@@ -1074,6 +1074,7 @@ endif - - .c.$(EXT_OBJ): - $(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \ -+ -fPIC \ - $(CPPFLAGS) $(CPPFLAGS_WIN32) \ - $(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $< - --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9b37095..000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-support-for-building-installing-only-bytecode.patch -0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit e1bdb278576f637a586e6b2cdf1e965c5ac9c126 Author: Stephane Glondu Date: Mon Jun 27 09:43:54 2011 +0200 Bump versioned build-dependencies diff --git a/debian/control b/debian/control index 6920a24..600c3fb 100644 --- a/debian/control +++ b/debian/control @@ -8,11 +8,11 @@ Build-Depends: debhelper (>= 8), cdbs, dh-ocaml (>= 0.9~), - ocaml-nox (>= 3.11.1), + ocaml-nox (>= 3.12), ocaml-findlib (>= 1.2.4), camlp4, camlp4-extra, - libtype-conv-camlp4-dev (>= 1.6.7-2), + libtype-conv-camlp4-dev (>= 2.3.0), libounit-ocaml-dev (>= 1.1.0-3~) Standards-Version: 3.9.1 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/bin-prot.git -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit da318d0a1cc93eb621365c0bdd3b90a2ab7f6105 Author: Stephane Glondu Date: Mon Jun 27 09:44:44 2011 +0200 Bump Standards-Version to 3.9.2 (no changes) diff --git a/debian/control b/debian/control index 600c3fb..b3b47cf 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: camlp4-extra, libtype-conv-camlp4-dev (>= 2.3.0), libounit-ocaml-dev (>= 1.1.0-3~) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/bin-prot.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/bin-prot.git Homepage: http://www.ocaml.info/home/ocaml_sources.html#bin-prot -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit f50f04007a09663a67643599bd7a829e64ffdc2c Author: Stephane Glondu Date: Mon Jun 27 09:45:59 2011 +0200 New debian/rules using dh with overrides diff --git a/debian/control b/debian/control index b3b47cf..1744ad2 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Sylvain Le Gall Build-Depends: debhelper (>= 8), - cdbs, dh-ocaml (>= 0.9~), ocaml-nox (>= 3.12), ocaml-findlib (>= 1.2.4), diff --git a/debian/rules b/debian/rules index 9a5d1d7..a5495de 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,36 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/ocaml.mk -include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/cdbs/1/rules/debhelper.mk -LIB_NAME = bin-prot -PKG_NAME = lib$(LIB_NAME)-camlp4-dev -DESTDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_STDLIB_DIR) -DESTDLLDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_DLL_DIR) +DESTDIR=$(CURDIR)/debian/libbin-prot-camlp4-dev -ifeq ($(OCAML_HAVE_OCAMLOPT),yes) -DEB_MAKE_BUILD_TARGET = all -DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR) -ldconf ignore" -else -DEB_MAKE_BUILD_TARGET = byte -DEB_MAKE_INSTALL_TARGET = libinstall-byte-code OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR) -ldconf ignore" -endif +include /usr/share/ocaml/ocamlvars.mk -OCAML_DHOCAML_FLAGS += --runtime-map libbin-prot-camlp4-dev:- +export OCAML_DLL_DIR +export OCAML_HAVE_OCAMLOPT +export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) -build/$(PKG_NAME):: - mkdir -p $(DESTDIR) $(DESTDLLDIR) +%: + dh $@ --with ocaml +.PHONY: override_dh_auto_configure +override_dh_auto_configure: + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libbin-prot-camlp4-dev + +.PHONY: override_dh_auto_build +override_dh_auto_build: + ocaml setup.ml -build + ocaml setup.ml -doc + +.PHONY: override_dh_auto_test +override_dh_auto_test: + ocaml setup.ml -test + +.PHONY: override_dh_auto_install +override_dh_auto_install: + mkdir -p '$(OCAMLFIND_DESTDIR)' + mkdir -p '$(DESTDIR)$(OCAML_DLL_DIR)' + ocaml setup.ml -install + rm -f '$(DESTDIR)$(OCAML_DLL_DIR)'/*.so.owner + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + ocaml setup.ml -distclean -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit cbb53abdb264f65865ad4f728f531bc2ed6e5a46 Author: Stephane Glondu Date: Mon Jun 27 09:51:50 2011 +0200 Update debian/docs diff --git a/debian/docs b/debian/docs index 71dfd5b..e845566 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -README.txt +README -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit 67becb1c4fc203c2ffdf17f364d85557b8c32349 Author: Stephane Glondu Date: Mon Jun 27 15:23:33 2011 +0200 Temporarily disable bigstring tests diff --git a/debian/patches/0001-Disable-bigstring-tests-temporary-measure.patch b/debian/patches/0001-Disable-bigstring-tests-temporary-measure.patch new file mode 100644 index 000..299e57f --- /dev/null +++ b/debian/patches/0001-Disable-bigstring-tests-temporary-measure.patch @@ -0,0 +1,37 @@ +From: Stephane Glondu +Date: Mon, 27 Jun 2011 15:21:47 +0200 +Subject: Disable bigstring tests (temporary measure) + +They are failing because of changes in comparisons of big arrays in +OCaml 3.12.1... +--- + lib_test/bin_prot_test.ml | 15 --- + 1 files changed, 0 insertions(+), 15 deletions(-) + +diff --git a/lib_test/bin_prot_test.ml b/lib_test/bin_prot_test.ml +index 75b7f31..d245f69 100644 +--- a/lib_test/bin_prot_test.ml b/lib_test/bin_prot_test.ml +@@ -854,21 +854,6 @@ module Make (Spec : SPEC) (Read : Reader_spec) (Write : Writer_spec) = struct + ] + ); + +-"bigstring" >:: +- (fun () -> +-let n = 128 in +-let header = 3 in +-let size = header + n in +-let bstr = mk_bigstring n in +-check_all size "bigstring" +- Read.bin_read_bigstring +- Write.bin_write_bigstring +- [ +-(bstr, "[| ... |]", size); +-(mk_bigstring 0, "[||]", 1); +- ] +- ); +- + "variant_tag" >:: + (fun () -> + check_all 4 "variant_tag" +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..4623feb --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Disable-bigstring-tests-temporary-measure.patch -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit aa741eb9c8d77528d1c2854dfd193bf98bf9032d Author: Stephane Glondu Date: Mon Jun 27 15:51:11 2011 +0200 Update Homepage to Jane Street diff --git a/debian/control b/debian/control index 1744ad2..edb0616 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: Standards-Version: 3.9.2 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/bin-prot.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/bin-prot.git -Homepage: http://www.ocaml.info/home/ocaml_sources.html#bin-prot +Homepage: http://ocaml.janestreet.com/?q=node/13 Package: libbin-prot-camlp4-dev Architecture: any -- bin-prot 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] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999
The following commit has been merged in the master branch: commit 8301999ae60da58e6962435b7118388fa94752cc Author: Stephane Glondu Date: Mon Jun 27 15:29:33 2011 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index e7977c4..7214f3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -bin-prot (1.3.1-1) UNRELEASED; urgency=low +bin-prot (1.3.1-1) unstable; urgency=low * New upstream release - - -- Stéphane Glondu Mon, 27 Jun 2011 09:41:23 +0200 +- remove obsolete patches +- temporarily disable bigstring tests (they fail with OCaml 3.12.1) + * Add myself to Uploaders + * Rewrite debian/rules using dh with overrides + * Bump Standards-Version to 3.9.2 + * Update debian/watch to follow Jane Street + * Update Homepage to Jane Street + + -- Stéphane Glondu Mon, 27 Jun 2011 15:51:14 +0200 bin-prot (1.2.24-1) unstable; urgency=low diff --git a/debian/control b/debian/control index edb0616..b5cbffc 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: ocaml Priority: extra Maintainer: Debian OCaml Maintainers Uploaders: + Stéphane Glondu , Sylvain Le Gall Build-Depends: debhelper (>= 8), -- bin-prot 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] bin-prot packaging branch, pristine-tar, updated. 6aa25213cea533f56d4113bfbfb944a2af2a9779
The following commit has been merged in the pristine-tar branch: commit 6aa25213cea533f56d4113bfbfb944a2af2a9779 Author: Stephane Glondu Date: Mon Jun 27 09:40:19 2011 +0200 pristine-tar data for bin-prot_1.3.1.orig.tar.gz diff --git a/bin-prot_1.3.1.orig.tar.gz.delta b/bin-prot_1.3.1.orig.tar.gz.delta new file mode 100644 index 000..0a95f15 Binary files /dev/null and b/bin-prot_1.3.1.orig.tar.gz.delta differ diff --git a/bin-prot_1.3.1.orig.tar.gz.id b/bin-prot_1.3.1.orig.tar.gz.id new file mode 100644 index 000..05c01c7 --- /dev/null +++ b/bin-prot_1.3.1.orig.tar.gz.id @@ -0,0 +1 @@ +b5b230d22f40d90b00be545a13417e5d6987c55f -- bin-prot 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] bin-prot packaging annotated tag, upstream/1.3.1, created. upstream/1.3.1
The annotated tag, upstream/1.3.1 has been created at ffe863d9451216a14657659c9c41628a210cb3e7 (tag) tagging b5b230d22f40d90b00be545a13417e5d6987c55f (commit) replaces upstream/1.2.24 tagged by Stephane Glondu on Mon Jun 27 09:40:19 2011 +0200 - Shortlog Upstream version 1.3.1 Stephane Glondu (1): Imported Upstream version 1.3.1 --- -- bin-prot 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-data-notation packaging branch, master, updated. debian/0.0.3-1-9-gb11498e
The following commit has been merged in the master branch: commit 66b8ae14de675a1f44fa4d838d5460737d5d68bb Merge: deea917ba7fad25cfcf3084e73ad7ccf7942c5b8 587a169a7380edb73ab7f03fbcb85bb4ef43fa93 Author: Stephane Glondu Date: Mon Jun 27 18:07:30 2011 +0200 Merge commit 'upstream/0.0.6' -- ocaml-data-notation 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-data-notation packaging branch, master, updated. debian/0.0.3-1-9-gb11498e
The following commit has been merged in the master branch: commit c3073427e0dab32587a0aa9b0879852039d0 Author: Stephane Glondu Date: Mon Jun 27 17:49:51 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 2b876b5..04aaea7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-data-notation (0.0.6-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Mon, 27 Jun 2011 17:49:35 +0200 + ocaml-data-notation (0.0.3-1) unstable; urgency=low * New upstream version -- ocaml-data-notation 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-data-notation packaging branch, master, updated. debian/0.0.3-1-9-gb11498e
The following commit has been merged in the master branch: commit ab5fe5731be21694144cf5c11941c8f02943d921 Author: Stephane Glondu Date: Mon Jun 27 17:46:00 2011 +0200 Add debian/watch diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..5526c39 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version=3 +http://forge.ocamlcore.org/frs/?group_id=148 .*/ocaml-data-notation-(.*)\.tar\.gz +# Upstream darcs repository: +# http://forge.ocamlcore.org/anonscm/darcs/odn/ocaml-data-notation +# http://forge.ocamlcore.org/scm/browser.php?group_id=148&repo_name=ocaml-data-notation -- ocaml-data-notation 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-data-notation packaging branch, master, updated. debian/0.0.3-1-9-gb11498e
The following commit has been merged in the master branch: commit b11498e4af62af71cf5c6e30dc51cc8b06314c08 Author: Stephane Glondu Date: Mon Jun 27 17:53:53 2011 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 04aaea7..fe97d5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -ocaml-data-notation (0.0.6-1) UNRELEASED; urgency=low +ocaml-data-notation (0.0.6-1) unstable; urgency=low + * Team upload * New upstream release + * Add debian/watch - -- Stéphane Glondu Mon, 27 Jun 2011 17:49:35 +0200 + -- Stéphane Glondu Mon, 27 Jun 2011 17:57:16 +0200 ocaml-data-notation (0.0.3-1) unstable; urgency=low -- ocaml-data-notation 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-data-notation packaging branch, master, updated. debian/0.0.3-1-9-gb11498e
The following commit has been merged in the master branch: commit 22802edbbba7248d85a3a109b596f06db7c7f19d Author: Stephane Glondu Date: Mon Jun 27 17:52:51 2011 +0200 Ignore src/META.bak removed by upstream cleaning rule diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..8820cde --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +src/META.bak diff --git a/src/META.bak b/src/META.bak deleted file mode 100644 index 279a271..000 --- a/src/META.bak +++ /dev/null @@ -1,52 +0,0 @@ - -# ODN: Dump data using OCaml notation # -# # -# Copyright (C) 2009-2011, OCamlCore SARL # -# # -# This library 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, with the OCaml static compilation # -# exception. # -# # -# This library is distributed in the hope that it will be useful, but # -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY # -# or FITNESS FOR A PARTICULAR PURPOSE. See the file COPYING for more # -# details. # -# # -# You should have received a copy of the GNU Lesser General Public License # -# along with this library; if not, write to the Free Software Foundation, # -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # - - -# OASIS_START -# DO NOT EDIT (digest: 76a57250480fb2fef14acb964037297b) -version = "0.0.2" -description = "Store data using OCaml notation" -archive(byte) = "odn.cma" -archive(native) = "odn.cmxa" -exists_if = "odn.cma" -package "without" ( - description = "Virtual container" - package "syntax" ( - version = "0.0.2" - description = "Syntax extension that removes 'with odn'" - requires = "type-conv camlp4" - archive(syntax,preprocessor) = "pa_noodn.cma" - archive(syntax,toploop) = "pa_noodn.cma" - exists_if = "pa_noodn.cma" - ) -) - -package "with" ( - description = "Virtual container" - package "syntax" ( - version = "0.0.2" - description = "Syntax extension for odn" - requires = "type-conv camlp4 odn" - archive(syntax,preprocessor) = "pa_odn.cma" - archive(syntax,toploop) = "pa_odn.cma" - exists_if = "pa_odn.cma" - ) -) -# OASIS_STOP -- ocaml-data-notation 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-data-notation packaging branch, pristine-tar, updated. ea16feeee5700f89d78515ce7231732479c9983f
The following commit has been merged in the pristine-tar branch: commit 4990a5ff5d865ad4ba2917e2ed86e997b9147eed Author: Stephane Glondu Date: Mon Jun 27 18:07:21 2011 +0200 pristine-tar data for ocaml-data-notation_0.0.5.orig.tar.gz diff --git a/ocaml-data-notation_0.0.5.orig.tar.gz.delta b/ocaml-data-notation_0.0.5.orig.tar.gz.delta new file mode 100644 index 000..05cdb54 Binary files /dev/null and b/ocaml-data-notation_0.0.5.orig.tar.gz.delta differ diff --git a/ocaml-data-notation_0.0.5.orig.tar.gz.id b/ocaml-data-notation_0.0.5.orig.tar.gz.id new file mode 100644 index 000..59ba2f8 --- /dev/null +++ b/ocaml-data-notation_0.0.5.orig.tar.gz.id @@ -0,0 +1 @@ +dcb037a674f175e444afd311a668944c7ed84d7d -- ocaml-data-notation 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-data-notation packaging branch, pristine-tar, updated. ea16feeee5700f89d78515ce7231732479c9983f
The following commit has been merged in the pristine-tar branch: commit ea16f5700f89d78515ce7231732479c9983f Author: Stephane Glondu Date: Mon Jun 27 18:07:30 2011 +0200 pristine-tar data for ocaml-data-notation_0.0.6.orig.tar.gz diff --git a/ocaml-data-notation_0.0.6.orig.tar.gz.delta b/ocaml-data-notation_0.0.6.orig.tar.gz.delta new file mode 100644 index 000..d8d0548 Binary files /dev/null and b/ocaml-data-notation_0.0.6.orig.tar.gz.delta differ diff --git a/ocaml-data-notation_0.0.6.orig.tar.gz.id b/ocaml-data-notation_0.0.6.orig.tar.gz.id new file mode 100644 index 000..01eed88 --- /dev/null +++ b/ocaml-data-notation_0.0.6.orig.tar.gz.id @@ -0,0 +1 @@ +587a169a7380edb73ab7f03fbcb85bb4ef43fa93 -- ocaml-data-notation 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-data-notation packaging annotated tag, upstream/0.0.4, created. upstream/0.0.4
The annotated tag, upstream/0.0.4 has been created at a6976ef6505a33ab2e930b266b9e85eeccf2f8ae (tag) tagging 958dc9255995b63e9dd6f6996aeb22838792957a (commit) replaces upstream/0.0.3 tagged by Stephane Glondu on Mon Jun 27 18:07:17 2011 +0200 - Shortlog Upstream version 0.0.4 Stephane Glondu (1): Imported Upstream version 0.0.4 --- -- ocaml-data-notation 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-data-notation packaging branch, pristine-tar, updated. ea16feeee5700f89d78515ce7231732479c9983f
The following commit has been merged in the pristine-tar branch: commit acb84e4b886ee544f586eaf9bd74d2a11d9ea302 Author: Stephane Glondu Date: Mon Jun 27 18:07:17 2011 +0200 pristine-tar data for ocaml-data-notation_0.0.4.orig.tar.gz diff --git a/ocaml-data-notation_0.0.4.orig.tar.gz.delta b/ocaml-data-notation_0.0.4.orig.tar.gz.delta new file mode 100644 index 000..faebc50 Binary files /dev/null and b/ocaml-data-notation_0.0.4.orig.tar.gz.delta differ diff --git a/ocaml-data-notation_0.0.4.orig.tar.gz.id b/ocaml-data-notation_0.0.4.orig.tar.gz.id new file mode 100644 index 000..3e3a60c --- /dev/null +++ b/ocaml-data-notation_0.0.4.orig.tar.gz.id @@ -0,0 +1 @@ +958dc9255995b63e9dd6f6996aeb22838792957a -- ocaml-data-notation 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-data-notation packaging annotated tag, upstream/0.0.5, created. upstream/0.0.5
The annotated tag, upstream/0.0.5 has been created at 6e1d25baa257310e31ca1cec619d935ff9569eb0 (tag) tagging dcb037a674f175e444afd311a668944c7ed84d7d (commit) replaces upstream/0.0.4 tagged by Stephane Glondu on Mon Jun 27 18:07:21 2011 +0200 - Shortlog Upstream version 0.0.5 Stephane Glondu (1): Imported Upstream version 0.0.5 --- -- ocaml-data-notation 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-data-notation packaging annotated tag, upstream/0.0.6, created. upstream/0.0.6
The annotated tag, upstream/0.0.6 has been created at a0fe2ebd42dbc3b3a374d497779940d6d2818e81 (tag) tagging 587a169a7380edb73ab7f03fbcb85bb4ef43fa93 (commit) replaces upstream/0.0.5 tagged by Stephane Glondu on Mon Jun 27 18:07:30 2011 +0200 - Shortlog Upstream version 0.0.6 Stephane Glondu (1): Imported Upstream version 0.0.6 --- -- ocaml-data-notation 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-data-notation packaging annotated tag, debian/0.0.6-1, created. debian/0.0.6-1
The annotated tag, debian/0.0.6-1 has been created at cfe8cb58df1ca36b67229c27d8d42353700ff512 (tag) tagging b11498e4af62af71cf5c6e30dc51cc8b06314c08 (commit) replaces debian/0.0.3-1 tagged by Stephane Glondu on Mon Jun 27 18:21:28 2011 +0200 - Shortlog Debian release 0.0.6-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABCgAGBQJOCK4IAAoJEHhT2k1JiBrTZmMP/29OX0qHVGoWGoQzvigFY8Ci 4+YcGeWJgRRf1ge49PIXMHuBKXxzxdtCnEJqTw/7iog3I/g6nA8ohG8UEmqIO5cW YRPOmZFUb9Oks9yQp2Tr/UfbIS5hrNkE/Bvirj4mi4DYRubiWjKLFS+11yoi0yWr fIiWJRZG5779iZ6VpRIeFs3TIWOElr5tiwhwT1FSWfz2TNkdx50vbaw9QWgTwq/c auH9mitc+fS3dskXx4HFSq5NqED0eQ11s6+LgXtSturgdD/saH50DwZb4KAL3Swi eMcSW3DgpWl5i9bO67SpMuGBLv91N5ZUVdulXQLBfW9M2bu0CbLGLZRK7SExgXD+ aNy8I0XCtPwSkqiURuO/+uUzM2S7/NBio8AARLOTNlhdW3/s/HvU8t+XPGpmv5pb glonar3DkJYDpISnnA19Wqiy2ogc+7fOqMH7sUQUX7VuRwjf28qAeuO7O2oPEVB1 YqG42941MibwDs+KFE7/knF2/vNUCaYDZLBmWPhZ9o1+HbP5KMphDp4zVWfRRC2c hiuOc5/nTJBpVPOd5AuD7KETkJMzJdr5NBmnY9kEp1uSBsf6GGbjL7J1EvapKlcm EZRExLlkr8S+LyddQChNS62R/sDPftAy+/Do4Vv9Wrlb1f3BhWW0ek1Rld+s5ZsN uabJNsKSaaVeVqfrDkpA =MMmx -END PGP SIGNATURE- Stephane Glondu (8): Imported Upstream version 0.0.4 Imported Upstream version 0.0.5 Imported Upstream version 0.0.6 Merge commit 'upstream/0.0.6' New upstream release Add debian/watch Ignore src/META.bak removed by upstream cleaning rule Update changelog and prepare upload to unstable --- -- ocaml-data-notation 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 8b92b28dc7a94cb719654a9694363196e638e6ff Author: Nicolas Dandrimont Date: Mon Jun 27 20:19:01 2011 +0200 Unbreak the watch file Upstream decided to HTML-encode some "0"s as "0" in the webpages, so we have to decode them in the watch file. diff --git a/debian/watch b/debian/watch index 3d5abfb..74012d6 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts=dversionmangle=s/\+debian\d*$// \ -http://download.camlcity.org/download/findlib-(\d+.*)\.tar\.gz +opts=dversionmangle=s/\+debian\d*$//,uversionmangle=s/0\x3b/0/g \ +http://download.camlcity.org/download/findlib-(\d+\..*)\.tar\.gz -- 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit d5ad41f3f121f3bb0bb30e6bcefb64b4721dce05 Merge: 8b92b28dc7a94cb719654a9694363196e638e6ff 28cc2e780093efdc3ba3accdbf8a248590f902b1 Author: Nicolas Dandrimont Date: Mon Jun 27 21:32:11 2011 +0200 Merge branch 'upstream' -- 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit a62724c5a3d21578b4d2cd3e574fbde66504af66 Author: Nicolas Dandrimont Date: Mon Jun 27 21:37:28 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 35c3cdf..0607ed6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +findlib (1.2.7+debian-1) unstable; urgency=low + + * New upstream release + + -- Nicolas Dandrimont Mon, 27 Jun 2011 21:34:08 +0200 + findlib (1.2.6+debian-2) unstable; urgency=low * Updated 0002-Extra-configuration-search-path.patch -- 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit bcfc0148219a6b9b22b06167f91c04e4e0b5fb1f Author: Nicolas Dandrimont Date: Mon Jun 27 21:40:00 2011 +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 8b1a522..090d6d0 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 @@ -1,6 +1,6 @@ From: Stefano Zacchiroli Date: Sat, 12 Feb 2011 10:17:31 +0100 -Subject: [PATCH] Change standard directories to conform our own policy +Subject: Change standard directories to conform our own policy Patch upstream findlib.conf.in so that: - default "manual" installation dir is /usr/local/lib/ocaml/ diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch index 486ca3f..7a5e351 100644 --- a/debian/patches/0002-Extra-configuration-search-path.patch +++ b/debian/patches/0002-Extra-configuration-search-path.patch @@ -1,6 +1,6 @@ From: Stefano Zacchiroli Date: Sat, 12 Feb 2011 10:21:40 +0100 -Subject: [PATCH] Extra configuration search path +Subject: Extra configuration search path Support for an extra, debian-specific, dir where to look for configuration file snippets (namely /usr/share/ocaml-findlib/). @@ -12,11 +12,11 @@ Signed-off-by: Stephane Glondu src/findlib/findlib_config.mlp |1 + 2 files changed, 9 insertions(+), 1 deletions(-) -Index: findlib/src/findlib/findlib.ml -=== findlib.orig/src/findlib/findlib.ml2011-04-04 19:58:12.0 -0500 -+++ findlib/src/findlib/findlib.ml 2011-04-04 20:06:33.0 -0500 -@@ -103,6 +103,8 @@ +diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml +index b8dbdc5..828544b 100644 +--- a/src/findlib/findlib.ml b/src/findlib/findlib.ml +@@ -103,6 +103,8 @@ let init let configd_file = config_file ^ ".d" in @@ -25,7 +25,7 @@ Index: findlib/src/findlib/findlib.ml let vars_of_file f = let ch = open_in f in try -@@ -140,12 +142,17 @@ +@@ -140,12 +142,17 @@ let init vars_of_file config_file else [] in @@ -44,10 +44,10 @@ Index: findlib/src/findlib/findlib.ml if vars <> [] then ( let lookup name default = try Fl_metascanner.lookup name config_preds vars -Index: findlib/src/findlib/findlib_config.mlp -=== findlib.orig/src/findlib/findlib_config.mlp2011-04-04 19:58:12.0 -0500 -+++ findlib/src/findlib/findlib_config.mlp 2011-04-04 20:04:07.0 -0500 +diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp +index 5b4ab69..09d0089 100644 +--- a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp @@ -4,6 +4,7 @@ *) @@ -56,3 +56,4 @@ Index: findlib/src/findlib/findlib_config.mlp let ocaml_stdlib = "@STDLIB@";; +-- 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 0e17081..f1c8f17 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 @@ -1,6 +1,7 @@ From: Stefano Zacchiroli Date: Sat, 12 Feb 2011 10:23:55 +0100 -Subject: [PATCH] META.num*: bugfix, moved "directory" directive outside "core" subpackage +Subject: META.num*: bugfix, moved "directory" directive outside "core" + subpackage --- site-lib-src/num-top/META.in |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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit bba1e3704ab7d60d1149cfb9bcec3280b2684c27 Author: Nicolas Dandrimont Date: Mon Jun 27 21:40:40 2011 +0200 Add patch to make Camlp4 depend on Dynlink on all arches (Closes: #630490) diff --git a/debian/changelog b/debian/changelog index 0607ed6..3651ea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ findlib (1.2.7+debian-1) unstable; urgency=low * New upstream release + * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: +#630490) - -- Nicolas Dandrimont Mon, 27 Jun 2011 21:34:08 +0200 + -- Nicolas Dandrimont Mon, 27 Jun 2011 21:37:42 +0200 findlib (1.2.6+debian-2) unstable; urgency=low 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 new file mode 100644 index 000..6e5dc32 --- /dev/null +++ b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch @@ -0,0 +1,31 @@ +From: Nicolas Dandrimont +Date: Tue, 14 Jun 2011 15:21:31 +0200 +Subject: Camlp4 depends on Dynlink on every architecture + +--- + site-lib-src/camlp4.310/META.in |4 ++-- + 1 files 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 +--- 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`"' + + `# For the toploop:' +-`requires(byte,toploop) = "'camlp4_dynlink`"' ++`requires(byte,toploop) = "dynlink"' + `archive(byte,toploop,camlp4o) = "camlp4o.cma"' + `archive(byte,toploop,camlp4r) = "camlp4r.cma"' + +@@ -16,7 +16,7 @@ dnl This file is input of the m4 macro processor. + `preprocessor = "'camlp4_cmd`"' + + `package "lib" (' +-` requires = "camlp4 'camlp4_dynlink`"' ++` requires = "camlp4 dynlink"' + ` version = "[distributed with Ocaml]"' + ` description = "Camlp4 library"' + ` archive(byte) = "camlp4lib.cma"' +-- diff --git a/debian/patches/series b/debian/patches/series index 08faec1..eface1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Change-standard-directories-to-conform-our-own-polic.patch 0002-Extra-configuration-search-path.patch 0003-META.num-bugfix-moved-directory-directive-outside-co.patch +0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch -- 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 29285fafcc7b96c5cb9d0eb2fbc905165458a1d0 Author: Nicolas Dandrimont Date: Mon Jun 27 21:46:22 2011 +0200 Bump Standards-Version to 3.9.2 diff --git a/debian/control b/debian/control index 1e3893b..52deca1 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: m4, gawk | awk, dh-ocaml (>= 0.9~) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/findlib.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/findlib.git Homepage: http://projects.camlcity.org/projects/findlib.html -- 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 43dcbcd4c1e0f3ef71d16563ff57974121bcdd4f Author: Nicolas Dandrimont Date: Mon Jun 27 21:55:00 2011 +0200 Add myself to uploaders diff --git a/debian/changelog b/debian/changelog index 3651ea9..80abef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ findlib (1.2.7+debian-1) unstable; urgency=low * New upstream release + * Add myself to Uploaders * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: #630490) - -- Nicolas Dandrimont Mon, 27 Jun 2011 21:37:42 +0200 + -- Nicolas Dandrimont Mon, 27 Jun 2011 21:50:32 +0200 findlib (1.2.6+debian-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 52deca1..925a7f9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Mehdi Dogguy , - Stéphane Glondu + Stéphane Glondu , + Nicolas Dandrimont Build-Depends: debhelper (>= 8), ocaml-nox (>= 3.11.1-3~), -- 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 5a5050accb2c06f8dd31ab2c14e281796645a0ab Author: Nicolas Dandrimont Date: Mon Jun 27 21:56:33 2011 +0200 Do not use an absolute path in META.camlp4 (Closes: #628021) diff --git a/debian/changelog b/debian/changelog index 80abef8..e0506dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ findlib (1.2.7+debian-1) unstable; urgency=low * Add myself to Uploaders * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: #630490) + * Add patch to use a relative path in META.camlp4 (Closes: #628021) - -- Nicolas Dandrimont Mon, 27 Jun 2011 21:50:32 +0200 + -- Nicolas Dandrimont Mon, 27 Jun 2011 21:55:51 +0200 findlib (1.2.6+debian-2) unstable; urgency=low 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 new file mode 100644 index 000..08e0824 --- /dev/null +++ b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch @@ -0,0 +1,22 @@ +From: Nicolas Dandrimont +Date: Mon, 27 Jun 2011 21:55:16 +0200 +Subject: Do not use an absolute path in META.camlp4 + +--- + configure |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index e82ecc1..a896c35 100755 +--- a/configure b/configure +@@ -416,7 +416,7 @@ fi + # Check on camlp4: + + if in_path camlp4; then +-camlp4_dir=`camlp4 -where` ++camlp4_dir=`camlp4 -where | sed -s 's@/usr/lib/ocaml/@^@'` + if [ ${use_cygpath} -gt 0 ]; then + camlp4_dir=`echo x | env USE_CYGPATH=1 tools/patch x "$camlp4_dir"` + # This makes camlp4_dir a windows path +-- diff --git a/debian/patches/series b/debian/patches/series index eface1e..2dd0d66 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-Extra-configuration-search-path.patch 0003-META.num-bugfix-moved-directory-directive-outside-co.patch 0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch +0005-Do-not-use-an-absolute-path-in-META.camlp4.patch -- 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.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 693f729d68db06ba405866e7073417675962b999 Author: Nicolas Dandrimont Date: Mon Jun 27 22:46:53 2011 +0200 Disable graphics and labltk when unavailable (Closes: #605695) diff --git a/debian/changelog b/debian/changelog index e0506dc..3ea82f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,12 @@ findlib (1.2.7+debian-1) unstable; urgency=low * New upstream release * Add myself to Uploaders - * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: -#630490) - * Add patch to use a relative path in META.camlp4 (Closes: #628021) + * Add patches: +- Make Camlp4 depend on Dynlink on every arch (Closes: #630490) +- Use a relative path in META.camlp4 (Closes: #628021) +- Disable graphics and labltk when unavailable (Closes: #605695) - -- Nicolas Dandrimont Mon, 27 Jun 2011 21:55:51 +0200 + -- Nicolas Dandrimont Mon, 27 Jun 2011 22:45:07 +0200 findlib (1.2.6+debian-2) unstable; urgency=low diff --git a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch new file mode 100644 index 000..93e3b93 --- /dev/null +++ b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch @@ -0,0 +1,34 @@ +From: Nicolas Dandrimont +Date: Mon, 27 Jun 2011 22:41:54 +0200 +Subject: Disable graphics and labltk when unavailable + +--- + site-lib-src/graphics/META.in |1 + + site-lib-src/labltk/META.in |1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in +index 7fd5ec2..eacac66 100644 +--- a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in +@@ -1,6 +1,7 @@ + dnl This file is input of the m4 macro processor. + `# Specifications for the "graphics" library:' + `requires = ""' ++`exists_if = "graphics.cma"' + `version = "[distributed with Ocaml]"' + `description = "Portable drawing primitives"' + `directory = "^"' +diff --git a/site-lib-src/labltk/META.in b/site-lib-src/labltk/META.in +index 29347bd..6819198 100644 +--- a/site-lib-src/labltk/META.in b/site-lib-src/labltk/META.in +@@ -1,6 +1,7 @@ + dnl This file is input of the m4 macro processor. + `# Specifications for the "labltk" library:' + `requires = ""' ++`exists_if = "labltk.cma"' + `version = "[distributed with Ocaml]"' + `description = "The Tk windowing toolkit"' + `directory = "+labltk"' +-- diff --git a/debian/patches/series b/debian/patches/series index 2dd0d66..2ee13c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-META.num-bugfix-moved-directory-directive-outside-co.patch 0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch 0005-Do-not-use-an-absolute-path-in-META.camlp4.patch +0006-Disable-graphics-and-labltk-when-unavailable.patch -- 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. 574f172aef3d0732a5060b645e656325095f83b0
The following commit has been merged in the pristine-tar branch: commit 9d029dc6899c522df23ab58e0b547f1674f12bd5 Author: Nicolas Dandrimont Date: Mon Jun 27 21:25:26 2011 +0200 pristine-tar data for findlib_1.2.7.orig.tar.gz diff --git a/findlib_1.2.7.orig.tar.gz.delta b/findlib_1.2.7.orig.tar.gz.delta new file mode 100644 index 000..3b61248 Binary files /dev/null and b/findlib_1.2.7.orig.tar.gz.delta differ diff --git a/findlib_1.2.7.orig.tar.gz.id b/findlib_1.2.7.orig.tar.gz.id new file mode 100644 index 000..a43918d --- /dev/null +++ b/findlib_1.2.7.orig.tar.gz.id @@ -0,0 +1 @@ +ca8af435bc3aeb45657fcaa07105b466277beb7a -- 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. 574f172aef3d0732a5060b645e656325095f83b0
The following commit has been merged in the pristine-tar branch: commit 574f172aef3d0732a5060b645e656325095f83b0 Author: Nicolas Dandrimont Date: Mon Jun 27 21:43:14 2011 +0200 pristine-tar data for findlib_1.2.7+debian.orig.tar.gz diff --git a/findlib_1.2.7+debian.orig.tar.gz.delta b/findlib_1.2.7+debian.orig.tar.gz.delta new file mode 100644 index 000..8cddbdd Binary files /dev/null and b/findlib_1.2.7+debian.orig.tar.gz.delta differ diff --git a/findlib_1.2.7+debian.orig.tar.gz.id b/findlib_1.2.7+debian.orig.tar.gz.id new file mode 100644 index 000..e340fad --- /dev/null +++ b/findlib_1.2.7+debian.orig.tar.gz.id @@ -0,0 +1 @@ +28cc2e780093efdc3ba3accdbf8a248590f902b1 -- 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.2.7, created. upstream/1.2.7
The annotated tag, upstream/1.2.7 has been created at dc58c45813c02f52a9f43062a7e9922f37618e59 (tag) tagging 6f1688299f720c4082a0bf868d3f2d6ffb5085e4 (commit) replaces upstream/1.2.6 tagged by Nicolas Dandrimont on Mon Jun 27 21:30:27 2011 +0200 - Shortlog Upstream version 1.2.7 Nicolas Dandrimont (1): Imported Upstream version 1.2.7 --- -- 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.2.7+debian, created. upstream/1.2.7+debian
The annotated tag, upstream/1.2.7+debian has been created at b566b1bb4e447e23ff3b5e0da6651b425a79e5e3 (tag) tagging 28cc2e780093efdc3ba3accdbf8a248590f902b1 (commit) replaces upstream/1.2.6+debian tagged by Nicolas Dandrimont on Tue Jun 28 00:40:28 2011 +0200 - Shortlog Upstream version 1.2.7+debian Nicolas Dandrimont (2): Imported Upstream version 1.2.7 Merge branch 'real_upstream' into upstream --- -- 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