r13930 - in packages/trunk/adanaxisgpl/debian: . patches

[Christoph Egger]

Author: christoph
Date: 2012-12-29 22:24:51 +0000 (Sat, 29 Dec 2012)
New Revision: 13930

Added:
   packages/trunk/adanaxisgpl/debian/patches/32_kfreebsd.diff
Modified:
   packages/trunk/adanaxisgpl/debian/changelog
   packages/trunk/adanaxisgpl/debian/control
   packages/trunk/adanaxisgpl/debian/patches/series
   packages/trunk/adanaxisgpl/debian/rules
Log:
* Team Upload
* Fix FTBFS on kFreeBSD (Closes: #675845)
  Thanks to Steven Chamberlain for the patch
* Non maintainer upload.
* Build with -fpermissive. Closes: #667094.

Modified: packages/trunk/adanaxisgpl/debian/changelog
===================================================================
--- packages/trunk/adanaxisgpl/debian/changelog	2012-12-29 08:25:30 UTC (rev 13929)
+++ packages/trunk/adanaxisgpl/debian/changelog	2012-12-29 22:24:51 UTC (rev 13930)
@@ -1,3 +1,18 @@
+adanaxisgpl (1.2.5.dfsg.1-5) unstable; urgency=low
+
+  * Team Upload
+  * Fix FTBFS on kFreeBSD (Closes: #675845)
+    Thanks to Steven Chamberlain for the patch
+
+ -- Christoph Egger <christoph at debian.org>  Sat, 29 Dec 2012 14:20:57 -0800
+
+adanaxisgpl (1.2.5.dfsg.1-4.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Build with -fpermissive. Closes: #667094.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 03 May 2012 21:48:16 +0200
+
 adanaxisgpl (1.2.5.dfsg.1-4) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/adanaxisgpl/debian/control
===================================================================
--- packages/trunk/adanaxisgpl/debian/control	2012-12-29 08:25:30 UTC (rev 13929)
+++ packages/trunk/adanaxisgpl/debian/control	2012-12-29 22:24:51 UTC (rev 13930)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev, freeglut3-dev, libexpat1-dev, libjpeg-dev, libpcre3-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libtiff4-dev, libgl1-mesa-dev, libglu1-mesa-dev, libogg-dev, libvorbis-dev
+Build-Depends: debhelper (>= 8), autotools-dev, freeglut3-dev, libexpat1-dev, libjpeg-dev, libpcre3-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libtiff4-dev, libgl1-mesa-dev, libglu1-mesa-dev, libogg-dev, libvorbis-dev, dh-autoreconf
 Standards-Version: 3.8.0
 Homepage: http://www.mushware.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adanaxisgpl/

Added: packages/trunk/adanaxisgpl/debian/patches/32_kfreebsd.diff
===================================================================
--- packages/trunk/adanaxisgpl/debian/patches/32_kfreebsd.diff	                        (rev 0)
+++ packages/trunk/adanaxisgpl/debian/patches/32_kfreebsd.diff	2012-12-29 22:24:51 UTC (rev 13930)
@@ -0,0 +1,11 @@
+--- a/configure.in      2007-10-25 21:38:55.000000000 +0100
++++ b/configure.in      2012-11-30 02:01:34.039114307 +0000
+@@ -288,6 +288,8 @@
+ ])
+ ])
+ 
++AC_CHECK_TYPES([off_t], [], [], [[#include <sys/types.h>]])
++
+ LIBS="$LIBS $SDL_EXTRA_LIBS"
+ 
+ AC_OUTPUT(Makefile src/Makefile data-adanaxis/Makefile)

Modified: packages/trunk/adanaxisgpl/debian/patches/series
===================================================================
--- packages/trunk/adanaxisgpl/debian/patches/series	2012-12-29 08:25:30 UTC (rev 13929)
+++ packages/trunk/adanaxisgpl/debian/patches/series	2012-12-29 22:24:51 UTC (rev 13930)
@@ -2,3 +2,4 @@
 20_fix_FTBFS_with_gcc-4.3.diff
 30_dont_crash_at_16bpp.diff
 31_fix-ftbfs-with-gcc4.4.diff
+32_kfreebsd.diff

Modified: packages/trunk/adanaxisgpl/debian/rules
===================================================================
--- packages/trunk/adanaxisgpl/debian/rules	2012-12-29 08:25:30 UTC (rev 13929)
+++ packages/trunk/adanaxisgpl/debian/rules	2012-12-29 22:24:51 UTC (rev 13930)
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -fpermissive
+
 %:
-	dh $@ --with autotools_dev --parallel
+	dh $@ --with autotools_dev --with autoreconf --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
+	CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \
 		--bindir='$${prefix}/games' \
 		--datadir='$${prefix}/share/games'