[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 st...@glondu.net 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 st...@glondu.net 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 st...@glondu.net 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 glo...@debian.org 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 st...@glondu.net 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 z...@upsilon.cc -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 z...@upsilon.cc -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 st...@glondu.net 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 st...@glondu.net 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 st...@glondu.net 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 gil...@debian.org 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 st...@glondu.net 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 st...@glondu.net 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 st...@glondu.net +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 st...@glondu.net 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 st...@glondu.net 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 glo...@debian.org 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 glo...@debian.org 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 debian-ocaml-ma...@lists.debian.org Uploaders: + Stéphane Glondu glo...@debian.org, Sylvain Le Gall gil...@debian.org 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
