[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.2.20-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit cd4f32cc34c5100aa3a92b40630e897801e0fd31
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sun Oct 25 21:30:25 2009 +0000

    New upstream release
    
    * New upstream release
    * Upgrade Standards-Version to 3.8.3 (no change)
    * Switch to dh-ocaml 0.9.1 (depends and dh_ocamldoc)

diff --git a/debian/README.Debian b/debian/README.Debian
index 22e99b2..add846d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -29,7 +29,7 @@ a post by upstream author Markus Mottl to the Caml mailing list
 > should exclusively use the automatically generated converters on
 > big-endian machines.  The hand-written (slower) ones for the basic
 > types are intended mostly for testing purposes only, and will not work
-> when mixed with a different endianess (they assume little-endians).
+> when mixed with a different endianness (they assume little-endians).
 > 
 > Thus, it certainly makes sense to package the binary protocol for
 > big-endians, too, as long as people are informed of what works.  Since
diff --git a/debian/changelog b/debian/changelog
index 193607b..b49597e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bin-prot (1.2.20-1) unstable; urgency=low
+
+  * New upstream release
+  * Upgrade Standards-Version to 3.8.3 (no change)
+  * Switch to dh-ocaml 0.9.1 (depends and dh_ocamldoc)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 25 Oct 2009 18:30:20 +0000
+
 bin-prot (1.2.14-2) unstable; urgency=low
 
   * Fix bytecode only former upload
diff --git a/debian/control b/debian/control
index 5e5fdd2..6613e7c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Uploaders:
 Build-Depends:
  debhelper (>= 7),
  cdbs,
- dh-ocaml (>= 0.4),
+ dh-ocaml (>= 0.9),
  ocaml-nox (>= 3.11.1),
  ocaml-findlib (>= 1.2.4),
  camlp4,
  camlp4-extra,
  libtype-conv-camlp4-dev (>= 1.6.7-2),
  libounit-ocaml-dev (>= 1.0.3-2)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 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
@@ -23,12 +23,13 @@ Homepage: http://www.ocaml.info/home/ocaml_sources.html#bin-prot
 Package: libbin-prot-camlp4-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  ocaml-findlib,
  camlp4,
  libtype-conv-camlp4-dev,
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: type-safe binary serialization for OCaml values
  bin-prot provides functionalities for reading and writing OCaml-values
  in a type-safe binary protocol.
diff --git a/debian/libbin-prot-camlp4-dev.ocamldoc b/debian/libbin-prot-camlp4-dev.ocamldoc
new file mode 100644
index 0000000..c63c730
--- /dev/null
+++ b/debian/libbin-prot-camlp4-dev.ocamldoc
@@ -0,0 +1,2 @@
+# Nothing 
+-I lib/
diff --git a/debian/rules b/debian/rules
index 1cac944..9a5d1d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/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
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 LIB_NAME = bin-prot
 PKG_NAME = lib$(LIB_NAME)-camlp4-dev
@@ -16,6 +16,8 @@ DEB_MAKE_BUILD_TARGET = byte
 DEB_MAKE_INSTALL_TARGET = libinstall-byte-code OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR) -ldconf ignore"
 endif
 
+OCAML_DHOCAML_FLAGS += --runtime-map libbin-prot-camlp4-dev:- 
+
 build/$(PKG_NAME)::
 	mkdir -p $(DESTDIR) $(DESTDLLDIR)
 

-- 
bin-prot packaging