[Pkg-ocaml-maint-commits] [SCM] ocamlsdl packaging branch, master, updated. debian/0.7.2-8-5-gb0bc694

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 6f7766d120be6d45c8b4c6d33a94ca863e124c46
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Feb 19 18:56:30 2009 +0100

    Use predefined dh-ocaml variables + updates.

diff --git a/debian/changelog b/debian/changelog
index d67eeea..db3c28a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 ocamlsdl (0.7.2-9) UNRELEASED; urgency=low
 
-  * Switch packaging to git
+  * Switch packaging to git.
+  * Use predefined dh-ocaml variables.
+  * Update standards version to 3.8.0.
+  * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 18:49:57 +0100
+ -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 18:56:07 +0100
 
 ocamlsdl (0.7.2-8) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 5defac4..ca13e55 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ocamlsdl
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.10), libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, liblablgl-ocaml-dev (>= 1.01), dpatch (>= 1.23), ocaml-findlib
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 7), dh-ocaml (>= 0.2), ocaml-nox (>= 3.10), libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, liblablgl-ocaml-dev (>= 1.01), dpatch (>= 1.23), ocaml-findlib
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlsdl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlsdl.git
 
diff --git a/debian/libsdl-ocaml-dev.dirs.in b/debian/libsdl-ocaml-dev.dirs.in
index bceaa78..cdb5564 100644
--- a/debian/libsdl-ocaml-dev.dirs.in
+++ b/debian/libsdl-ocaml-dev.dirs.in
@@ -1,2 +1,2 @@
-usr/lib/ocaml/@OCamlABI@/sdl
+ at OCamlStdlibDir@/sdl
 usr/share/doc/libsdl-ocaml-dev/html
diff --git a/debian/libsdl-ocaml-dev.install.in b/debian/libsdl-ocaml-dev.install.in
index 6cc32b1..2e4ea8d 100644
--- a/debian/libsdl-ocaml-dev.install.in
+++ b/debian/libsdl-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/sdl/*.a
-usr/lib/ocaml/@OCamlABI@/sdl/*.cm*
-usr/lib/ocaml/@OCamlABI@/sdl/*.ml*
-usr/lib/ocaml/@OCamlABI@/sdl/META
+ at OCamlStdlibDir@/sdl/*.a
+ at OCamlStdlibDir@/sdl/*.cm*
+ at OCamlStdlibDir@/sdl/*.ml*
+ at OCamlStdlibDir@/sdl/META
diff --git a/debian/libsdl-ocaml.install.in b/debian/libsdl-ocaml.install.in
index 8297451..b839996 100644
--- a/debian/libsdl-ocaml.install.in
+++ b/debian/libsdl-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/sdl/*.so usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/sdl/*.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index b81e979..43442e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,12 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -22,14 +21,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-DESTDIR=$(CURDIR)/debian/tmp/$(shell ocamlc -where)
+DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 OCAMLSDL=$(CURDIR)/debian/libsdl-ocaml
 OCAMLSDLDEV=$(OCAMLSDL)-dev
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 build: ocamlinit build-stamp
 build-stamp: patch-stamp
 	dh_testdir
@@ -40,7 +36,7 @@ build-stamp: patch-stamp
 
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -53,7 +49,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
@@ -80,7 +76,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
 

-- 
ocamlsdl packaging