[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. debian/4.5-1-15-gc9a2492

[Eric Cooper]

The following commit has been merged in the master branch:
commit 718d12de7e44beea4645107f1e6a23f45e4a8dc9
Author: Eric Cooper <ecc at cmu.edu>
Date:   Wed Mar 2 12:54:43 2011 -0500

    use dh instead of cdbs

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 230008d..d512c0d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,8 @@ Maintainer: Eric Cooper <ecc at cmu.edu>
 Uploaders: Sylvain Le Gall <gildor at debian.org>, Ralf Treinen <treinen at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 7.0),
+ debhelper (>= 8.0),
  dh-ocaml,
- cdbs,
  libnethttpd-ocaml-dev,
  libpcre-ocaml-dev,
  libsha-ocaml-dev,
diff --git a/debian/rules b/debian/rules
index 65d59f2..5d708b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+	dh $@ --with ocaml
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),no)
-    DEB_MAKE_BUILD_TARGET = TARGET=byte
+ifeq ($(wildcard /usr/bin/ocamlopt),)
+override_dh_auto_build:
+	$(MAKE) TARGET=byte
 endif

-- 
approx upstream and debian packaging