[Pkg-ocaml-maint-commits] [SCM] perl4caml packaging branch, master, updated. debian/0.9.3-8.1-20-gb880649

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1921ce8efe69697354132501b714066596ea5478
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Feb 21 01:45:36 2009 +0100

    Switch to debhelper 7 and use ocamlinit.mk

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 3734c57..60ac942 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,14 @@ Uploaders:
  Mike Furr <mfurr at debian.org>,
  Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 4.0.0), libperl-dev, perl-modules, perl-base (>= 5.8), perl (>= 5.8), ocaml-nox (>= 3.10.1), dpatch
+Build-Depends:
+ debhelper (>= 7),
+ libperl-dev,
+ perl-modules,
+ perl-base (>= 5.8),
+ perl (>= 5.8),
+ ocaml-nox (>= 3.10.1),
+ dpatch
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/perl4caml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/perl4caml.git
diff --git a/debian/libperl4caml-ocaml-dev.files b/debian/libperl4caml-ocaml-dev.files
deleted file mode 100644
index 2922e9b..0000000
--- a/debian/libperl4caml-ocaml-dev.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/3.10.0/perl/*
diff --git a/debian/libperl4caml-ocaml-dev.files.in b/debian/libperl4caml-ocaml-dev.files.in
deleted file mode 100644
index 767885f..0000000
--- a/debian/libperl4caml-ocaml-dev.files.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/#OCamlABI#/perl/*
diff --git a/debian/libperl4caml-ocaml-dev.install.in b/debian/libperl4caml-ocaml-dev.install.in
new file mode 100644
index 0000000..f6b6da0
--- /dev/null
+++ b/debian/libperl4caml-ocaml-dev.install.in
@@ -0,0 +1 @@
+ at OCamlStdlibDir@/perl/*
diff --git a/debian/libperl4caml-ocaml.files b/debian/libperl4caml-ocaml.files
deleted file mode 100644
index 2888ab0..0000000
--- a/debian/libperl4caml-ocaml.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/3.10.0/stublibs/*
diff --git a/debian/libperl4caml-ocaml.files.in b/debian/libperl4caml-ocaml.files.in
deleted file mode 100644
index 0ba2119..0000000
--- a/debian/libperl4caml-ocaml.files.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/#OCamlABI#/stublibs/*
diff --git a/debian/libperl4caml-ocaml.install.in b/debian/libperl4caml-ocaml.install.in
new file mode 100644
index 0000000..eea2ca0
--- /dev/null
+++ b/debian/libperl4caml-ocaml.install.in
@@ -0,0 +1 @@
+ at OCamlDllDir@/*
diff --git a/debian/rules b/debian/rules
index c0b0bf8..2cd3a4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,111 +1,33 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/dpatch/dpatch.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+PACKAGES := $(shell awk '/Package:/{print $$2}' debian/control)
 
-include /usr/share/dpatch/dpatch.make
-OCAMLABI = $(shell ocamlc -version)
+build: patch ocamlinit
+	dh $@
 
-ABI_FILES = $(wildcard debian/*.in)
+clean: unpatch ocamlinit-clean
+	dh $@
+	rm -Rf html
 
-.PHONY: ocamlini
-
-ocamlini: $(ABI_FILES)
-	for t in $^; do \
-	    sed -e 's%#OCamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
+substvar-stamp:
+	dh_prep
+	for u in $(PACKAGES); do \
+  	  echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
 	done
+	touch $@
 
-configure-stamp: patch-stamp ocamlini
-	dh_testdir
-
-
-	touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
+binary-indep: substvar-stamp
+	dh $@
 
-clean: patch clean1 unpatch
-
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp 
-
-	-$(MAKE) clean
-	-rm -rf html
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	cd debian/tmp && find . -name ".arch-ids" -exec rm -rf {} \;
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_movefiles -i
-	dh_installchangelogs  -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installman -i
-	dh_link -i
-	# dh_strip is broken on this package!
-	#dh_strip
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_movefiles -a
-	dh_installchangelogs  -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installman -a
-	dh_link -a
-	# dh_strip is broken on this package!
-	#dh_strip
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums -a
-	dh_builddeb -a
+binary-arch: substvar-stamp
+	dh $@
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build clean binary-indep binary-arch binary install

-- 
perl4caml packaging