[Pkg-ocaml-maint-commits] [SCM] camlzip packaging branch, master, updated. debian/1.04-5-5-g591cfcb
Stephane Glondu
steph at glondu.net
Tue Sep 29 08:48:55 UTC 2009
The following commit has been merged in the master branch:
commit 544696c2177e5c13069ebcfb77e1a10f139401c1
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Sep 29 10:36:26 2009 +0200
Switch patches to quilt
diff --git a/debian/control b/debian/control
index be4c2c6..b6c2984 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,13 @@ Uploaders:
Sylvain Le Gall <gildor at debian.org>,
Ralf Treinen <treinen at debian.org>,
Stéphane Glondu <glondu at debian.org>
-Build-Depends: debhelper (>= 7.0.0), zlib1g-dev (>> 1.1.4), ocaml-nox (>= 3.11), dpatch, dpkg-dev (>= 1.13.19), dh-ocaml
+Build-Depends:
+ debhelper (>= 7.0.0),
+ quilt,
+ zlib1g-dev (>> 1.1.4),
+ ocaml-nox (>= 3.11),
+ dpkg-dev (>= 1.13.19),
+ dh-ocaml
Homepage: http://pauillac.inria.fr/~xleroy/software.html#camlzip
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlzip.git
diff --git a/debian/patches/build.dpatch b/debian/patches/0001-Build-system-for-Debian.patch
old mode 100755
new mode 100644
similarity index 64%
rename from debian/patches/build.dpatch
rename to debian/patches/0001-Build-system-for-Debian.patch
index 93da13f..10ffcaf
--- a/debian/patches/build.dpatch
+++ b/debian/patches/0001-Build-system-for-Debian.patch
@@ -1,27 +1,20 @@
-#! /bin/sh -e
-## build.dpatch by <luther at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefiles, configure scripts and other build stuff adapted for
-## DP: debian package creation
+From: Sven Luther <luther at debian.org>
+Date: Tue, 29 Sep 2009 09:41:07 +0200
+Subject: [PATCH] Build system for Debian
-if [ $# -ne 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
+Makefiles, configure scripts and other build stuff adapted for Debian
+package creation
-exit 0
- at DPATCH@
---- camlzip-1.01.orig/Makefile
-+++ camlzip-1.01/Makefile
-@@ -11,7 +11,10 @@
+Signed-off-by: Sven Luther <luther at 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
# Where to install the library. By default: sub-directory 'zip' of
# OCaml's standard library directory.
@@ -33,14 +26,14 @@ exit 0
### End of configuration section
-@@ -53,17 +56,21 @@
+@@ -53,17 +56,21 @@ libcamlzip.a: $(C_OBJS)
clean:
rm -f *.cm*
rm -f *.o *.a
+ 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); \
@@ -49,7 +42,6 @@ exit 0
- if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \
- then echo $$installdir >> $$ldconf; fi \
- fi
-+ mkdir -p $(INSTALLDIR)
+ mkdir -p $(STUBLIBSDIR)
+ cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli zlib.mli zlib.cmi libcamlzip.a $(INSTALLDIR)
+ cp dllcamlzip.so $(STUBLIBSDIR)
@@ -64,3 +56,4 @@ exit 0
installopt:
cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR)
+--
diff --git a/debian/patches/test-makefile.dpatch b/debian/patches/0002-Use-an-installed-camlzip-for-tests.patch
old mode 100755
new mode 100644
similarity index 57%
rename from debian/patches/test-makefile.dpatch
rename to debian/patches/0002-Use-an-installed-camlzip-for-tests.patch
index b4bd3e0..98799a7
--- a/debian/patches/test-makefile.dpatch
+++ b/debian/patches/0002-Use-an-installed-camlzip-for-tests.patch
@@ -1,13 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## test-makefile.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use an installed camlzip.
+From: Samuel Mimram <smimram at debian.org>
+Date: Tue, 29 Sep 2009 09:42:17 +0200
+Subject: [PATCH] Use an installed camlzip for tests
- at DPATCH@
-diff -urNad camlzip-1.03~/test/Makefile camlzip-1.03/test/Makefile
---- camlzip-1.03~/test/Makefile 2001-08-07 17:32:08.000000000 +0200
-+++ camlzip-1.03/test/Makefile 2007-02-18 13:55:19.000000000 +0100
+Signed-off-by: Samuel Mimram <smimram at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ test/Makefile | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index d10106b..77b4da3 100644
+--- a/test/Makefile
++++ b/test/Makefile
@@ -1,13 +1,13 @@
all: minizip minigzip
@@ -27,3 +31,4 @@ diff -urNad camlzip-1.03~/test/Makefile camlzip-1.03/test/Makefile
clean:
rm -f *.cm*
+--
diff --git a/debian/patches/0003-Add-plain_uncompress.patch b/debian/patches/0003-Add-plain_uncompress.patch
new file mode 100644
index 0000000..dc0e500
--- /dev/null
+++ b/debian/patches/0003-Add-plain_uncompress.patch
@@ -0,0 +1,59 @@
+From: Sven Luther <luther at debian.org>
+Date: Tue, 29 Sep 2009 09:43:51 +0200
+Subject: [PATCH] Add plain_uncompress
+
+Add a plain_uncompress function which is a direct binding to zlib's
+uncompress function.
+
+Signed-off-by: Sven Luther <luther at debian.org>
+---
+ zlib.ml | 2 ++
+ zlib.mli | 2 ++
+ 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 =
+ 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:
+ val uncompress:
+ ?header: bool -> (string -> int) -> (string -> 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)
+ Long_val(len)));
+ }
+
++
++value camlzip_uncompress(value dest, value destlen, value src, value srclen)
++{
++ unsigned long destlenc = Int_val(destlen);
++ unsigned long srclenc = Int_val(srclen);
++ int status;
++ status = uncompress (String_val(dest), &destlenc, String_val(src), srclenc);
++ if (status == Z_OK) return Val_true;
++ else return Val_false;
++}
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 635f0f9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-build
-test-makefile
-uncompress
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..10fcb75
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Build-system-for-Debian.patch
+0002-Use-an-installed-camlzip-for-tests.patch
+0003-Add-plain_uncompress.patch
diff --git a/debian/patches/uncompress.dpatch b/debian/patches/uncompress.dpatch
deleted file mode 100755
index 7721fe9..0000000
--- a/debian/patches/uncompress.dpatch
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh -e
-## uncompress.dpatch by Sven Luther <luther at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add a plain_uncompress function which is a direct binding to zlib's
-## DP: uncompress function.
-
-if [ $# -ne 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
-diff -urNad camlzip-1.04~/zlib.ml camlzip-1.04/zlib.ml
---- camlzip-1.04~/zlib.ml 2009-02-10 12:13:14.000000000 +0100
-+++ camlzip-1.04/zlib.ml 2009-02-10 12:13:51.000000000 +0100
-@@ -87,6 +87,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 -urNad camlzip-1.04~/zlib.mli camlzip-1.04/zlib.mli
---- camlzip-1.04~/zlib.mli 2009-02-10 12:13:14.000000000 +0100
-+++ camlzip-1.04/zlib.mli 2009-02-10 12:13:16.000000000 +0100
-@@ -26,6 +26,8 @@
- val uncompress:
- ?header: bool -> (string -> int) -> (string -> int -> unit) -> unit
-
-+val plain_uncompress: string -> int -> string -> int -> bool
-+
- type stream
-
- type flush_command =
-diff -urNad camlzip-1.04~/zlibstubs.c camlzip-1.04/zlibstubs.c
---- camlzip-1.04~/zlibstubs.c 2009-02-10 12:13:14.000000000 +0100
-+++ camlzip-1.04/zlibstubs.c 2009-02-10 12:13:16.000000000 +0100
-@@ -173,3 +173,13 @@
- Long_val(len)));
- }
-
-+
-+value camlzip_uncompress(value dest, value destlen, value src, value srclen)
-+{
-+ unsigned long destlenc = Int_val(destlen);
-+ unsigned long srclenc = Int_val(srclen);
-+ int status;
-+ status = uncompress (String_val(dest), &destlenc, String_val(src), srclenc);
-+ if (status == Z_OK) return Val_true;
-+ else return Val_false;
-+}
diff --git a/debian/rules b/debian/rules
index 0655788..e926285 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
include /usr/share/ocaml/ocamlvars.mk
include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
INSTALLDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)/zip
VERSION := $(shell head -n1 debian/changelog | awk -F'[ ()-]+' '{print $$2}')
@@ -18,7 +18,7 @@ configure-stamp: ocamlinit
touch configure-stamp
build: configure-stamp build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(MAKE)
--
camlzip packaging
More information about the Pkg-ocaml-maint-commits
mailing list