[Pkg-ocaml-maint-commits] [SCM] ocaml-sha packaging branch, master, updated. debian/1.6-1-13-g1c5ab0c

[Eric Cooper]

The following commit has been merged in the master branch:
commit 008345c3b168682fc5df0d200ac8596292f92634
Author: Eric Cooper <ecc at cmu.edu>
Date:   Fri Feb 25 09:50:22 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 8f69792..3915bab 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,9 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Eric Cooper <ecc at cmu.edu>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 7.0),
+ debhelper (>= 8.0),
  ocaml-nox (>= 3.11),
  ocaml-findlib,
- cdbs,
  dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 Homepage: http://tab.snarc.org/projects/ocaml_sha
diff --git a/debian/rules b/debian/rules
index 9003624..af789a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,20 @@
 #!/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
 
-DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR = debian/tmp/$(shell /usr/bin/ocamlc -where)
+export OCAMLFIND_LDCONF = ignore
 
-installvars = OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-    DEB_MAKE_BUILD_TARGET = all
-    DEB_MAKE_INSTALL_TARGET = install $(installvars)
+ifneq ($(wildcard /usr/bin/ocamlopt),)
+override_dh_auto_install:
+	mkdir -p $(OCAMLFIND_DESTDIR)
+	$(MAKE) install
 else
-    DEB_MAKE_BUILD_TARGET = all-byte
-    DEB_MAKE_INSTALL_TARGET = install-byte $(installvars)
-endif
+override_dh_auto_build:
+	$(MAKE) all-byte
 
-build/libsha-ocaml::
-	mkdir -p $(DESTDIR)
+override_dh_auto_install:
+	mkdir -p $(OCAMLFIND_DESTDIR)
+	$(MAKE) install-byte
+endif

-- 
ocaml-sha packaging