[SCM] platform/puzzle game branch, master, updated. upstream/1.0-7-g29435d6

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 29435d6daeda5843ec04a68141200817add07e05
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Oct 5 20:39:21 2008 +0200

    Remove dh_link; clarify comments

diff --git a/debian/rules b/debian/rules
index d683f8f..5b39e9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,10 +23,11 @@ endif
 config.status: configure
 	dh_testdir
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	# Add here commands to configure the package.
-	# we use the system version of these libs
+
+	# We use the system version of these libs, move them out to
+	# prevent gcc from using them instead of the system versions:
 	mkdir moved_out && mv src/guichan* src/dumb moved_out/
-	# remove hardcoded optflags from configure
+	# Remove hardcoded optflags from configure:
 	sed -i 's/-O2 -ffast-math -fomit-frame-pointer/ -ffast-math/g' configure.ac
 	AUTOMAKE=automake-1.10 autoreconf --install --force
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --bindir=/usr/games --datadir=/usr/share/games CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
@@ -46,9 +47,10 @@ clean:
 	dh_testroot
 	rm -f build-stamp 
 
-	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f debian/ballz.png debian/ballz.xpm
+
+	# Move back files to avoid a big diff.gz and/or break double compilation
 	-mv moved_out/* src/
 	-rmdir moved_out/
 
@@ -89,7 +91,6 @@ binary-arch: build install
 	dh_installman -a
 	dh_icons -a
 	dh_desktop -a
-	dh_link -a
 	dh_strip -a --dbg-package=ballz-dbg
 	dh_compress -a
 	dh_fixperms -a

-- 
platform/puzzle game