[Pkg-ocaml-maint-commits] [SCM] ocaml-bitmatch packaging branch, master, updated. debian/1.9.7-1-2-g6cb969f

Sat Feb 28 11:31:38 UTC 2009

The following commit has been merged in the master branch:
commit 6cb969f9391e8b46f833fc3d6f5c99cbedf60cd4
Author: Romain Beauxis <toots at leonard.(none)>
Date:   Sat Feb 28 12:31:18 2009 +0100

    Updated package

diff --git a/debian/changelog b/debian/changelog
index 347c4ce..b4a34bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-ocaml-bitstring (1.9.7-2) UNRELEASED; urgency=low
+ ocaml-bitstring (1.9.7-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+   * Switched to quilt for patch management.
+   * Versioned ocaml related build-dep.
+   * Added build-dep on dh-ocaml.
+   * Fixed git url.
+   * Added patch to add missing dynlink dependencies.
+   * Fixed missing install directory for ocaml-findlib in debian/rules.
+   * Update compat to 7.
+   * Added dependency on ${misc:Depends} (thanks lintian).
 
- -- Sylvain Le Gall <gildor at debian.org>  Mon, 11 Aug 2008 18:46:50 +0200
+  -- Romain Beauxis <toots at rastageeks.org>  Sat, 28 Feb 2009 04:38:39 +0100
 
 ocaml-bitstring (1.9.7-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 393e7df..fd71cda 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,19 @@ Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml-findlib, camlp4-extra
+Build-Depends: cdbs (>= 0.4.23), debhelper (>= 7), 
+               quilt, ocaml-nox (>= 3.11.0-5), 
+               ocaml-findlib (>= 1.2.4-1), camlp4-extra (>= 3.11.0-5), 
+               dh-ocaml
 Standards-Version: 3.8.0
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-bitstring.git
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-bitstring.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-bitmatch.git
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-bitmatch.git
 Homepage: http://code.google.com/p/bitstring/
 
 Package: libbitstring-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-base-${F:OCamlABI}
+Depends: ocaml-base-${F:OCamlABI}, ${misc:Depends}
 Recommends: camlp4
 Description: Erlang-style bitstrings for OCaml
  Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c6007b0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-byte-compilation
diff --git a/debian/patches/01-byte-compilation.dpatch b/debian/patches/01-byte-compilation.dpatch
old mode 100755
new mode 100644
index bf29dc8..5183e24
--- a/debian/patches/01-byte-compilation.dpatch
+++ b/debian/patches/01-byte-compilation.dpatch
@@ -5,9 +5,10 @@
 ## DP: Allow byte only compilation.
 
 @DPATCH@
-diff -urNad ocaml-bitstring~/Makefile.in ocaml-bitstring/Makefile.in
---- ocaml-bitstring~/Makefile.in	2008-08-09 20:43:05.000000000 +0000
-+++ ocaml-bitstring/Makefile.in	2008-08-09 21:31:31.000000000 +0000
+Index: ocaml-bitmatch/Makefile.in
+===================================================================
+--- ocaml-bitmatch.orig/Makefile.in	2009-02-28 04:33:44.000000000 +0100
++++ ocaml-bitmatch/Makefile.in	2009-02-28 04:40:02.000000000 +0100
 @@ -25,6 +25,8 @@
  OCAMLDOC	= @OCAMLDOC@
  INSTALL		= @INSTALL@
diff --git a/debian/patches/add_dynlink.patch b/debian/patches/add_dynlink.patch
new file mode 100644
index 0000000..5fb7764
--- /dev/null
+++ b/debian/patches/add_dynlink.patch
@@ -0,0 +1,26 @@
+Index: ocaml-bitmatch/META.in
+===================================================================
+--- ocaml-bitmatch.orig/META.in	2009-02-28 04:42:10.000000000 +0100
++++ ocaml-bitmatch/META.in	2009-02-28 04:42:16.000000000 +0100
+@@ -1,7 +1,7 @@
+ name = "bitstring"
+ version = "@PACKAGE_VERSION@"
+ description = "Bitstrings and bitstring matching"
+-requires = "unix"
++requires = "dynlink unix"
+ archive(byte) = "bitstring.cma"
+ archive(native) = "bitstring.cmxa"
+ 
+Index: ocaml-bitmatch/Makefile.in
+===================================================================
+--- ocaml-bitmatch.orig/Makefile.in	2009-02-28 04:42:19.000000000 +0100
++++ ocaml-bitmatch/Makefile.in	2009-02-28 04:42:43.000000000 +0100
+@@ -84,7 +84,7 @@
+ 
+ bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
+ 	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
+-	  bitstring.cma bitstring_persistent.cma \
++	  bitstring.cma bitstring_persistent.cma -linkpkg -package dynlink \
+ 	  $< -o $@
+ 
+ # Tests and examples.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4e6aa30
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+add_dynlink.patch
+01-byte-compilation.dpatch
diff --git a/debian/rules b/debian/rules
index efc695e..a8aaf9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@
 # MA 02110-1301, USA.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
@@ -33,6 +33,9 @@ OCAML_OCAMLDOC_PACKAGES = libbitstring-ocaml-dev
 
 OCAML_OCAMLDOC_FLAGS += -I +camlp4
 
+build/libbitstring-ocaml-dev::
+	mkdir -p "$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
+
 clean::
 	-$(RM) '$(CURDIR)/debian/libbitstring-ocaml-dev.dirs'
 	-$(RM) '$(CURDIR)/cil-tools/Makefile'

-- 
ocaml-bitmatch packaging

