This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository camlzip.
commit fc529909985b6bcf1674755528affb33c63a57b3 Author: Ralf Treinen <trei...@free.fr> Date: Thu Sep 8 21:13:46 2016 +0200 refresh patches --- debian/changelog | 10 ++++++ debian/patches/0001-Build-system-for-Debian.patch | 43 +++++++---------------- debian/patches/0003-Add-plain_uncompress.patch | 37 ++++++++++--------- 3 files changed, 40 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index cfec6b7..daf0338 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +camlzip (1.06-1) unstable; urgency=medium + + * New upstream version. + * Refreshed patches: + - 0001-Build-system-for-Debian.patch + - 0002-Use-an-installed-camlzip-for-tests.patch + - 0003-Add-plain_uncompress.patch + + -- Ralf Treinen <trei...@debian.org> Thu, 08 Sep 2016 20:52:31 +0200 + camlzip (1.05-3) unstable; urgency=low * Upload to unstable diff --git a/debian/patches/0001-Build-system-for-Debian.patch b/debian/patches/0001-Build-system-for-Debian.patch index 10ffcaf..39de583 100644 --- a/debian/patches/0001-Build-system-for-Debian.patch +++ b/debian/patches/0001-Build-system-for-Debian.patch @@ -1,39 +1,29 @@ -From: Sven Luther <lut...@debian.org> -Date: Tue, 29 Sep 2009 09:41:07 +0200 -Subject: [PATCH] Build system for Debian +Author: Sven Luther <lut...@debian.org> +Description: adapt Makefile for debian -Makefiles, configure scripts and other build stuff adapted for Debian -package creation - -Signed-off-by: Sven Luther <lut...@debian.org> ---- - Makefile | 25 ++++++++++++++++--------- - 1 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index f3ce064..321fb34 100644 ---- a/Makefile -+++ b/Makefile -@@ -11,7 +11,10 @@ ZLIB_INCLUDE=/usr/local/include +Index: camlzip/Makefile +=================================================================== +--- camlzip.orig/Makefile 2016-09-08 20:42:10.489462405 +0200 ++++ camlzip/Makefile 2016-09-08 21:00:20.890019224 +0200 +@@ -13,7 +13,9 @@ # Where to install the library. By default: sub-directory 'zip' of # OCaml's standard library directory. -INSTALLDIR=`$(OCAMLC) -where`/zip -+#INSTALLDIR=`$(OCAMLC) -where`/zip +OCAMLLIBDIR=$(DESTDIR)`$(OCAMLC) -where` +INSTALLDIR=$(OCAMLLIBDIR)/zip +STUBLIBSDIR=$(OCAMLLIBDIR)/stublibs ### End of configuration section -@@ -53,17 +56,21 @@ libcamlzip.a: $(C_OBJS) +@@ -55,17 +57,12 @@ clean: rm -f *.cm* - rm -f *.o *.a + rm -f *.o *.a *.so + rm -f dllcamlzip.so install: - mkdir -p $(INSTALLDIR) +- mkdir -p $(INSTALLDIR) - cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR) - if test -f dllcamlzip.so; then \ - cp dllcamlzip.so $(INSTALLDIR); \ @@ -42,18 +32,9 @@ index f3ce064..321fb34 100644 - if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \ - then echo $$installdir >> $$ldconf; fi \ - fi -+ mkdir -p $(STUBLIBSDIR) -+ cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli zlib.mli zlib.cmi libcamlzip.a $(INSTALLDIR) ++ mkdir -p $(INSTALLDIR) $(STUBLIBSDIR) ++ cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a zlib.mli zlib.cmi $(INSTALLDIR) + cp dllcamlzip.so $(STUBLIBSDIR) -+# Let us handle this the debian way -+# if test -f dllcamlzip.so; then \ -+# cp dllcamlzip.so $(INSTALLDIR); \ -+# ldconf=`$(OCAMLC) -where`/ld.conf; \ -+# installdir=$(INSTALLDIR); \ -+# if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \ -+# then echo $$installdir >> $$ldconf; fi \ -+# fi installopt: cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR) --- diff --git a/debian/patches/0003-Add-plain_uncompress.patch b/debian/patches/0003-Add-plain_uncompress.patch index dc0e500..8c93fce 100644 --- a/debian/patches/0003-Add-plain_uncompress.patch +++ b/debian/patches/0003-Add-plain_uncompress.patch @@ -12,37 +12,37 @@ Signed-off-by: Sven Luther <lut...@debian.org> zlibstubs.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 0 deletions(-) -diff --git a/zlib.ml b/zlib.ml -index 6722a7c..a0e75cc 100644 ---- a/zlib.ml -+++ b/zlib.ml -@@ -87,6 +87,8 @@ let compress_direct ?(level = 6) ?(header = true) flush = +Index: camlzip/zlib.ml +=================================================================== +--- camlzip.orig/zlib.ml 2016-09-08 20:51:20.789426775 +0200 ++++ camlzip/zlib.ml 2016-09-08 20:51:20.785426787 +0200 +@@ -90,6 +90,8 @@ in compr, compr_finish +external plain_uncompress: string -> int -> string -> int -> bool = "camlzip_uncompress" + let uncompress ?(header = true) refill flush = - let inbuf = String.create buffer_size - and outbuf = String.create buffer_size in -diff --git a/zlib.mli b/zlib.mli -index 0ee18da..44faa2e 100644 ---- a/zlib.mli -+++ b/zlib.mli -@@ -26,6 +26,8 @@ val compress_direct: + let inbuf = Bytes.create buffer_size + and outbuf = Bytes.create buffer_size in +Index: camlzip/zlib.mli +=================================================================== +--- camlzip.orig/zlib.mli 2016-09-08 20:51:20.789426775 +0200 ++++ camlzip/zlib.mli 2016-09-08 20:51:20.785426787 +0200 +@@ -26,6 +26,8 @@ val uncompress: - ?header: bool -> (string -> int) -> (string -> int -> unit) -> unit + ?header: bool -> (bytes -> int) -> (bytes -> int -> unit) -> unit +val plain_uncompress: string -> int -> string -> int -> bool + type stream type flush_command = -diff --git a/zlibstubs.c b/zlibstubs.c -index 7d91237..8e6b2f6 100644 ---- a/zlibstubs.c -+++ b/zlibstubs.c -@@ -173,3 +173,13 @@ value camlzip_update_crc32(value crc, value buf, value pos, value len) +Index: camlzip/zlibstubs.c +=================================================================== +--- camlzip.orig/zlibstubs.c 2016-09-08 20:51:20.789426775 +0200 ++++ camlzip/zlibstubs.c 2016-09-08 20:51:20.785426787 +0200 +@@ -174,3 +174,13 @@ Long_val(len))); } @@ -56,4 +56,3 @@ index 7d91237..8e6b2f6 100644 + if (status == Z_OK) return Val_true; + else return Val_false; +} --- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/camlzip.git _______________________________________________ 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