This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository lordsawar.
commit 025d7555b72e7cfa4a8ff609ca12ab747a73f0c2 Author: Alexander Reichle-Schmehl <[email protected]> Date: Thu Jan 19 12:16:53 2012 +0000 Drop debian/patches/{ftbfs_gcc-4.3_fix2.diff,ftbfs_gcc-4.3_fix.diff} as they are no longer used --- debian/changelog | 4 +- debian/patches/ftbfs_gcc-4.3_fix.diff | 109 --------------------------------- debian/patches/ftbfs_gcc-4.3_fix2.diff | 24 -------- 3 files changed, 3 insertions(+), 134 deletions(-) diff --git a/debian/changelog b/debian/changelog index e034325..d56e1b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ lordsawar (0.2.0-2) UNRELEASED; urgency=low Apparently they are no longer used (Closes: #655401) * Include ftbfs_as-needed.diff by Ilya Barygin to fix FTBFS with ld --as-needed (Closes: #631738) + * Drop debian/patches/{ftbfs_gcc-4.3_fix2.diff,ftbfs_gcc-4.3_fix.diff} as + they are no longer used - -- Alexander Reichle-Schmehl <[email protected]> Tue, 29 Mar 2011 16:12:45 +0200 + -- Alexander Reichle-Schmehl <[email protected]> Thu, 19 Jan 2012 12:49:49 +0100 lordsawar (0.2.0-1) unstable; urgency=low diff --git a/debian/patches/ftbfs_gcc-4.3_fix.diff b/debian/patches/ftbfs_gcc-4.3_fix.diff deleted file mode 100644 index 0135220..0000000 --- a/debian/patches/ftbfs_gcc-4.3_fix.diff +++ /dev/null @@ -1,109 +0,0 @@ -diff -rN -u old-lordsawar-0.0.8/m4/ggz.m4 new-lordsawar-0.0.8/m4/ggz.m4 ---- old-lordsawar-0.0.8/m4/ggz.m4 2008-04-06 14:46:22.000000000 +0200 -+++ new-lordsawar-0.0.8/m4/ggz.m4 2008-04-06 14:46:22.000000000 +0200 -@@ -136,7 +136,7 @@ - ac_ggz_stdetc="$ac_ggz_stdetc/ggzd /usr/local/etc/ggzd /etc/ggzd" - fi - if test "x$1" = "xexport" || test "x$2" = "xexport"; then -- CPPFLAGS="$CPPFLAGS -isystem ${ac_ggz_prefix_incdir}" -+ CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir}" - LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir}" - fi - -@@ -262,7 +262,7 @@ - AC_SUBST(libggz_libraries) - AC_SUBST(libggz_includes) - -- LIBGGZ_INCLUDES="-isystem $libggz_includes" -+ LIBGGZ_INCLUDES="-I $libggz_includes" - LIBGGZ_LDFLAGS="-L$libggz_libraries" - - AC_SUBST(LIBGGZ_INCLUDES) -@@ -361,7 +361,7 @@ - AC_SUBST(ggzcore_libraries) - AC_SUBST(ggzcore_includes) - -- GGZCORE_INCLUDES="-isystem $ggzcore_includes" -+ GGZCORE_INCLUDES="-I $ggzcore_includes" - GGZCORE_LDFLAGS="-L$ggzcore_libraries" - - AC_SUBST(GGZCORE_INCLUDES) -@@ -561,7 +561,7 @@ - AC_SUBST(ggzmod_libraries) - AC_SUBST(ggzmod_includes) - -- GGZMOD_INCLUDES="-isystem $ggzmod_includes" -+ GGZMOD_INCLUDES="-I $ggzmod_includes" - GGZMOD_LDFLAGS="-L$ggzmod_libraries" - - AC_SUBST(GGZMOD_INCLUDES) -@@ -659,7 +659,7 @@ - AC_SUBST(ggzdmod_libraries) - AC_SUBST(ggzdmod_includes) - -- GGZDMOD_INCLUDES="-isystem $ggzdmod_includes" -+ GGZDMOD_INCLUDES="-I $ggzdmod_includes" - GGZDMOD_LDFLAGS="-L$ggzdmod_libraries" - - AC_SUBST(GGZDMOD_INCLUDES) -diff -rN -u old-lordsawar-0.0.8/src/editor/editorbigmap.cpp new-lordsawar-0.0.8/src/editor/editorbigmap.cpp ---- old-lordsawar-0.0.8/src/editor/editorbigmap.cpp 2008-04-06 14:46:22.000000000 +0200 -+++ new-lordsawar-0.0.8/src/editor/editorbigmap.cpp 2008-04-06 14:46:22.000000000 +0200 -@@ -635,8 +635,8 @@ - for (int x = tile.x - 1; x <= tile.x + 1; ++x) - for (int y = tile.y - 1; y <= tile.y + 1; ++y) - { -- if (x < 0 || x >= GameMap::getWidth() && -- y < 0 || y >= GameMap::getHeight()) -+ if ((x < 0 || x >= GameMap::getWidth()) && -+ (y < 0 || y >= GameMap::getHeight())) - continue; - - Vector<int> pos(x, y); -diff -rN -u old-lordsawar-0.0.8/src/editor/Makefile.in new-lordsawar-0.0.8/src/editor/Makefile.in ---- old-lordsawar-0.0.8/src/game.cpp 2008-04-06 14:46:22.000000000 +0200 -+++ new-lordsawar-0.0.8/src/game.cpp 2008-04-06 14:46:22.000000000 +0200 -@@ -833,8 +833,8 @@ - if (stack) - { - can_move_selected_stack_along_path.emit -- (stack->getPath()->size() > 0 && stack->enoughMoves() || -- (stack->getPath()->size() && stack->getMovesExhaustedAtPoint() > 0)); -+ ((stack->getPath()->size() > 0 && stack->enoughMoves()) || -+ ((stack->getPath()->size() && stack->getMovesExhaustedAtPoint() > 0))); - - /* - * a note about searching. -@@ -1118,7 +1118,7 @@ - int retval; - int gender; - int side; -- size_t bytesread = 0; -+ int bytesread = 0; - char *tmp; - const Armysetlist* al = Armysetlist::getInstance(); - const Army* herotype; -diff -rN -u old-lordsawar-0.0.8/src/Location.h new-lordsawar-0.0.8/src/Location.h ---- old-lordsawar-0.0.8/src/Location.h 2008-04-06 14:46:22.000000000 +0200 -+++ new-lordsawar-0.0.8/src/Location.h 2008-04-06 14:46:22.000000000 +0200 -@@ -23,7 +23,7 @@ - - class Player; - class Location; --class ::Object; -+//class ::Object; - - /** A Location is a map object with a name. This is the metaclass for - * cities, ruins and temples. -diff -rN -u old-lordsawar-0.0.8/src/playerlist.cpp new-lordsawar-0.0.8/src/playerlist.cpp ---- old-lordsawar-0.0.8/src/playerlist.cpp 2008-04-06 14:46:22.000000000 +0200 -+++ new-lordsawar-0.0.8/src/playerlist.cpp 2008-04-06 14:46:22.000000000 +0200 -@@ -290,7 +290,7 @@ - void Playerlist::calculateDiplomaticRankings() - { - unsigned int i = 0; -- char* titles[MAX_PLAYERS] = -+ const char* titles[MAX_PLAYERS] = - { - "Statesman", - "Diplomat", diff --git a/debian/patches/ftbfs_gcc-4.3_fix2.diff b/debian/patches/ftbfs_gcc-4.3_fix2.diff deleted file mode 100644 index 7d37dc0..0000000 --- a/debian/patches/ftbfs_gcc-4.3_fix2.diff +++ /dev/null @@ -1,24 +0,0 @@ -Index: lordsawar-0.1.0/src/gui/generation-progress-window.cpp -=================================================================== ---- lordsawar-0.1.0.orig/src/gui/generation-progress-window.cpp 2008-07-21 11:49:01.000000000 -0400 -+++ lordsawar-0.1.0/src/gui/generation-progress-window.cpp 2008-07-21 11:59:41.000000000 -0400 -@@ -18,6 +18,7 @@ - #include <config.h> - - #include <assert.h> -+#include <memory> - #include <libglademm/xml.h> - - #include "glade-helpers.h" -Index: lordsawar-0.1.0/src/army.cpp -=================================================================== ---- lordsawar-0.1.0.orig/src/army.cpp 2008-07-21 11:59:56.000000000 -0400 -+++ lordsawar-0.1.0/src/army.cpp 2008-07-21 12:00:17.000000000 -0400 -@@ -19,6 +19,7 @@ - // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - // 02110-1301, USA. - -+#include <algorithm> - #include <iostream> - #include <sstream> - #include "army.h" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
