r13124 - in packages/trunk/lordsawar/debian: . patches
Alexander Reichle-Schmehl
tolimar at alioth.debian.org
Thu Jan 19 12:16:53 UTC 2012
Author: tolimar
Date: 2012-01-19 12:16:53 +0000 (Thu, 19 Jan 2012)
New Revision: 13124
Removed:
packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff
packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix2.diff
Modified:
packages/trunk/lordsawar/debian/changelog
Log:
Drop debian/patches/{ftbfs_gcc-4.3_fix2.diff,ftbfs_gcc-4.3_fix.diff} as
they are no longer used
Modified: packages/trunk/lordsawar/debian/changelog
===================================================================
--- packages/trunk/lordsawar/debian/changelog 2012-01-19 11:49:19 UTC (rev 13123)
+++ packages/trunk/lordsawar/debian/changelog 2012-01-19 12:16:53 UTC (rev 13124)
@@ -5,8 +5,10 @@
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 <tolimar at debian.org> Tue, 29 Mar 2011 16:12:45 +0200
+ -- Alexander Reichle-Schmehl <tolimar at debian.org> Thu, 19 Jan 2012 12:49:49 +0100
lordsawar (0.2.0-1) unstable; urgency=low
Deleted: packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff
===================================================================
--- packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff 2012-01-19 11:49:19 UTC (rev 13123)
+++ packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff 2012-01-19 12:16:53 UTC (rev 13124)
@@ -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",
Deleted: packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix2.diff
===================================================================
--- packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix2.diff 2012-01-19 11:49:19 UTC (rev 13123)
+++ packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix2.diff 2012-01-19 12:16:53 UTC (rev 13124)
@@ -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"
More information about the Pkg-games-commits
mailing list