[SCM] Debian packaging for XML-Security-C branch, master, updated. debian/1.6.1-5-19-gffc25ee

[Russ Allbery]

The following commit has been merged in the master branch:
commit 6eea93e20e5dee7a49e19621f3ecc7932e3d2a43
Author: Russ Allbery <rra at debian.org>
Date:   Wed May 22 23:55:46 2013 -0700

    Redo the way the binaries are renamed
    
    Hopefully this will actually work, although I'm not sure why the
    previous version didn't.

diff --git a/debian/rules b/debian/rules
index 1df5bce..7751be1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-# Where the xml-security-c-utils man pages are installed.
+# Where the xml-security-c-utils binaries and man pages are installed.
+UTILS_BINDIR  := debian/xml-security-c-utils/usr/bin
 UTILS_MAN1DIR := debian/xml-security-c-utils/usr/share/man/man1
 
 # Enable compiler hardening flags.
@@ -27,15 +28,14 @@ override_dh_auto_clean:
 override_dh_install:
 	dh_install
 	mkdir -p '$(UTILS_MAN1DIR)'
-	set -ex; for pod in debian/man-pages/*.pod ; do			\
+	set -e; for pod in debian/man-pages/*.pod ; do			\
 	    pod2man "$$pod" --section 1 --name=`basename "$$pod"`	\
 		--center 'Apache XML Security' --release '$(VERSION)'	\
 		'$(UTILS_MAN1DIR)'/`basename "$$pod" .pod`.1 ;		\
 	done
-	set -ex; for path in debian/xml-security-c-utils/usr/bin/* ; do	\
-	    file=`basename "$$path"`					\
-	    mv debian/xml-security-c-utils/usr/bin/"$$file"		\
-		debian/xml-security-c-utils/usr/bin/xmlsec-"$$file" ;	\
+	set -e; for path in '$(UTILS_BINDIR)'/* ; do		\
+	    mv '$(UTILS_BINDIR)'/`basename "$$path"`		\
+		'$(UTILS_BINDIR)'/xmlsec-`basename "$$path"` ;	\
 	done
 
 override_dh_builddeb:

-- 
Debian packaging for XML-Security-C