[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.1.0-1-2-g5f4d9a7

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 5f4d9a7c639f510301baeea85d53fbf480bb4e38
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Feb 19 10:12:06 2009 +0100

    Use dh-ocaml predefined variables in rules.

diff --git a/debian/changelog b/debian/changelog
index a336f66..ae845e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocsigen (1.1.0-2) UNRELEASED; urgency=low
+
+  * Use dh-ocaml predefined variables in rules.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 10:09:05 +0100
+
 ocsigen (1.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 43236fa..fc519be 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 7),
  libgdbm-dev,
  libsqlite3-ocaml-dev,
  libzip-ocaml-dev,
- libcryptokit-ocaml-dev
+ libcryptokit-ocaml-dev,
+ dh-ocaml (>= 0.2)
 Standards-Version: 3.8.0
 Homepage: http://www.ocsigen.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocsigen.git
diff --git a/debian/ocsigen-dev.dirs.in b/debian/ocsigen-dev.dirs.in
index c7c32e2..575e1d1 100644
--- a/debian/ocsigen-dev.dirs.in
+++ b/debian/ocsigen-dev.dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/ocsigen
+ at OCamlStdlibDir@/ocsigen
diff --git a/debian/ocsigen-dev.install.in b/debian/ocsigen-dev.install.in
index c7c32e2..575e1d1 100644
--- a/debian/ocsigen-dev.install.in
+++ b/debian/ocsigen-dev.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/ocsigen
+ at OCamlStdlibDir@/ocsigen
diff --git a/debian/rules b/debian/rules
index a1a189d..b76204f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI := $(shell ocamlc -version)
-NATIVECODE := $(shell [ -x /usr/bin/ocamlopt ] && echo yes)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR := $(CURDIR)/debian/tmp
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -50,7 +46,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-rm -f $(OFILES)
+	-rm -f $(OCAML_IN_FILES)
 	[ ! -f Makefile.config ] || $(MAKE) distclean
 	dh_clean
 
@@ -89,7 +85,7 @@ binary-common:
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums
 	dh_builddeb
 

-- 
ocsigen packaging