[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.10.2-3-7-gfef0417

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 910fc7f880da1d419a3fb6be18998a21199c268f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jul 8 14:33:09 2008 +0200

    Bump debhelper compatibility level to 7
    
     * use debian/clean for cleaning upstream files
     * make explicit sourcedir in dh_install calls
     * dh_clean -k -> dh_prep

diff --git a/debian/changelog b/debian/changelog
index 9b56356..be38b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ocaml (3.10.2-4) UNRELEASED; urgency=low
 
   * Switching packaging to git (from svn)
+  * Bump debhelper compatibility level to 7, and use debian/clean feature
+    of dh_clean
 
- -- Stephane Glondu <steph at glondu.net>  Tue, 08 Jul 2008 11:15:35 +0200
+ -- Stephane Glondu <steph at glondu.net>  Tue, 08 Jul 2008 14:30:11 +0200
 
 ocaml (3.10.2-3) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..e2d10dd
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,13 @@
+_boot_log1
+_boot_log2
+_log
+byterun/libcamlrun_shared.so
+camlp4/config/Makefile
+camlp4/config/Makefile.cnf
+config/Makefile
+config/m.h
+config/s.h
+debian/README.labltk
+driver/ocamlcomp.sh
+emacs/ocamltags
+myocamlbuild_config.ml
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 4d803c0..fe68c88 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>, Ralf Treinen <treinen at debian.org>
-Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm]
+Build-Depends: debhelper (>= 7), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm]
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git
diff --git a/debian/rules b/debian/rules
index 07e0a76..bb60df8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,15 +146,11 @@ clean: abi-sed unpatch
 	    mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \
 	  fi; \
 	done
-	# File not cleaned by upstream
-	-$(RM) _boot_log1
-	-$(RM) _boot_log2
-	-$(RM) _log
-	-$(RM) myocamlbuild_config.ml
+	# Files not cleaned by upstream (most of them are cleaned
+	# using debian/clean feature of dh_clean in debhelper 7)
 	-$(RM) ocaml-$(OCAMLABI)
-	-$(RM) byterun/libcamlrun_shared.so
 
-	dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh
+	dh_clean
 	debian/rules abi-sed-clean
 	-$(RM) debian/$(SRCTARBALL)
 
@@ -162,7 +158,7 @@ install: install-indep install-arch
 install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_prep -i
 	dh_installdirs -i
 
 	# Install Emacs files
@@ -173,12 +169,12 @@ install-indep: build-indep
 	fi
 	$(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags
 
-	dh_install -i
+	dh_install --sourcedir=. -i
 
 install-arch: build-arch
 	dh_testdir
 	dh_testroot
-	dh_clean -k -a
+	dh_prep -a
 	dh_installdirs -a
 
 	# Let's install ocaml first.
@@ -280,7 +276,7 @@ install-arch: build-arch
 	cp debian/ocaml-nox.override debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox
 
 	chmod +x debian/cdbs/ocamldoc-api-ref-config
-	dh_install -a
+	dh_install --sourcedir=. -a
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi in another 'make' thread.

-- 
OCaml packaging