[libconfigreader-perl] 15/17: clean-patched-stamp target integration: Back to mv

[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 755d9ddcec02866f63cd89a211630fa3cc7feb21
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Dec 26 18:06:20 2013 +0100

    clean-patched-stamp target integration: Back to mv
    
    … while still working with source format "3.0 (quilt)
    
    "mv" is needed since otherwise the left copies and its POD are
    installed later, too.
---
 debian/changelog |  4 ++--
 debian/rules     | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3e4be3..64120e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,8 +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)".
+    + Simplify clean-patched-stamp target. Make 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 f674e7d..12a0c94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ build-stamp:
 	dh_testdir
 
 	mkdir -pv $(CURDIR)/ConfigReader
-	cp -pv $(CURDIR)/*.pm $(CURDIR)/ConfigReader
+	mv -v $(CURDIR)/*.pm $(CURDIR)/ConfigReader
 
 	dh_auto_configure
 	dh_auto_build
@@ -19,6 +19,12 @@ clean:
 	dh_testdir
 	dh_testroot
 
+	if [ -d $(CURDIR)/ConfigReader ]; then \
+	    mv -v $(CURDIR)/ConfigReader/*.pm $(CURDIR)/; \
+	    rmdir -v $(CURDIR)/ConfigReader; \
+	    patch -p1 -R < debian/patches/fix-pod.patch || true; \
+	fi
+
 	# "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
@@ -49,6 +55,8 @@ install-stamp: build-stamp
 	dh_prep
 
 	dh_auto_install
+	mv -v $(CURDIR)/ConfigReader/*.pm $(CURDIR)/
+	rmdir -v $(CURDIR)/ConfigReader
 
 	touch install-stamp
 

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