[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.0-5

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit dbc41e4e0a3e27e064d79c1bea580d8fa5c359f9
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Oct 8 22:03:37 2009 +0000

    Update to dh-ocaml 0.9 (dh_ocamldoc)

diff --git a/debian/changelog b/debian/changelog
index 67f97f2..b2a3b73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-ocaml-bitstring (2.0.0-5) UNRELEASED; urgency=low
+ocaml-bitstring (2.0.0-5) unstable; urgency=low
 
+  [ Stephane Glondu ]
+  [Stephane Glondu]
   * Use ocaml.mk as a CDBS "rules" file (Closes: #549747)
 
- -- Stephane Glondu <steph at glondu.net>  Wed, 29 Jul 2009 14:36:44 +0200
+  [Sylvain Le Gall]
+  * Update for dh_ocaml 0.9:
+    * Use dh_ocamldoc
+    * Use depends/provides in debian/control
+  * Use a debian/clean files
+  * Add license version in debian/copyright
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 08 Oct 2009 22:02:20 +0000
 
 ocaml-bitstring (2.0.0-4) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..27da8a8
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+cil-tools/Makefile
diff --git a/debian/control b/debian/control
index 01a74f2..00e58bd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,27 @@
 Source: ocaml-bitstring
-Section: libdevel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>, Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: cdbs (>= 0.4.23), debhelper (>= 7), 
-               quilt, ocaml-nox (>= 3.11.1), 
-               ocaml-findlib (>= 1.2.4-2), camlp4-extra, 
-               dh-ocaml, time
-Standards-Version: 3.8.2
+Build-Depends: 
+ cdbs (>= 0.4.23), 
+ debhelper (>= 7), 
+ quilt, 
+ ocaml-nox (>= 3.11.1), 
+ ocaml-findlib (>= 1.2.4-2), 
+ camlp4-extra, 
+ dh-ocaml (>= 0.9), 
+ time
+Standards-Version: 3.8.3
 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: ocaml
-Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}, libbitstring-ocaml (= ${binary:Version})
-Recommends: camlp4
+Depends: ${ocaml:Depends}, ${misc:Depends}, libbitstring-ocaml (= ${binary:Version})
+Provides: ${ocaml:Provides}
 Description: Erlang-style bitstrings for OCaml
  Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax
  extension and library for OCaml.
@@ -36,8 +40,8 @@ Description: Erlang-style bitstrings for OCaml
 
 Package: libbitstring-ocaml
 Architecture: any
-Section: ocaml
-Depends: ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Provides: ${ocaml:Provides}
 Description: Erlang-style bitstrings for OCaml
  Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax
  extension and library for OCaml.
diff --git a/debian/libbitstring-ocaml-dev.ocamldoc b/debian/libbitstring-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..299f694
--- /dev/null
+++ b/debian/libbitstring-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+-I +camlp4
diff --git a/debian/rules b/debian/rules
index 8473ef6..e2a2bf6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 DESTDIR_DEV=$(CURDIR)/debian/libbitstring-ocaml-dev
 DESTDIR=$(CURDIR)/debian/libbitstring-ocaml
@@ -30,17 +30,6 @@ DEB_MAKE_BUILD_TARGET    := all
 DEB_MAKE_INSTALL_TARGET  := install
 DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" OCAMLFIND_LDCONF=ignore
 
-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'
-
 install/libbitstring-ocaml-dev::
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/bitstring/*.so \
 	  '$(DESTDIR)/$(OCAML_DLL_DIR)'

-- 
ocaml-bitstring packaging