Author: jmm Date: 2009-12-26 13:47:11 +0000 (Sat, 26 Dec 2009) New Revision: 10640
Added: packages/trunk/adanaxisgpl/debian/patches/31_fix-ftbfs-with-gcc4.4.diff packages/trunk/adanaxisgpl/debian/source/ packages/trunk/adanaxisgpl/debian/source/format Modified: packages/trunk/adanaxisgpl/debian/changelog packages/trunk/adanaxisgpl/debian/control packages/trunk/adanaxisgpl/debian/patches/series packages/trunk/adanaxisgpl/debian/rules Log: * Adding myself to uploaders * Convert to source format 3 (quilt) * Fix FTBFS with GCC 4.4 (Closes: #560450) Modified: packages/trunk/adanaxisgpl/debian/changelog =================================================================== --- packages/trunk/adanaxisgpl/debian/changelog 2009-12-25 21:58:18 UTC (rev 10639) +++ packages/trunk/adanaxisgpl/debian/changelog 2009-12-26 13:47:11 UTC (rev 10640) @@ -1,3 +1,11 @@ +adanaxisgpl (1.2.5.dfsg.1-3) unstable; urgency=low + + * Adding myself to uploaders + * Convert to source format 3 (quilt) + * Fix FTBFS with GCC 4.4 (Closes: #560450) + + -- Moritz Muehlenhoff <[email protected]> Sat, 26 Dec 2009 13:47:49 +0100 + adanaxisgpl (1.2.5.dfsg.1-2.1) unstable; urgency=low * Clean up the changelog, the first entry was garbage Modified: packages/trunk/adanaxisgpl/debian/control =================================================================== --- packages/trunk/adanaxisgpl/debian/control 2009-12-25 21:58:18 UTC (rev 10639) +++ packages/trunk/adanaxisgpl/debian/control 2009-12-26 13:47:11 UTC (rev 10640) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Barry deFreese <[email protected]> -Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, quilt, freeglut3-dev, libexpat1-dev, libjpeg62-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 (>= 5), autotools-dev, autoconf, automake, freeglut3-dev, libexpat1-dev, libjpeg62-dev, libpcre3-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libtiff4-dev, libgl1-mesa-dev, libglu1-mesa-dev, libogg-dev, libvorbis-dev 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/31_fix-ftbfs-with-gcc4.4.diff =================================================================== --- packages/trunk/adanaxisgpl/debian/patches/31_fix-ftbfs-with-gcc4.4.diff (rev 0) +++ packages/trunk/adanaxisgpl/debian/patches/31_fix-ftbfs-with-gcc4.4.diff 2009-12-26 13:47:11 UTC (rev 10640) @@ -0,0 +1,14 @@ +Index: adanaxisgpl/src/Platform/X11/PlatformMiscUtils.cpp +=================================================================== +--- adanaxisgpl.orig/src/Platform/X11/PlatformMiscUtils.cpp 2009-12-26 14:04:37.000000000 +0100 ++++ adanaxisgpl/src/Platform/X11/PlatformMiscUtils.cpp 2009-12-26 14:05:04.000000000 +0100 +@@ -1237,7 +1237,8 @@ + char * + br_dirname (const char *path) + { +- char *end, *result; ++ const char *end; ++ char *result; + + if (path == (const char *) NULL) + return (char *) NULL; Modified: packages/trunk/adanaxisgpl/debian/patches/series =================================================================== --- packages/trunk/adanaxisgpl/debian/patches/series 2009-12-25 21:58:18 UTC (rev 10639) +++ packages/trunk/adanaxisgpl/debian/patches/series 2009-12-26 13:47:11 UTC (rev 10640) @@ -1,3 +1,4 @@ 10_try_more_cache_paths.diff 20_fix_FTBFS_with_gcc-4.3.diff 30_dont_crash_at_16bpp.diff +31_fix-ftbfs-with-gcc4.4.diff Modified: packages/trunk/adanaxisgpl/debian/rules =================================================================== --- packages/trunk/adanaxisgpl/debian/rules 2009-12-25 21:58:18 UTC (rev 10639) +++ packages/trunk/adanaxisgpl/debian/rules 2009-12-26 13:47:11 UTC (rev 10640) @@ -7,8 +7,6 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -include /usr/share/quilt/quilt.make - # Mushware needs build arch for selecting apbuild MUSH_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) @@ -20,7 +18,7 @@ CFLAGS += -O2 endif -config.status: patch configure +config.status: configure dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -52,7 +50,7 @@ touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp Added: packages/trunk/adanaxisgpl/debian/source/format =================================================================== --- packages/trunk/adanaxisgpl/debian/source/format (rev 0) +++ packages/trunk/adanaxisgpl/debian/source/format 2009-12-26 13:47:11 UTC (rev 10640) @@ -0,0 +1 @@ +3.0 (quilt) \ No newline at end of file _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
