[libconfigreader-perl] 01/17: Switch to source format "3.0 (quilt)"

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository libconfigreader-perl.

commit 1ccc145b14d208f7d6e017ce93d9ec4ec68f6129
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Dec 26 16:33:23 2013 +0100

    Switch to source format "3.0 (quilt)"
    
    * Still needs quilt for the clean target, so keep the quilt
      build-dependency.
    
    * Use dh_auto_clean in the clean target. Make sure, Makefile.PL.patch
      is applied for running dh_auto_clean.
---
 debian/changelog     |  5 +++++
 debian/rules         | 26 +++++++++++++++++++++-----
 debian/source/format |  1 +
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9ab34d..44f58ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,11 @@ libconfigreader-perl (0.5-5) UNRELEASED; urgency=low
   * Change Vcs-Git to canonical URI (git://anonscm.debian.org)
   * Change search.cpan.org based URIs to metacpan.org based URIs
 
+  [ Axel Beckert ]
+  * Switch to source format "3.0 (quilt)"
+    + Still needs quilt for a working clean target
+    + Use dh_auto_clean in the clean target, push Makefile.PL.patch before
+
  -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Feb 2008 20:27:11 +0000
 
 libconfigreader-perl (0.5-4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 22caec1..a09403f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 PACKAGE=$(shell dh_listpackages)
 
 ifndef PERL
@@ -11,7 +9,7 @@ endif
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh_testdir
 
 	-mkdir $(CURDIR)/ConfigReader
@@ -22,12 +20,30 @@ build-stamp: $(QUILT_STAMPFN)
 
 	touch build-stamp
 
-clean: clean-patched-stamp unpatch
+clean: clean-patched-stamp
 	dh_testdir
 	dh_testroot
 
+	# "make distclean" as well as "dh_auto_clean" need a
+	# Makefile.PL. Since upstream didn't include, we add a minimal
+	# one with a patch and that patch needs to be applied even
+	# during the clean target.
+	#
+	# So we check if no patch is applied (manual call of the clean
+	# target) and then apply that one patch and unapply it
+	# again. The other case is the initial calling of the clean
+	# target during the build run, where all patches are already
+	# applied and we don't need to apply any patch and we must not
+	# unapply any patch either.
+	if [ -z "`env QUILT_PATCHES=debian/patches quilt applied`" ]; then \
+	    env QUILT_PATCHES=debian/patches quilt push Makefile.PL.patch; \
+	fi
+	dh_auto_clean
+	if [ "`env QUILT_PATCHES=debian/patches quilt top`" = Makefile.PL.patch ]; then \
+	    env QUILT_PATCHES=debian/patches quilt pop; \
+	fi
+
 	dh_clean build-stamp install-stamp clean-patched-stamp
-	[ ! -f Makefile ] || ( touch Makefile && $(MAKE) distclean )
 
 clean-patched-stamp:
 	dh_testdir
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfigreader-perl.git