The following commit has been merged in the master branch:
commit d5f8a480c86bfb490cee259354af65755a3ac44b
Author: Sylvain Beucler <[EMAIL PROTECTED]>
Date: Sat Oct 11 15:13:42 2008 +0200
Make sure autoreconf-generated files aren't included in diff.gz
diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
new file mode 100644
index 0000000..3ed5174
--- /dev/null
+++ b/debian/patches/cflags.patch
@@ -0,0 +1,15 @@
+Index: ballz-debian/configure.ac
+===================================================================
+--- ballz-debian.orig/configure.ac 2008-10-11 15:10:03.000000000 +0200
++++ ballz-debian/configure.ac 2008-10-11 15:10:05.000000000 +0200
+@@ -14,8 +14,8 @@
+
+ AM_PATH_ALLEGRO(4.2.0, , AC_MSG_ERROR([Allegro library not found! You can get
a copy at http://www.talula.demon.co.uk/allegro/]))
+
+-CFLAGS="$CFLAGS `allegro-config --cflags` -Wno-missing-declarations -O2
-ffast-math -fomit-frame-pointer"
+-CPPFLAGS="$CPPFLAGS `allegro-config --cppflags`-O2 -ffast-math
-fomit-frame-pointer"
++CFLAGS="$CFLAGS `allegro-config --cflags` -Wno-missing-declarations
-ffast-math"
++CPPFLAGS="$CPPFLAGS `allegro-config --cppflags` -ffast-math"
+ LDFLAGS="$LDFLAGS `allegro-config --libs`"
+
+ CXXFLAGS="$CXXFLAGS -DALLEGRO_USE_CONSOLE
-DBALLZ_DATA_PREFIX='\"$datadir/ballz\"'"
diff --git a/debian/patches/series b/debian/patches/series
index 553a017..928a62c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+cflags.patch
ballz-1.0-syslibs.patch
ballz-1.0-toggle-fullscreen.patch
ballz-1.0-guichan081.patch
diff --git a/debian/rules b/debian/rules
index 5b39e9d..0381276 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,6 @@ config.status: configure
# 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:
- 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"
@@ -47,7 +45,9 @@ clean:
dh_testroot
rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
+ # Remove files changed by 'autoreconf' to prevent them showing in the
diff.gz
+ [ ! -f Makefile ] || $(MAKE) maintainer-clean
+ rm -f INSTALL Makefile.in aclocal.m4 config.guess config.sub configure
data/Makefile.in depcomp install-sh missing mkinstalldirs src/Makefile.in
rm -f debian/ballz.png debian/ballz.xpm
# Move back files to avoid a big diff.gz and/or break double compilation
@@ -55,7 +55,13 @@ clean:
-rmdir moved_out/
$(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean
+ dh_clean
+
+ # if this is a git repository, restore removed files that would have
+ # been ignored by dpkg-source
+ -test -d .git && git-checkout -- $$(git-status | \
+ sed -e
'/^#[[:space:]]*deleted:[[:space:]]*/s/^#[[:space:]]*deleted:[[:space:]]*//p;d'
| \
+ grep -v '^debian/')
install: build
dh_testdir
--
ballz (platform/puzzle game)
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
