[Crosstoolchain-logs] [crosstoolchain] 02/02: Deal with unpacking multiple debs properly

[Wookey]

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

wookey pushed a commit to branch master
in repository crosstoolchain.

commit 479f88e3b1c07776f9148985a6d27b9c8b768d8a
Author: Wookey <wookey at wookware.org>
Date:   Tue Feb 4 04:56:58 2014 +0000

    Deal with unpacking multiple debs properly
---
 cross-binutils-0.1/debian/rules | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/cross-binutils-0.1/debian/rules b/cross-binutils-0.1/debian/rules
index de41c41..ebfdb7d 100755
--- a/cross-binutils-0.1/debian/rules
+++ b/cross-binutils-0.1/debian/rules
@@ -82,7 +82,7 @@ clean:
 # Repack resulting packages to make changes:
 # - Set Source and Version to this package 
 define repack_debs
-	@for deb in $1; \
+	for deb in $1; \
 	do \
 	    echo "repacking $$deb ..."; \
 	    rm -rf tmp/*; \
@@ -90,8 +90,7 @@ define repack_debs
 	    dpkg-deb -e $$deb tmp/DEBIAN; \
 	    pkgname=`echo $$deb | cut -d'_' -f1`; \
 	    sed -i -e's/^Source:.*/Source: ${THIS_PKG}/' tmp/DEBIAN/control; \
-	    sed -i -e's/^Version:.*/Version: ${THIS_PKG_VER}/' tmp/DEBIAN/control; \
-	    sed -i -e's/^Built-Using:.*/Built-Using: binutils (=${DEB_VER_BINUTILS})/' tmp/DEBIAN/control; \
+	    sed -i -e's/^Version:.*/Version: ${THIS_PKG_VER}\nBuilt-Using: binutils (=${DEB_VER_BINUTILS})/' tmp/DEBIAN/control; \
 	    if [ -e debian/overrides/$$pkgname ]; then \
 		  mkdir -p tmp/usr/share/lintian/overrides; \
 		  cp debian/overrides/$$pkgname tmp/usr/share/lintian/overrides/; \
@@ -105,8 +104,11 @@ endef
 
 repack-debs:
 	@echo START $@
-	install -d repackfiles
-	dpkg-deb -x binutils-*.deb  repackfiles
+	install -d repackfiles; \
+	for deb in $(wildcard *.deb); \
+	do \
+	  dpkg-deb -x $${deb}  repackfiles; \
+	done; \
 	$(call repack_debs, $(wildcard *.deb))
 
 build-arch: build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/crosstoolchain.git