[Pkg-ocaml-maint-commits] [SCM] ledit packaging branch, master, updated. debian/2.01-1-3-gd8e468b

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 2ab8e9046f94cd8b9617a3bff0d34d98b22e219a
Author: Samuel Mimram <smimram at smimou.is-a-geek.org>
Date:   Mon Feb 23 09:39:28 2009 +0100

    Use dh-ocaml.

diff --git a/debian/changelog b/debian/changelog
index 91f2b33..6572283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 ledit (2.01-2) UNRELEASED; urgency=low
 
+  [ Stephane Glondu ]
   * Remove Julien from Uploaders
 
- -- Stephane Glondu <steph at glondu.net>  Mon, 16 Feb 2009 01:02:12 +0100
+  [ Samuel Mimram ]
+  * Use dh-ocaml's predefined variables and cleanup rules.
+
+ -- Samuel Mimram <smimram at debian.org>  Mon, 23 Feb 2009 09:36:16 +0100
 
 ledit (2.01-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 1f862c4..40f401f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,8 @@ Source: ledit
 Section: editors
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders:
- Samuel Mimram <smimram at debian.org>,
- Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 7.0.0), dpatch, ocaml-nox (>= 3.11.0), camlp5 (>= 5.10)
+Uploaders: Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>> 7.0.0), dh-ocaml, dpatch, ocaml-nox (>= 3.11.0), camlp5 (>= 5.10)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ledit.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ledit.git
diff --git a/debian/rules b/debian/rules
index 00ce5d4..78c07c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,23 @@
 #!/usr/bin/make -f
 
+include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/dpatch/dpatch.make
 
-DESTDIR=$(CURDIR)/debian/ledit
+DESTDIR = $(CURDIR)/debian/ledit
 LEDIT_LIBDIR = $(CURDIR)/debian/libledit-ocaml-dev/$(OCAML_STDLIB_DIR)/ledit
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES = $(patsubst %.in,%,$(shell ls debian/*.in))
-OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
-
 #export DH_VERBOSE=1
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	for t in `find . -name \*.in | grep -v debian/control.in`; do \
-		sed -e 's%#OcamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
-	done
 	touch configure-stamp
 
 build: configure-stamp build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 	$(MAKE)
-	if [ -x /usr/bin/ocamlopt ] ; then $(MAKE) opt ; fi
+	if [ $(OCAML_OPT_ARCH) ]; then $(MAKE) opt; fi
 	touch build-stamp
 
 clean:  unpatch
@@ -66,7 +57,7 @@ binary-indep: build install-indep
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
-	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -i -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -83,7 +74,7 @@ binary-arch: build install-arch
 	dh_fixperms -s
 	dh_installdeb -s
 	dh_shlibdeps -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums -s
 	dh_builddeb -s
 
diff --git a/debian/watch b/debian/watch
index a271d19..a3d04bd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,4 +5,3 @@ version=3
 
 # <Webpage URL> <string match>
 http://cristal.inria.fr/~ddr/ledit/ distrib/src/ledit-(.*)\.tgz
-

-- 
ledit packaging