[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit f2ede79ff373e63176bb1eac88d8580d2ff19d89
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 21 10:53:28 2011 +0200

    debian/rules using dh with overrides, bump compat to 8

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 1ba92f1..a2815ed 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>> 7),
- cdbs,
+ debhelper (>= 8),
  dh-ocaml (>= 0.9),
  ocaml-nox (>= 3.11.1-3~),
  camlp4 (>= 3.11.1-3~),
diff --git a/debian/rules b/debian/rules
index 564dbeb..d9ab256 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,17 @@
 #!/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
+# -*- makefile -*-
 
-PKGNAME = libocamlnet-ocaml-dev
+include /usr/share/ocaml/ocamlvars.mk
 
+PKGNAME = libocamlnet-ocaml-dev
 DESTDIR = $(CURDIR)/debian/tmp
-OCAMLFIND_DESTDIR = $(DESTDIR)$(OCAML_STDLIB_DIR)
-
-DEB_MAKE_CLEAN_TARGET = distclean
-DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR) OCAMLFIND_DESTDIR=$(OCAMLFIND_DESTDIR)
+export OCAMLFIND_DESTDIR = $(DESTDIR)$(OCAML_STDLIB_DIR)
 
+BUILD_TARGET = all
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET += opt
+BUILD_TARGET += opt
 endif
 
-DEB_DH_COMPRESS_ARGS = -X.ml
-# OCaml custom bytecode binaries can't be striped
-DEB_STRIP_EXCLUDE += usr/bin/netplex-admin
-DEB_STRIP_EXCLUDE += usr/bin/ocamlrpcgen
-
 # For Debian GNU/kFreeBSD and GNU/Hurd ports
 ifneq ($(findstring freebsd,$(DEB_HOST_ARCH)),)
 RPC_AUTH_LOCAL = no
@@ -34,13 +25,33 @@ CFGFLAGS += -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh
 CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet
 CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
 
-configure/$(PKGNAME):: debian/configure-stamp
-debian/configure-stamp:
+%:
+	dh $@ --with ocaml
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
 	./configure $(CFGFLAGS)
 ifeq ($(RPC_AUTH_LOCAL),no)
 	sed -i -n '/rpc.auth.local/!p' debian/*.install
 endif
-	touch debian/configure-stamp
-clean::
-	rm -f debian/configure-stamp
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	$(MAKE) $(BUILD_TARGET)
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	$(MAKE) install DESTDIR=$(DESTDIR)
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -Rf src/netcgi2-apache/.libs/
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing -X.so.owner
+
+.PHONY: override_dh_compress
+override_dh_compress:
+	dh_compress -X.ml

-- 
ocamlnet packaging