[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/20070908-1-15-gd56d5fb

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 3c3cca1277c25401c087a84478029714298605a3
Author: Samuel Mimram <smimram at debian.org>
Date:   Mon Feb 23 18:12:51 2009 +0100

    Use dh-ocaml.

diff --git a/debian/changelog b/debian/changelog
index 4c1ec41..f2a73f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,11 @@ cairo-ocaml (20090223-1) UNRELEASED; urgency=low
   [ Samuel Mimram ]
   * New CVS snapshot.
   * Switch packaging to git
+  * Use dh-ocaml.
   * Update compat to 7.
   * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 18:07:48 +0100
+ -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 18:08:18 +0100
 
 cairo-ocaml (20070908-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ac020fd..a1b5142 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cairo-ocaml
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, automake1.9, autoconf, ocaml-findlib, ocaml-nox (>= 3.10), libcairo2-dev (>= 1.2), liblablgtk2-ocaml-dev
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), dpatch, automake1.9, autoconf, ocaml-findlib, dh-ocaml, ocaml-nox (>= 3.11), libcairo2-dev (>= 1.2), liblablgtk2-ocaml-dev
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cairo-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cairo-ocaml.git
diff --git a/debian/libcairo-ocaml-dev.install.in b/debian/libcairo-ocaml-dev.install.in
index 13f64cc..a3f977c 100644
--- a/debian/libcairo-ocaml-dev.install.in
+++ b/debian/libcairo-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/cairo/*.a
-usr/lib/ocaml/@OCamlABI@/cairo/*.o
-usr/lib/ocaml/@OCamlABI@/cairo/*.cm*
-usr/lib/ocaml/@OCamlABI@/cairo/*.ml*
+ at OCamlStdlibDir@/cairo/*.a
+ at OCamlStdlibDir@/cairo/*.o
+ at OCamlStdlibDir@/cairo/*.cm*
+ at OCamlStdlibDir@/cairo/*.ml*
diff --git a/debian/libcairo-ocaml.install.in b/debian/libcairo-ocaml.install.in
index 3c64ad2..c2e4c0d 100644
--- a/debian/libcairo-ocaml.install.in
+++ b/debian/libcairo-ocaml.install.in
@@ -1,2 +1,2 @@
-usr/lib/ocaml/@OCamlABI@/cairo/dllmlcairo.so         usr/lib/ocaml/@OCamlABI@/stublibs/
-usr/lib/ocaml/@OCamlABI@/cairo/dllmlcairo_lablgtk.so usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/cairo/dllmlcairo.so         @OCamlDllDir@
+ at OCamlStdlibDir@/cairo/dllmlcairo_lablgtk.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 1ab0488..27b807c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 # We want to use dpatch
 include /usr/share/dpatch/dpatch.make
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
 DESTDIR = $(CURDIR)/debian/tmp
 
 NOW := `date +"%Y%m%d"`
@@ -23,9 +22,6 @@ orig-tarball:
 	tar zcvf cairo-ocaml_$(NOW).orig.tar.gz cairo-ocaml-$(NOW)
 	rm -rf cairo-ocaml-$(NOW)
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 configure:
 	aclocal -I support
 	autoconf
@@ -40,12 +36,14 @@ build-stamp: config.status
 	dh_testdir
 
 	$(MAKE) all
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) opt
+endif
 	$(MAKE) doc
 
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -63,8 +61,8 @@ install: build
 
 	mkdir -p $(DESTDIR)
 	$(MAKE) install DESTDIR=$(DESTDIR)
-	mkdir -p debian/libcairo-ocaml-dev/$(shell ocamlc -where)/cairo/
-	cp debian/META debian/libcairo-ocaml-dev/$(shell ocamlc -where)/cairo/
+	mkdir -p debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
+	cp debian/META debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -86,7 +84,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
 

-- 
cairo-ocaml packaging