[Pkg-ocaml-maint-commits] [SCM] ocamlagrep packaging branch, master, updated. debian/1.0-9-6-g58379d5

[Samuel Mimram]

The following commit has been merged in the master branch:
commit bd1b3df947e230af14d27f8f642a0a01dfba448e
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Tue Feb 24 18:39:02 2009 +0100

    Use dh-ocaml.

diff --git a/debian/changelog b/debian/changelog
index e6f9a7c..b1b29dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,11 @@ ocamlagrep (1.0-10) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
   * Switch packaging to git
+  * Use dh-ocaml.
   * Update compat to 7.
   * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Tue, 24 Feb 2009 18:34:47 +0100
+ -- Samuel Mimram <smimram at debian.org>  Tue, 24 Feb 2009 18:38:46 +0100
 
 ocamlagrep (1.0-9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6e09df0..094cf2c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7), ocaml-nox (>= 3.11)
+Build-Depends: debhelper (>= 7), dh-ocaml, ocaml-nox (>= 3.11)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlagrep.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlagrep.git
diff --git a/debian/dirs.in b/debian/dirs.in
index 19bb008..d69478d 100644
--- a/debian/dirs.in
+++ b/debian/dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/#OCamlABI#
+ at OCamlStdlibDir@/agrep
diff --git a/debian/libagrep-ocaml-dev.install.in b/debian/libagrep-ocaml-dev.install.in
index 72d4552..ca1cc8a 100644
--- a/debian/libagrep-ocaml-dev.install.in
+++ b/debian/libagrep-ocaml-dev.install.in
@@ -1,3 +1,3 @@
-*.a   usr/lib/ocaml/#OCamlABI#/agrep
-*.cm* usr/lib/ocaml/#OCamlABI#/agrep
-*.ml* usr/lib/ocaml/#OCamlABI#/agrep
+ at OCamlStdlibDir@/agrep/*.a
+ at OCamlStdlibDir@/agrep/*.cm*
+ at OCamlStdlibDir@/agrep/*.ml*
diff --git a/debian/libagrep-ocaml.install.in b/debian/libagrep-ocaml.install.in
index e4e02f7..c8d4758 100644
--- a/debian/libagrep-ocaml.install.in
+++ b/debian/libagrep-ocaml.install.in
@@ -1 +1 @@
-dllagrep.so usr/lib/ocaml/#OCamlABI#/stublibs/
+ at OCamlStdlibDir@/agrep/dllagrep.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 4cf60ed..e2ba126 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 
 CFLAGS = -Wall -g
 
@@ -17,9 +17,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/#OCamlABI#/$(OCAMLABI)/g' $$f.in > $$f; done
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -31,11 +28,13 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	$(MAKE) libagrep.a agrep.cma
-	if [ -x /usr/bin/ocamlopt ] ; then $(MAKE) agrep.cmxa ; fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) agrep.cmxa
+endif
 
 	touch build-stamp
 
-clean:
+clean: ocamlinit-clean
 	dh_testdir
 	dh_testroot
 
@@ -52,24 +51,21 @@ install: build
 	dh_prep
 	dh_installdirs
 
-	mkdir -p debian/tmp
+	mkdir -p debian/tmp/$(OCAML_STDLIB_DIR)/agrep
 	# Default install doesn't handle no-ocamlopt platforms
-	cp $(wildcard *.cmi *.cma *.cmxa *.a *.so) debian/tmp
+	cp $(wildcard *.cmi *.cma *.cmxa *.a *.so *.mli) debian/tmp/$(OCAML_STDLIB_DIR)/agrep
 	mkdir -p debian/doc/html
-	-ocamldoc -html -m A -keep-code -d debian/doc/html agrep.mli
+	$(OCAML_OCAMLDOC) -html -m A -keep-code -d debian/doc/html agrep.mli
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --list-missing
 	dh_installman
 	dh_link
 	dh_strip
@@ -78,7 +74,7 @@ binary-arch: build install
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums
 	dh_builddeb
 

-- 
ocamlagrep packaging