Author: tolimar Date: 2012-01-19 15:23:06 +0000 (Thu, 19 Jan 2012) New Revision: 13131
Added: packages/tags/lordsawar/0.2.0-2/ packages/tags/lordsawar/0.2.0-2/debian/changelog packages/tags/lordsawar/0.2.0-2/debian/control packages/tags/lordsawar/0.2.0-2/debian/rules Removed: packages/tags/lordsawar/0.2.0-2/debian/changelog packages/tags/lordsawar/0.2.0-2/debian/control packages/tags/lordsawar/0.2.0-2/debian/patches/ftbfs_gcc-4.3_fix.diff packages/tags/lordsawar/0.2.0-2/debian/patches/ftbfs_gcc-4.3_fix2.diff packages/tags/lordsawar/0.2.0-2/debian/rules Log: [svn-buildpackage] Tagging lordsawar 0.2.0-2 Deleted: packages/tags/lordsawar/0.2.0-2/debian/changelog =================================================================== --- packages/trunk/lordsawar/debian/changelog 2012-01-19 11:49:19 UTC (rev 13123) +++ packages/tags/lordsawar/0.2.0-2/debian/changelog 2012-01-19 15:23:06 UTC (rev 13131) @@ -1,177 +0,0 @@ -lordsawar (0.2.0-2) UNRELEASED; urgency=low - - * NOT RELEASED YET - * Stopp build-depending on libggz-dev, libggzdmod-dev and libggzmod-dev. - 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) - - -- Alexander Reichle-Schmehl <[email protected]> Tue, 29 Mar 2011 16:12:45 +0200 - -lordsawar (0.2.0-1) unstable; urgency=low - - * New upstream release - * Doesn't use libgnet anymore (Closes: #572827) - * Bump standards version to 3.9.1 (no changes needed) - - -- Alexander Reichle-Schmehl <[email protected]> Tue, 29 Mar 2011 12:46:16 +0200 - -lordsawar (0.1.8-1) unstable; urgency=low - - * New upstream release. - * Add misc:Depends for -data package. - * Bump Standards Version to 3.8.4. (No changes needed). - - -- Barry deFreese <[email protected]> Sat, 10 Apr 2010 09:29:33 -0400 - -lordsawar (0.1.6-1) unstable; urgency=low - - [ Barry deFreese ] - * New upstream release. - + Drop libsdl-image1.2 from build-deps, no longer needed. - * Add README.source for quilt patch system. - * Clean up debian/copyright some. - * Bump Standards Version to 3.8.3. (No changes needed). - - -- Barry deFreese <[email protected]> Wed, 21 Oct 2009 08:02:12 -0400 - -lordsawar (0.1.5-1) unstable; urgency=low - - [ Alexander Reichle-Schmehl ] - * Adopt debian/control to my new name - - [ Barry deFreese ] - * New upstream release. - + Printfs dropped from network-connections.c. (Closes: #510767). - - -- Barry deFreese <[email protected]> Sun, 01 Mar 2009 17:43:35 -0500 - -lordsawar (0.1.4-1) unstable; urgency=low - - [ Barry deFreese ] - * New upstream release. - * Move 0.0.8-2.1 changelog entry to correct point in changelog. - * Make lordsawar-data suggest lordsawar. - * Update my e-mail address. - * Add build-depends on intltool, uuid-dev, and libboost-dev. - * Don't install locales since there are no translations currently. - * Add simple man page for new lordsawar-pbm binary. - * Drop gcc4.3 patches as they have been fixed upstream. - - -- Barry deFreese <[email protected]> Sat, 20 Dec 2008 13:52:12 -0500 - -lordsawar (0.1.0-1) unstable; urgency=low - - * New upstream release. - * ftbfs_gcc-4.3_fix2.diff - Introduces some new gcc-4.3 build errors. - * Fix watch file for new upstream URL. - - -- Barry deFreese <[email protected]> Tue, 17 Jun 2008 16:07:00 -0400 - -lordsawar (0.0.9-1) unstable; urgency=low - - [ Barry deFreese ] - * New upstream release. - + Fixes gcc-4.3 builds so drop ftbfs_gcc-4.3_fix.diff. - + Add new build-dependency for libgnet-dev. - * Add simple man page for new lordsawar-tile-editor. - * Add desktop file for lordsawar-tile-editor. - * Remove French translation on install. - - [ Gonéri Le Bouder ] - * bump Debian Policy to 3.8.0. No change needed. - * fix wording in the 0.0.8-3 entry of the Debian changelog - - -- Barry deFreese <[email protected]> Tue, 17 Jun 2008 11:15:26 +0200 - -lordsawar (0.0.8-3) unstable; urgency=low - - [ Gonéri Le Bouder ] - * reverse my change to avoid autoreconf, the old behaviour was wanted - (Closes: #474856) Thanks Peter De Wachter - - -- Debian Games Team <[email protected]> Sat, 26 Apr 2008 20:23:06 +0200 - -lordsawar (0.0.8-2.1) unstable; urgency=high - - [ Eddy Petrișor ] - * fix Vcs-Svn URL to point to svn, not the incomplete ssh location - - [ Alexander Schmehl ] - * Added patches/ftbfs_gcc-4.3_fix.diff to fix FTBFS with gcc 4.3 - (Closes: #474856) - - [ Gonéri Le Bouder ] - * touch aclocal.m4, Makefile.in and configure to make autotools happy - and avoid autoreconf with ftbfs_gcc-4.3_fix.diff - * clean the .pc directory - * - - -- Gonéri Le Bouder <[email protected]> Sat, 26 Apr 2008 20:23:06 +0200 - -lordsawar (0.0.8-2) unstable; urgency=high - - [ Eddy Petrișor ] - * fix Vcs-Svn URL to point to svn, not the incomplete ssh location - - [ Alexander Schmehl ] - * Added patches/ftbfs_gcc-4.3_fix.diff to fix FTBFS with gcc 4.3 - (Closes: #474856) - - [ Gonéri Le Bouder ] - * touch aclocal.m4, Makefile.in and configure to make autotools happy - and avoid autoreconf with ftbfs_gcc-4.3_fix.diff - * clean the .pc directory - - -- Debian Games Team <[email protected]> Sat, 26 Apr 2008 03:32:39 +0200 - -lordsawar (0.0.8-1) unstable; urgency=low - - [ Alexander Schmehl ] - * New stable upstream release - * added myself to uploaders - * added libggz-dev, libggzdmod-dev and libggzmod-dev to build-depends; - lordsawar can make use of them :) - Thanks to Lucas Nussbaum and his "build daemon from hell" for detecting - this issue - * Adding a "Recommends: lordsawar" to the -data package - - -- Alexander Schmehl <[email protected]> Wed, 13 Feb 2008 13:21:26 +0100 - -lordsawar (0.0.7-1) unstable; urgency=low - - [ Eddy Petrișor ] - * install the desktop file in the proper place - thanks to Marco - Rodrigues. - - [ Barry deFreese ] - * New upstream release. (Closes: #452209, #452906, #452364, #452812). - * Remove XS- prefix from VCS fields. - * Bump Standards Version to 3.7.3. (No changes needed). - * Fix install files. - * Add call to dh_desktop. - * Add icon for desktop file. - * Remove references to in-game help in man pages. (Closes: #452812). - - -- Barry deFreese <[email protected]> Wed, 28 Nov 2007 00:06:13 +0200 - -lordsawar (0.0.4-1) unstable; urgency=low - - * New upstream release - * Fix desktop files (files were reversed) - * Add desktop file and simple manpage for new binary lordsawar-army-editor - * Syntax fixes on manpages - * Move manpages to correct section (6) - - -- Barry deFreese <[email protected]> Mon, 29 Oct 2007 15:38:06 -0400 - -lordsawar (0.0.3-1) unstable; urgency=low - - * Initial release - * Add simple man pages for executables - * Split into binary and data packages - * Move binaries to /usr/games - * Move shared data to /usr/share/games - * Override upstream desktop files until they are fixed - - -- Barry deFreese <[email protected]> Thu, 27 Sep 2007 21:27:07 -0400 Copied: packages/tags/lordsawar/0.2.0-2/debian/changelog (from rev 13130, packages/trunk/lordsawar/debian/changelog) =================================================================== --- packages/tags/lordsawar/0.2.0-2/debian/changelog (rev 0) +++ packages/tags/lordsawar/0.2.0-2/debian/changelog 2012-01-19 15:23:06 UTC (rev 13131) @@ -0,0 +1,182 @@ +lordsawar (0.2.0-2) unstable; urgency=low + + * Stopp build-depending on libggz-dev, libggzdmod-dev and libggzmod-dev. + 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 + * Fix description-synopsis-starts-with-article from lintian by removing + two a's + * Add recommended targets build-arch and build-indep to debian/rules + * Bump standards (no further changes needed) + + -- Alexander Reichle-Schmehl <[email protected]> Thu, 19 Jan 2012 15:03:53 +0100 + +lordsawar (0.2.0-1) unstable; urgency=low + + * New upstream release + * Doesn't use libgnet anymore (Closes: #572827) + * Bump standards version to 3.9.1 (no changes needed) + + -- Alexander Reichle-Schmehl <[email protected]> Tue, 29 Mar 2011 12:46:16 +0200 + +lordsawar (0.1.8-1) unstable; urgency=low + + * New upstream release. + * Add misc:Depends for -data package. + * Bump Standards Version to 3.8.4. (No changes needed). + + -- Barry deFreese <[email protected]> Sat, 10 Apr 2010 09:29:33 -0400 + +lordsawar (0.1.6-1) unstable; urgency=low + + [ Barry deFreese ] + * New upstream release. + + Drop libsdl-image1.2 from build-deps, no longer needed. + * Add README.source for quilt patch system. + * Clean up debian/copyright some. + * Bump Standards Version to 3.8.3. (No changes needed). + + -- Barry deFreese <[email protected]> Wed, 21 Oct 2009 08:02:12 -0400 + +lordsawar (0.1.5-1) unstable; urgency=low + + [ Alexander Reichle-Schmehl ] + * Adopt debian/control to my new name + + [ Barry deFreese ] + * New upstream release. + + Printfs dropped from network-connections.c. (Closes: #510767). + + -- Barry deFreese <[email protected]> Sun, 01 Mar 2009 17:43:35 -0500 + +lordsawar (0.1.4-1) unstable; urgency=low + + [ Barry deFreese ] + * New upstream release. + * Move 0.0.8-2.1 changelog entry to correct point in changelog. + * Make lordsawar-data suggest lordsawar. + * Update my e-mail address. + * Add build-depends on intltool, uuid-dev, and libboost-dev. + * Don't install locales since there are no translations currently. + * Add simple man page for new lordsawar-pbm binary. + * Drop gcc4.3 patches as they have been fixed upstream. + + -- Barry deFreese <[email protected]> Sat, 20 Dec 2008 13:52:12 -0500 + +lordsawar (0.1.0-1) unstable; urgency=low + + * New upstream release. + * ftbfs_gcc-4.3_fix2.diff - Introduces some new gcc-4.3 build errors. + * Fix watch file for new upstream URL. + + -- Barry deFreese <[email protected]> Tue, 17 Jun 2008 16:07:00 -0400 + +lordsawar (0.0.9-1) unstable; urgency=low + + [ Barry deFreese ] + * New upstream release. + + Fixes gcc-4.3 builds so drop ftbfs_gcc-4.3_fix.diff. + + Add new build-dependency for libgnet-dev. + * Add simple man page for new lordsawar-tile-editor. + * Add desktop file for lordsawar-tile-editor. + * Remove French translation on install. + + [ Gonéri Le Bouder ] + * bump Debian Policy to 3.8.0. No change needed. + * fix wording in the 0.0.8-3 entry of the Debian changelog + + -- Barry deFreese <[email protected]> Tue, 17 Jun 2008 11:15:26 +0200 + +lordsawar (0.0.8-3) unstable; urgency=low + + [ Gonéri Le Bouder ] + * reverse my change to avoid autoreconf, the old behaviour was wanted + (Closes: #474856) Thanks Peter De Wachter + + -- Debian Games Team <[email protected]> Sat, 26 Apr 2008 20:23:06 +0200 + +lordsawar (0.0.8-2.1) unstable; urgency=high + + [ Eddy Petrișor ] + * fix Vcs-Svn URL to point to svn, not the incomplete ssh location + + [ Alexander Schmehl ] + * Added patches/ftbfs_gcc-4.3_fix.diff to fix FTBFS with gcc 4.3 + (Closes: #474856) + + [ Gonéri Le Bouder ] + * touch aclocal.m4, Makefile.in and configure to make autotools happy + and avoid autoreconf with ftbfs_gcc-4.3_fix.diff + * clean the .pc directory + * + + -- Gonéri Le Bouder <[email protected]> Sat, 26 Apr 2008 20:23:06 +0200 + +lordsawar (0.0.8-2) unstable; urgency=high + + [ Eddy Petrișor ] + * fix Vcs-Svn URL to point to svn, not the incomplete ssh location + + [ Alexander Schmehl ] + * Added patches/ftbfs_gcc-4.3_fix.diff to fix FTBFS with gcc 4.3 + (Closes: #474856) + + [ Gonéri Le Bouder ] + * touch aclocal.m4, Makefile.in and configure to make autotools happy + and avoid autoreconf with ftbfs_gcc-4.3_fix.diff + * clean the .pc directory + + -- Debian Games Team <[email protected]> Sat, 26 Apr 2008 03:32:39 +0200 + +lordsawar (0.0.8-1) unstable; urgency=low + + [ Alexander Schmehl ] + * New stable upstream release + * added myself to uploaders + * added libggz-dev, libggzdmod-dev and libggzmod-dev to build-depends; + lordsawar can make use of them :) + Thanks to Lucas Nussbaum and his "build daemon from hell" for detecting + this issue + * Adding a "Recommends: lordsawar" to the -data package + + -- Alexander Schmehl <[email protected]> Wed, 13 Feb 2008 13:21:26 +0100 + +lordsawar (0.0.7-1) unstable; urgency=low + + [ Eddy Petrișor ] + * install the desktop file in the proper place - thanks to Marco + Rodrigues. + + [ Barry deFreese ] + * New upstream release. (Closes: #452209, #452906, #452364, #452812). + * Remove XS- prefix from VCS fields. + * Bump Standards Version to 3.7.3. (No changes needed). + * Fix install files. + * Add call to dh_desktop. + * Add icon for desktop file. + * Remove references to in-game help in man pages. (Closes: #452812). + + -- Barry deFreese <[email protected]> Wed, 28 Nov 2007 00:06:13 +0200 + +lordsawar (0.0.4-1) unstable; urgency=low + + * New upstream release + * Fix desktop files (files were reversed) + * Add desktop file and simple manpage for new binary lordsawar-army-editor + * Syntax fixes on manpages + * Move manpages to correct section (6) + + -- Barry deFreese <[email protected]> Mon, 29 Oct 2007 15:38:06 -0400 + +lordsawar (0.0.3-1) unstable; urgency=low + + * Initial release + * Add simple man pages for executables + * Split into binary and data packages + * Move binaries to /usr/games + * Move shared data to /usr/share/games + * Override upstream desktop files until they are fixed + + -- Barry deFreese <[email protected]> Thu, 27 Sep 2007 21:27:07 -0400 Deleted: packages/tags/lordsawar/0.2.0-2/debian/control =================================================================== --- packages/trunk/lordsawar/debian/control 2012-01-19 11:49:19 UTC (rev 13123) +++ packages/tags/lordsawar/0.2.0-2/debian/control 2012-01-19 15:23:06 UTC (rev 13131) @@ -1,36 +0,0 @@ -Source: lordsawar -Section: games -Priority: extra -Maintainer: Debian Games Team <[email protected]> -Uploaders: Barry deFreese <[email protected]>, Alexander Reichle-Schmehl <[email protected]> -Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libgtkmm-2.4-1c2a, libglademm-2.4-dev, libsdl-mixer1.2-dev, quilt, intltool, uuid-dev, libboost-dev, libtar-dev -Standards-Version: 3.9.1 -Homepage: http://www.lordsawar.com -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/lordsawar/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/lordsawar/?op=log - - -Package: lordsawar -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, lordsawar-data (= ${source:Version}) -Description: A clone of the popular SSG game Warlords II - A 2d turn-based strategy game where up to 8 players strive for control - of as many cities as possible. Produce new armies in cities to conquer - nearby cities. Using the income from those cities, make more armies to - take more cities. Send a hero to a temple to get a quest, or maybe search - a nearby ruin instead. Game should run well on modest hardware. - . - Play with others or against the computer. Network play is currently broken. - -Package: lordsawar-data -Recommends: lordsawar -Architecture: all -Depends: ${misc:Depends} -Description: A clone of the popular SSG game Warlords II - data files - A 2d turn-based strategy game where up to 8 players strive for control - of as many cities as possible. Produce new armies in cities to conquer - nearby cities. Using the income from those cities, make more armies to - take more cities. Send a hero to a temple to get a quest, or maybe search - a nearby ruin instead. Game should run well on modest hardware. - . - This package contains the games graphics and data files. Copied: packages/tags/lordsawar/0.2.0-2/debian/control (from rev 13127, packages/trunk/lordsawar/debian/control) =================================================================== --- packages/tags/lordsawar/0.2.0-2/debian/control (rev 0) +++ packages/tags/lordsawar/0.2.0-2/debian/control 2012-01-19 15:23:06 UTC (rev 13131) @@ -0,0 +1,36 @@ +Source: lordsawar +Section: games +Priority: extra +Maintainer: Debian Games Team <[email protected]> +Uploaders: Barry deFreese <[email protected]>, Alexander Reichle-Schmehl <[email protected]> +Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libgtkmm-2.4-1c2a, libglademm-2.4-dev, libsdl-mixer1.2-dev, quilt, intltool, uuid-dev, libboost-dev, libtar-dev +Standards-Version: 3.9.2 +Homepage: http://www.lordsawar.com +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/lordsawar/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/lordsawar/?op=log + + +Package: lordsawar +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, lordsawar-data (= ${source:Version}) +Description: Clone of the popular SSG game Warlords II + A 2d turn-based strategy game where up to 8 players strive for control + of as many cities as possible. Produce new armies in cities to conquer + nearby cities. Using the income from those cities, make more armies to + take more cities. Send a hero to a temple to get a quest, or maybe search + a nearby ruin instead. Game should run well on modest hardware. + . + Play with others or against the computer. Network play is currently broken. + +Package: lordsawar-data +Recommends: lordsawar +Architecture: all +Depends: ${misc:Depends} +Description: Clone of the popular SSG game Warlords II - data files + A 2d turn-based strategy game where up to 8 players strive for control + of as many cities as possible. Produce new armies in cities to conquer + nearby cities. Using the income from those cities, make more armies to + take more cities. Send a hero to a temple to get a quest, or maybe search + a nearby ruin instead. Game should run well on modest hardware. + . + This package contains the games graphics and data files. Deleted: packages/tags/lordsawar/0.2.0-2/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/tags/lordsawar/0.2.0-2/debian/patches/ftbfs_gcc-4.3_fix.diff 2012-01-19 15:23:06 UTC (rev 13131) @@ -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/tags/lordsawar/0.2.0-2/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/tags/lordsawar/0.2.0-2/debian/patches/ftbfs_gcc-4.3_fix2.diff 2012-01-19 15:23:06 UTC (rev 13131) @@ -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" Deleted: packages/tags/lordsawar/0.2.0-2/debian/rules =================================================================== --- packages/trunk/lordsawar/debian/rules 2012-01-19 11:49:19 UTC (rev 13123) +++ packages/tags/lordsawar/0.2.0-2/debian/rules 2012-01-19 15:23:06 UTC (rev 13131) @@ -1,99 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config.status: configure - dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr --bindir=\$${prefix}/games \ - --datadir=\$${prefix}/share/games \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - - [ ! -f Makefile ] || $(MAKE) distclean - rm -rf config.sub config.guess .pc build-stamp - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - #Remove French translation as it is garbage - rm -rf debian/tmp/usr/share/games/locale/fr - - dh_install --list-missing - -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installchangelogs -i ChangeLog - dh_installdocs -i - dh_installexamples -i - dh_link -i - dh_strip -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installchangelogs -a ChangeLog - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a - dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install Copied: packages/tags/lordsawar/0.2.0-2/debian/rules (from rev 13129, packages/trunk/lordsawar/debian/rules) =================================================================== --- packages/tags/lordsawar/0.2.0-2/debian/rules (rev 0) +++ packages/tags/lordsawar/0.2.0-2/debian/rules 2012-01-19 15:23:06 UTC (rev 13131) @@ -0,0 +1,99 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --bindir=\$${prefix}/games \ + --datadir=\$${prefix}/share/games \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: config.status + dh_testdir + + $(MAKE) + + touch $@ + +clean: + dh_testdir + dh_testroot + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + + [ ! -f Makefile ] || $(MAKE) distclean + rm -rf config.sub config.guess .pc build-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + #Remove French translation as it is garbage + rm -rf debian/tmp/usr/share/games/locale/fr + + dh_install --list-missing + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i ChangeLog + dh_installdocs -i + dh_installexamples -i + dh_link -i + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installchangelogs -a ChangeLog + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a + dh_installman -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
