r3684 - in packages/trunk/lincity-ng/debian: . patches
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Tue Aug 14 23:35:31 UTC 2007
Author: goneri-guest
Date: 2007-08-14 23:35:30 +0000 (Tue, 14 Aug 2007)
New Revision: 3684
Added:
packages/trunk/lincity-ng/debian/patches/
packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff
packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff
packages/trunk/lincity-ng/debian/patches/series
Modified:
packages/trunk/lincity-ng/debian/changelog
packages/trunk/lincity-ng/debian/control
packages/trunk/lincity-ng/debian/rules
Log:
+ [ Gonéri Le Bouder ]
+ * jam -q: exit the build process as soon as a file failes
+ * add patch gcc-4.3.diff (Closes: #417374)
+ - add quilt in the build-deps
+ * keeps the desktop file in lincity-ng package instead of lincity-ng-data
+ to avoid a lintian error
+ * add remove-Application-section-from-desktopfile.diff to remove
+ the wrong section "Application" from the desktop file
Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog 2007-08-14 23:10:21 UTC (rev 3683)
+++ packages/trunk/lincity-ng/debian/changelog 2007-08-14 23:35:30 UTC (rev 3684)
@@ -1,3 +1,16 @@
+lincity-ng (1.1.0-2) unstable; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * jam -q: exit the build process as soon as a file failes
+ * add patch gcc-4.3.diff (Closes: #417374)
+ - add quilt in the build-deps
+ * keeps the desktop file in lincity-ng package instead of lincity-ng-data
+ to avoid a lintian error
+ * add remove-Application-section-from-desktopfile.diff to remove
+ the wrong section "Application" from the desktop file
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Tue, 14 Aug 2007 23:43:40 +0000
+
lincity-ng (1.1.0-1) unstable; urgency=low
[ Eddy Petrișor ]
Modified: packages/trunk/lincity-ng/debian/control
===================================================================
--- packages/trunk/lincity-ng/debian/control 2007-08-14 23:10:21 UTC (rev 3683)
+++ packages/trunk/lincity-ng/debian/control 2007-08-14 23:35:30 UTC (rev 3684)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5), autotools-dev, jam, pkg-config, libsdl1.2-dev (>= 1.2.5), libsdl-mixer1.2-dev (>= 1.2), libsdl-image1.2-dev (>= 1.2), libsdl-ttf2.0-dev (>= 2.0), libphysfs-dev (>= 0.1.9), zlib1g-dev, libxml2-dev (>= 2.6.1), libsdl-gfx1.2-dev (>= 2.0.13)
+Build-Depends: debhelper (>= 5), autotools-dev, jam, pkg-config, libsdl1.2-dev (>= 1.2.5), libsdl-mixer1.2-dev (>= 1.2), libsdl-image1.2-dev (>= 1.2), libsdl-ttf2.0-dev (>= 2.0), libphysfs-dev (>= 0.1.9), zlib1g-dev, libxml2-dev (>= 2.6.1), libsdl-gfx1.2-dev (>= 2.0.13), quilt
Standards-Version: 3.7.2
Package: lincity-ng
Added: packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff
===================================================================
--- packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff 2007-08-14 23:35:30 UTC (rev 3684)
@@ -0,0 +1,116 @@
+Index: lincity-ng-1.1.0/src/lincity-ng/HelpWindow.cpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/lincity-ng/HelpWindow.cpp 2007-08-14 22:58:45.000000000 +0000
++++ lincity-ng-1.1.0/src/lincity-ng/HelpWindow.cpp 2007-08-14 22:58:57.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <sstream>
+ #include <stdexcept>
+ #include <iostream>
++#include <memory>
+ #include <physfs.h>
+ #include "tinygettext/gettext.hpp"
+ #include "gui/Component.hpp"
+Index: lincity-ng-1.1.0/src/lincity-ng/MainMenu.hpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/lincity-ng/MainMenu.hpp 2007-08-14 22:59:08.000000000 +0000
++++ lincity-ng-1.1.0/src/lincity-ng/MainMenu.hpp 2007-08-14 22:59:25.000000000 +0000
+@@ -20,6 +20,7 @@
+
+ #include "main.hpp"
+ #include "gui/Paragraph.hpp"
++#include <memory>
+
+ class Component;
+ class Desktop;
+Index: lincity-ng-1.1.0/src/tinygettext/TinyGetText.cpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/tinygettext/TinyGetText.cpp 2007-08-14 22:57:48.000000000 +0000
++++ lincity-ng-1.1.0/src/tinygettext/TinyGetText.cpp 2007-08-14 23:08:40.000000000 +0000
+@@ -23,6 +23,8 @@
+ #if defined (HAVE_DIRENT_H)
+ #include <dirent.h>
+ #endif
++#include <cstdlib>
++#include <string.h>
+ #include <fstream>
+ #include <iostream>
+ #include <ctype.h>
+Index: lincity-ng-1.1.0/src/lincity-ng/Config.cpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/lincity-ng/Config.cpp 2007-08-14 23:18:10.000000000 +0000
++++ lincity-ng-1.1.0/src/lincity-ng/Config.cpp 2007-08-14 23:18:25.000000000 +0000
+@@ -25,6 +25,9 @@
+ #include <assert.h>
+ #include <iostream>
+
++#include <cstdlib>
++#include <string.h>
++
+ Config* configPtr = 0;
+
+ Config *getConfig()
+Index: lincity-ng-1.1.0/src/lincity-ng/MiniMap.hpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/lincity-ng/MiniMap.hpp 2007-08-14 22:58:21.000000000 +0000
++++ lincity-ng-1.1.0/src/lincity-ng/MiniMap.hpp 2007-08-14 23:14:43.000000000 +0000
+@@ -24,6 +24,8 @@
+ #include "gui/Texture.hpp"
+ #include "MapPoint.hpp"
+
++#include <memory>
++
+ class XmlReader;
+ class Button;
+ class CheckButton;
+Index: lincity-ng-1.1.0/src/lincity-ng/Util.cpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/lincity-ng/Util.cpp 2007-08-14 23:15:30.000000000 +0000
++++ lincity-ng-1.1.0/src/lincity-ng/Util.cpp 2007-08-14 23:16:09.000000000 +0000
+@@ -21,6 +21,7 @@
+
+ #include <stdexcept>
+ #include <sstream>
++#include <typeinfo>
+
+ #include "gui/Button.hpp"
+ #include "gui/Component.hpp"
+Index: lincity-ng-1.1.0/src/lincity/ldsvguts.cpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/lincity/ldsvguts.cpp 2007-08-14 23:09:20.000000000 +0000
++++ lincity-ng-1.1.0/src/lincity/ldsvguts.cpp 2007-08-14 23:11:08.000000000 +0000
+@@ -32,6 +32,9 @@
+ #endif
+ #endif
+
++#include <cstdlib>
++#include <string.h>
++#include <math.h>
+ /*
+ #if defined (WIN32)
+ #include <winsock.h>
+Index: lincity-ng-1.1.0/src/lincity/modules/commune.cpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/lincity/modules/commune.cpp 2007-08-14 23:13:17.000000000 +0000
++++ lincity-ng-1.1.0/src/lincity/modules/commune.cpp 2007-08-14 23:13:52.000000000 +0000
+@@ -7,6 +7,8 @@
+
+ #include "modules.h"
+ #include "commune.h"
++#include <cstdlib>
++#include <math.h>
+
+ void
+ do_commune (int x, int y)
+Index: lincity-ng-1.1.0/src/tools/xmlgettext/main.cpp
+===================================================================
+--- lincity-ng-1.1.0.orig/src/tools/xmlgettext/main.cpp 2007-08-14 23:19:45.000000000 +0000
++++ lincity-ng-1.1.0/src/tools/xmlgettext/main.cpp 2007-08-14 23:21:18.000000000 +0000
+@@ -24,6 +24,8 @@
+ #include <iostream>
+ #include <string>
+ #include <fstream>
++#include <cstdlib>
++#include <string.h>
+
+ typedef std::map<std::string, std::vector<std::string> > Texts;
+ Texts texts;
Added: packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff
===================================================================
--- packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff 2007-08-14 23:35:30 UTC (rev 3684)
@@ -0,0 +1,10 @@
+Index: lincity-ng-1.1.0/lincity-ng.desktop
+===================================================================
+--- lincity-ng-1.1.0.orig/lincity-ng.desktop 2007-08-14 23:47:46.000000000 +0000
++++ lincity-ng-1.1.0/lincity-ng.desktop 2007-08-14 23:47:53.000000000 +0000
+@@ -10,4 +10,4 @@
+ Exec=lincity-ng
+ Terminal=false
+ StartupNotify=false
+-Categories=Application;Game;Simulation;
++Categories=Game;Simulation;
Added: packages/trunk/lincity-ng/debian/patches/series
===================================================================
--- packages/trunk/lincity-ng/debian/patches/series (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/series 2007-08-14 23:35:30 UTC (rev 3684)
@@ -0,0 +1,2 @@
+gcc-4.3.diff
+remove-Application-section-from-desktopfile.diff
Modified: packages/trunk/lincity-ng/debian/rules
===================================================================
--- packages/trunk/lincity-ng/debian/rules 2007-08-14 23:10:21 UTC (rev 3683)
+++ packages/trunk/lincity-ng/debian/rules 2007-08-14 23:35:30 UTC (rev 3684)
@@ -24,6 +24,7 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=\$${prefix}/share/man --prefix=/usr --bindir=\$${prefix}/games --datarootdir=\$${prefix}/share/games
@@ -34,7 +35,7 @@
dh_testdir
# Add here commands to compile the package.
- jam
+ jam -q
touch build-stamp
clean:
@@ -54,6 +55,7 @@
rm -f $(CURDIR)/debian/lincity-ng.6
dh_clean
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
install: build
dh_testdir
@@ -70,7 +72,6 @@
# Build a separate arch independant data package
mkdir -p $(CURDIR)/debian/lincity-ng-data/usr/share/games
- mv $(CURDIR)/debian/lincity-ng/usr/share/games/applications $(CURDIR)/debian/lincity-ng-data/usr/share/
mv $(CURDIR)/debian/lincity-ng/usr/share/games/lincity-ng $(CURDIR)/debian/lincity-ng-data/usr/share/games
mv $(CURDIR)/debian/lincity-ng/usr/share/games/pixmaps $(CURDIR)/debian/lincity-ng-data/usr/share/
More information about the Pkg-games-commits
mailing list