r11999 - in packages/trunk/barrage/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-03-24 11:51:01 +0000 (Thu, 24 Mar 2011)
New Revision: 11999

Modified:
   packages/trunk/barrage/debian/changelog
   packages/trunk/barrage/debian/control
   packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch
   packages/trunk/barrage/debian/rules
Log:
Build the build system from source instead of using the second half of Ubuntu's patch

Modified: packages/trunk/barrage/debian/changelog
===================================================================
--- packages/trunk/barrage/debian/changelog	2011-03-24 10:28:16 UTC (rev 11998)
+++ packages/trunk/barrage/debian/changelog	2011-03-24 11:51:01 UTC (rev 11999)
@@ -15,6 +15,7 @@
   * Wrap the menu file one attribute per line
   * Refresh patches
   * Add patch from Ubuntu to allow building with newer GCC (Closes: #553932)
+    - Use dh-autoreconf to rebuild the build system
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Mon, 03 Jan 2011 22:09:01 +0100
 

Modified: packages/trunk/barrage/debian/control
===================================================================
--- packages/trunk/barrage/debian/control	2011-03-24 10:28:16 UTC (rev 11998)
+++ packages/trunk/barrage/debian/control	2011-03-24 11:51:01 UTC (rev 11999)
@@ -4,6 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>, Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends: debhelper (>= 7.0.50~),
+ dh-autoreconf,
  libsdl1.2-dev,
  libsdl-mixer1.2-dev,
  autotools-dev

Modified: packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch
===================================================================
--- packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch	2011-03-24 10:28:16 UTC (rev 11998)
+++ packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch	2011-03-24 11:51:01 UTC (rev 11999)
@@ -1,11 +1,11 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -185,7 +185,7 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -14,7 +14,7 @@
  	SFont.c
  
  barrage_LDFLAGS = 
 -barrage_LDADD = @audio_lib@
 +barrage_LDADD = @audio_lib@ -lm
+ 
  EXTRA_DIST = \
  	defs.h particle.h shots.h units.h\
- 	data.h bfield.h menu.h SFont.h chart.h

Modified: packages/trunk/barrage/debian/rules
===================================================================
--- packages/trunk/barrage/debian/rules	2011-03-24 10:28:16 UTC (rev 11998)
+++ packages/trunk/barrage/debian/rules	2011-03-24 11:51:01 UTC (rev 11999)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --bindir=\$${prefix}/games