r9792 - in packages/trunk/pingus/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Tue May 26 16:21:37 UTC 2009
Author: bdefreese
Date: 2009-05-26 16:21:36 +0000 (Tue, 26 May 2009)
New Revision: 9792
Added:
packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4
packages/trunk/pingus/debian/patches/50_boost_signals_mt
packages/trunk/pingus/debian/patches/60_bashisms
Modified:
packages/trunk/pingus/debian/changelog
packages/trunk/pingus/debian/control
packages/trunk/pingus/debian/copyright
packages/trunk/pingus/debian/patches/series
Log:
* 40_fix_FTBFS_with_gcc-4.4 - Build with gcc-4.4. (Closes: #525741).
+ Thanks to Martin Michlmayr for the fix!.
* 50_boost_signals_mt - Use multi-threaded boost. (Closes: #530474).
* 60_bashisms - Replace echo -e with printf. (Closes: #530162).
* Minor debian/copyright syntax clean-up.
* Bump Standards Version to 3.8.1.
Modified: packages/trunk/pingus/debian/changelog
===================================================================
--- packages/trunk/pingus/debian/changelog 2009-05-26 12:03:58 UTC (rev 9791)
+++ packages/trunk/pingus/debian/changelog 2009-05-26 16:21:36 UTC (rev 9792)
@@ -1,3 +1,15 @@
+pingus (0.7.2-4) UNRELEASED; urgency=low
+
+ [ Barry deFreese ]
+ * 40_fix_FTBFS_with_gcc-4.4 - Build with gcc-4.4. (Closes: #525741).
+ + Thanks to Martin Michlmayr for the fix!.
+ * 50_boost_signals_mt - Use multi-threaded boost. (Closes: #530474).
+ * 60_bashisms - Replace echo -e with printf. (Closes: #530162).
+ * Minor debian/copyright syntax clean-up.
+ * Bump Standards Version to 3.8.1.
+
+ -- Barry deFreese <bdefreese at debian.org> Tue, 26 May 2009 11:04:01 -0400
+
pingus (0.7.2-3) unstable; urgency=low
[ Peter De Wachter ]
Modified: packages/trunk/pingus/debian/control
===================================================================
--- packages/trunk/pingus/debian/control 2009-05-26 12:03:58 UTC (rev 9791)
+++ packages/trunk/pingus/debian/control 2009-05-26 16:21:36 UTC (rev 9792)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5), quilt, scons,
libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev,
libphysfs-dev, libboost-signals-dev, libxi-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pingus/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pingus/?op=log
Homepage: http://pingus.seul.org/
Modified: packages/trunk/pingus/debian/copyright
===================================================================
--- packages/trunk/pingus/debian/copyright 2009-05-26 12:03:58 UTC (rev 9791)
+++ packages/trunk/pingus/debian/copyright 2009-05-26 16:21:36 UTC (rev 9792)
@@ -9,15 +9,14 @@
Ingo Ruhnke <grumbel at gmx.de> and others (see the AUTHORS file)
-Copyright Holders:
+Copyright:
- Copyright (C) 1999-2007, Ingo Ruhnke
+ Copyright (C) 1999-2007 Ingo Ruhnke
+ Copyright (C) 1997-2005 The ClanLib Team
+ Copyright (C) 2004-2005 Matthias Braun <matze at braunis.de>
+ Copyright (C) 1998-2002 Toni Ronkko
+ Copyright (C) 2007 Jimmy Salmon
- Copyright (C) 1997-2005, The ClanLib Team
- Copyright (C) 2004-2005, Matthias Braun <matze at braunis.de>
- Copyright (C) 1998-2002, Toni Ronkko
- Copyright (C) 2007, Jimmy Salmon
-
License:
This package is free software; you can redistribute it and/or modify
@@ -84,5 +83,5 @@
3. This notice may not be removed or altered from any source distribution.
-The Debian packaging is (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
+The Debian packaging is Copyright (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
is licensed under the GPL, see above.
Added: packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4
===================================================================
--- packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4 (rev 0)
+++ packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4 2009-05-26 16:21:36 UTC (rev 9792)
@@ -0,0 +1,26 @@
+#Author: Barry deFreese (fix from Martin Michlmayr).
+#Description: Missing includes to build with gcc-4.4.
+Index: pingus-0.7.2/src/input/evdev_device.cpp
+===================================================================
+--- pingus-0.7.2.orig/src/input/evdev_device.cpp 2009-05-26 11:05:57.000000000 -0400
++++ pingus-0.7.2/src/input/evdev_device.cpp 2009-05-26 11:06:16.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <stdexcept>
+ #include <iostream>
+ #include <errno.h>
++#include <cstdio>
+ #include <cstring>
+
+ #include "evdev_device.hpp"
+Index: pingus-0.7.2/src/tinygettext/po_file_reader.cpp
+===================================================================
+--- pingus-0.7.2.orig/src/tinygettext/po_file_reader.cpp 2009-05-26 11:06:32.000000000 -0400
++++ pingus-0.7.2/src/tinygettext/po_file_reader.cpp 2009-05-26 11:06:55.000000000 -0400
+@@ -18,6 +18,7 @@
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ #include <config.h>
++#include <cstdio>
+ #include <vector>
+ #include <iconv.h>
+ #include <errno.h>
Added: packages/trunk/pingus/debian/patches/50_boost_signals_mt
===================================================================
--- packages/trunk/pingus/debian/patches/50_boost_signals_mt (rev 0)
+++ packages/trunk/pingus/debian/patches/50_boost_signals_mt 2009-05-26 16:21:36 UTC (rev 9792)
@@ -0,0 +1,15 @@
+#Author: Barry deFreese
+#Description: New boost only has multithreaded libs now, so check for it.
+Index: pingus-0.7.2/SConstruct
+===================================================================
+--- pingus-0.7.2.orig/SConstruct 2009-05-26 11:37:21.000000000 -0400
++++ pingus-0.7.2/SConstruct 2009-05-26 11:37:40.000000000 -0400
+@@ -476,7 +476,7 @@
+ env['optional_sources'] += ['src/input/xinput_driver.cpp',
+ 'src/input/xinput_device.cpp']
+
+- if not config.CheckLibWithHeader('boost_signals', 'boost/signals.hpp', 'c++'):
++ if not config.CheckLibWithHeader('boost_signals-mt', 'boost/signals.hpp', 'c++'):
+ fatal_error += " * library 'boost_signals' not found\n"
+
+ if not config.CheckLibWithHeader('png', 'png.h', 'c++'):
Added: packages/trunk/pingus/debian/patches/60_bashisms
===================================================================
--- packages/trunk/pingus/debian/patches/60_bashisms (rev 0)
+++ packages/trunk/pingus/debian/patches/60_bashisms 2009-05-26 16:21:36 UTC (rev 9792)
@@ -0,0 +1,34 @@
+#Author: Barry deFreese <bdefreese at debian.org>
+#Description: Replaces echo -e with printf in clanlib scripts.
+Index: pingus-0.7.2/contrib/clanlib_make_datafile.sh
+===================================================================
+--- pingus-0.7.2.orig/contrib/clanlib_make_datafile.sh 2009-05-26 11:48:28.000000000 -0400
++++ pingus-0.7.2/contrib/clanlib_make_datafile.sh 2009-05-26 11:51:56.000000000 -0400
+@@ -23,9 +23,9 @@
+ #echo "Datafile line:"
+
+ if [ "$type" = "PCX (ZSoft IBM PC Paintbrush)" ]; then
+- echo -e "\t$name = $filename (type=surface, x=0, y=0, width=$width, height=$height, tcol=0);"
++ printf "\t%s = %s (type=surface, x=0, y=0, width=%d, height=%s, tcol=0);" "$name" "$filename" "$width" "&height"
+ else
+- echo -e "\t$name = $filename (type=surface, x=0, y=0, width=$width, height=$height);"
++ printf "\t%s = %s (type=surface, x=0, y=0, width=%d, height=%d);" "&name" "&filename" "&width" "&height"
+ fi
+
+ done
+Index: pingus-0.7.2/doc/clanlib_make_datafile.sh
+===================================================================
+--- pingus-0.7.2.orig/doc/clanlib_make_datafile.sh 2009-05-26 11:52:14.000000000 -0400
++++ pingus-0.7.2/doc/clanlib_make_datafile.sh 2009-05-26 11:54:04.000000000 -0400
+@@ -23,9 +23,10 @@
+ #echo "Datafile line:"
+
+ if [ "$type" = "PCX (ZSoft IBM PC Paintbrush)" ]; then
+- echo -e "\t$name = $filename (type=surface, x=0, y=0, width=$width, height=$height, tcol=0);"
++ printf "\t%s = %s (type=surface, x=0, y=0, width=%d, height=%d, tcol=0);" "$name" "$filename" "&width" "&height"
+ else
+ echo -e "\t$name = $filename (type=surface, x=0, y=0, width=$width, height=$height);"
++ printf "\t%s = %s (type=surface, x=0, y=0, width=%d, height=%d);" "$name" "$filename" "&width" "&height"
+ fi
+
+ done
Modified: packages/trunk/pingus/debian/patches/series
===================================================================
--- packages/trunk/pingus/debian/patches/series 2009-05-26 12:03:58 UTC (rev 9791)
+++ packages/trunk/pingus/debian/patches/series 2009-05-26 16:21:36 UTC (rev 9792)
@@ -2,3 +2,6 @@
20_fix_FTBFS_with_gcc-4.3
30_update_nl_translation
30_update_es_translation
+40_fix_FTBFS_with_gcc-4.4
+50_boost_signals_mt
+60_bashisms
More information about the Pkg-games-commits
mailing list