[libconfigreader-perl] 09/17: Simplify clean-patched-stamp target

[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 97322e46876cabbb4058091d738387272f71f18a
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Dec 26 17:12:55 2013 +0100

    Simplify clean-patched-stamp target
    
    Use cp and rm instead of mv back and forth. Makes it work with source
    format "3.0 (quilt)".
---
 debian/changelog |  2 ++
 debian/rules     | 16 +++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0fef455..c9c3495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ libconfigreader-perl (0.5-5) UNRELEASED; urgency=low
   * 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
+    + Simplify clean-patched-stamp target by using cp and rm instead of mv
+      back and forth. Makes it work with source format "3.0 (quilt)".
   * Bump debhelper compatibility to 9
     + Update versioned debhelper build-dependency accordingly
   * Fix the following lintian warnings:
diff --git a/debian/rules b/debian/rules
index 1db9a31..f6d4295 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,15 +14,15 @@ build-indep: build-stamp
 build-stamp:
 	dh_testdir
 
-	-mkdir $(CURDIR)/ConfigReader
-	-mv $(CURDIR)/*.pm $(CURDIR)/ConfigReader
+	mkdir -pv $(CURDIR)/ConfigReader
+	cp -pv $(CURDIR)/*.pm $(CURDIR)/ConfigReader
 
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 
 	touch build-stamp
 
-clean: clean-patched-stamp
+clean:
 	dh_testdir
 	dh_testroot
 
@@ -45,15 +45,9 @@ clean: clean-patched-stamp
 	    env QUILT_PATCHES=debian/patches quilt pop; \
 	fi
 
-	dh_clean build-stamp install-stamp clean-patched-stamp
+	rm -rvf $(CURDIR)/ConfigReader
 
-clean-patched-stamp:
-	dh_testdir
-
-	-mv $(CURDIR)/ConfigReader/*.pm $(CURDIR)
-	-rmdir $(CURDIR)/ConfigReader
-
-	touch clean-patched-stamp
+	dh_clean build-stamp install-stamp
 
 install: install-stamp
 install-stamp: build-stamp

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