[SCM] Packaging for briquolo branch, master, updated. debian/0.5.7-1-6-g7a1eda5

[Bradley Smith]

The following commit has been merged in the master branch:
commit 67228f3cc059adb803812978638ed99aaf1ff38a
Author: Bradley Smith <brad at brad-smith.co.uk>
Date:   Sat Jul 5 21:11:32 2008 +0100

    Tidy up debian/rules.
    
    Signed-off-by: Bradley Smith <brad at brad-smith.co.uk>

diff --git a/debian/rules b/debian/rules
index fdb4c1d..4941a47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,11 @@ endif
 
 config.status: $(QUILT_STAMPFN) configure
 	dh_testdir
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --datadir=\$${prefix}/share/games --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(CFLAGS)" ./configure \
+		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --datadir=\$${prefix}/share/games \
+		--bindir=\$${prefix}/games --mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info
 
 build: build-stamp
 
@@ -38,16 +42,21 @@ install: build
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/briquolo
-	find $(CURDIR)/debian/briquolo/ -name "*.svg" -exec mv {} $(CURDIR)/debian/briquolo/usr/share/games/pixmaps \;
-	-find $(CURDIR)/debian/briquolo/ -type d | xargs rmdir -p --ignore-fail-on-non-empty
+	find $(CURDIR)/debian/briquolo/ -name "*.svg" \
+		-exec mv {} $(CURDIR)/debian/briquolo/usr/share/games/pixmaps \;
+	-find $(CURDIR)/debian/briquolo/ -type d | \
+		xargs rmdir -p --ignore-fail-on-non-empty
 	mkdir -p $(CURDIR)/debian/briquolo-data/usr/share/games/
-	mv $(CURDIR)/debian/briquolo/usr/share/games/briquolo $(CURDIR)/debian/briquolo-data/usr/share/games/
+	mv $(CURDIR)/debian/briquolo/usr/share/games/briquolo \
+		$(CURDIR)/debian/briquolo-data/usr/share/games/
 	-find $(CURDIR)/debian/briquolo/ -name "*.ttf" | xargs rm -f
 	mkdir -p $(CURDIR)/debian/briquolo/usr/share/applications
-	mv $(CURDIR)/debian/briquolo/usr/share/games/applications/* $(CURDIR)/debian/briquolo/usr/share/applications/
+	mv $(CURDIR)/debian/briquolo/usr/share/games/applications/* \
+		$(CURDIR)/debian/briquolo/usr/share/applications/
 	rm -r $(CURDIR)/debian/briquolo/usr/share/games/applications
 	mkdir -p $(CURDIR)/debian/briquolo/usr/share/pixmaps/
-	cp $(CURDIR)/debian/briquolo.xpm $(CURDIR)/debian/briquolo/usr/share/pixmaps/
+	cp $(CURDIR)/debian/briquolo.xpm \
+		$(CURDIR)/debian/briquolo/usr/share/pixmaps/
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -76,7 +85,9 @@ binary-arch: build install
 	dh_installexamples -a
 	dh_installmenu -a
 	dh_installman -a
-	dh_link -pbriquolo-data usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/briquolo/data/DejaVuSans.ttf
+	dh_link \
+		-pbriquolo-data usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf \
+		usr/share/games/briquolo/data/DejaVuSans.ttf
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a

-- 
Packaging for briquolo