[Pkg-ocaml-maint-commits] [SCM] syslog-ocaml packaging branch, master, updated. debian/1.4-5-9-g8f65aba

[Eric Cooper]

The following commit has been merged in the master branch:
commit badd404d5f4ffe2c7a82eec6892a79d1ec09a073
Author: Eric Cooper <ecc at cmu.edu>
Date:   Wed Feb 23 15:00:29 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 c60a989..97d2c0d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,9 @@ Uploaders:
  Ralf Treinen <treinen at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 7.0),
+ debhelper (>= 8.0),
  ocaml-nox (>= 3.11),
  ocaml-findlib,
- cdbs,
  ocamlmakefile,
  dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
diff --git a/debian/rules b/debian/rules
index 3ff3543..6076a74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,18 @@
 #!/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)
-DEB_MAKE_INSTALL_TARGET = libinstall OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+export NO_CUSTOM = yes
 
-DEB_MAKE_BUILD_TARGET = byte-code-library NO_CUSTOM=y
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-    DEB_MAKE_BUILD_TARGET += native-code-library
+ifneq ($(wildcard /usr/bin/ocamlopt),)
+override_dh_auto_build:
+	$(MAKE) reallyall
 endif
 
-build/libsyslog-ocaml::
-	mkdir -p $(DESTDIR)
+export OCAMLFIND_DESTDIR = debian/tmp/$(shell /usr/bin/ocamlc -where)
+export OCAMLFIND_LDCONF = ignore
+
+override_dh_auto_install:
+	mkdir -p $(OCAMLFIND_DESTDIR)
+	$(MAKE) install

-- 
syslog-ocaml packaging