[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/0.20081112+gitBB342A7-1-396-g4dd1b67

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 4dd1b6773a742ddc72eb05d7c352e4e5cef2672d
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 28 23:20:39 2009 +0100

    use ocaml.mk as a CDBS "rules" snippet

diff --git a/debian/changelog b/debian/changelog
index f9b497c..b295eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ocaml-batteries (0.20090228+git6E49F72-1) unstable; urgency=low
 
   * new snapshot, upstream Git commit 6E49F72
     - includes all changes of batteries alpha 3 + recent development
-  * debian/rules: pass -byte-plugin to ocamlbuild when ocamlopt is not
-    available, fixes FTBFS on non-native archs. (Closes: #505490)
+  * debian/rules:
+    - pass -byte-plugin to ocamlbuild when ocamlopt is not
+      available, fixes FTBFS on non-native archs. (Closes: #505490)
+    - use ocaml.mk as a CDBS "rules" snippet
   * debian/control:
     - add new build-dep on ocamlnet (Closes: #515792)
 
diff --git a/debian/control b/debian/control
index 56ce437..98f0b8d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libbin-prot-camlp4-dev,
  libzip-ocaml-dev,
  libocamlnet-ocaml-dev,
- dh-ocaml,
+ dh-ocaml (>= 0.4),
  camlp4,
  camlp4-extra,
  quilt,
diff --git a/debian/rules b/debian/rules
index cb1edda..f4b0f90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 LIB_NAME = batteries
 DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev

-- 
ocaml-batteries packaging