r5501 - in packages/trunk/opencity/debian: . patches
Gonéri LE BOUDER
goneri-guest at alioth.debian.org
Thu Jan 24 21:16:23 UTC 2008
Author: goneri-guest
Date: 2008-01-24 21:16:22 +0000 (Thu, 24 Jan 2008)
New Revision: 5501
Removed:
packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff
packages/trunk/opencity/debian/patches/fix_homedir.diff
Modified:
packages/trunk/opencity/debian/changelog
packages/trunk/opencity/debian/control
packages/trunk/opencity/debian/opencity.desktop
packages/trunk/opencity/debian/patches/series
packages/trunk/opencity/debian/rules
Log:
* new upstream release (Closes: #462371)
+ --sysconfdir=/etc
+ use ./opencity.png instead of ./OpenCity.png
+ install the new doc
+ add no-pedantic.diff to turn of the pedantic mode
* remove:
+ fix_gcc-4.3.diff: merged with upstream
+ fix_homedir.diff: not needed anymore
* standard version 3.7.3, no change needed
* update debian/copyright
* remove the deprecated Encoding section from the desktop file
Modified: packages/trunk/opencity/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog 2008-01-24 15:47:29 UTC (rev 5500)
+++ packages/trunk/opencity/debian/changelog 2008-01-24 21:16:22 UTC (rev 5501)
@@ -1,3 +1,20 @@
+opencity (0.0.5.1stable-1) unstable; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * new upstream release (Closes: #462371)
+ + --sysconfdir=/etc
+ + use ./opencity.png instead of ./OpenCity.png
+ + install the new doc
+ + add no-pedantic.diff to turn of the pedantic mode
+ * remove:
+ + fix_gcc-4.3.diff: merged with upstream
+ + fix_homedir.diff: not needed anymore
+ * standard version 3.7.3, no change needed
+ * update debian/copyright
+ * remove the deprecated Encoding section from the desktop file
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 24 Jan 2008 21:42:56 +0100
+
opencity (0.0.4stable-3) unstable; urgency=low
[ Eddy Petrișor ]
Modified: packages/trunk/opencity/debian/control
===================================================================
--- packages/trunk/opencity/debian/control 2008-01-24 15:47:29 UTC (rev 5500)
+++ packages/trunk/opencity/debian/control 2008-01-24 21:16:22 UTC (rev 5501)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev,
libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev (>= 1.2.5-7),
docbook-to-man, libglu1-mesa-dev, quilt, imagemagick
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/opencity/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/opencity/?op=log
Modified: packages/trunk/opencity/debian/opencity.desktop
===================================================================
--- packages/trunk/opencity/debian/opencity.desktop 2008-01-24 15:47:29 UTC (rev 5500)
+++ packages/trunk/opencity/debian/opencity.desktop 2008-01-24 21:16:22 UTC (rev 5501)
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=OpenCity
-Encoding=UTF-8
Comment=a 3D city simulator game
Comment[fr]=Un jeu de simulation de ville en 3D
Exec=/usr/games/opencity
Deleted: packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff
===================================================================
--- packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff 2008-01-24 15:47:29 UTC (rev 5500)
+++ packages/trunk/opencity/debian/patches/fix_gcc-4.3.diff 2008-01-24 21:16:22 UTC (rev 5501)
@@ -1,117 +0,0 @@
-diff -ru opencity-0.0.4stable.orig/src/gui3dview.h opencity-0.0.4stable/src/gui3dview.h
---- opencity-0.0.4stable.orig/src/gui3dview.h 2006-10-08 10:48:23.000000000 +0000
-+++ opencity-0.0.4stable/src/gui3dview.h 2007-05-30 16:18:49.000000000 +0000
-@@ -28,8 +28,8 @@
- */
- class GUI3DView : public GUIMain {
- public:
-- GUI3DView() {};
-- virtual ~GUI3DView() {};
-+ GUI3DView() {}
-+ virtual ~GUI3DView() {}
-
- };
-
-diff -ru opencity-0.0.4stable.orig/src/guibutton.h opencity-0.0.4stable/src/guibutton.h
---- opencity-0.0.4stable.orig/src/guibutton.h 2006-10-08 10:48:23.000000000 +0000
-+++ opencity-0.0.4stable/src/guibutton.h 2007-05-30 16:18:49.000000000 +0000
-@@ -29,7 +29,7 @@
- */
- class GUIButton : public GUIMain {
- public:
-- GUIButton() {};
-+ GUIButton() {}
- GUIButton(
- const int & rciX,
- const int & rciY,
-diff -ru opencity-0.0.4stable.orig/src/mas/kernel.cpp opencity-0.0.4stable/src/mas/kernel.cpp
---- opencity-0.0.4stable.orig/src/mas/kernel.cpp 2006-10-08 10:48:10.000000000 +0000
-+++ opencity-0.0.4stable/src/mas/kernel.cpp 2007-05-30 16:18:49.000000000 +0000
-@@ -23,6 +23,7 @@
- #include "agent.h"
- #include "message.h"
-
-+#include <algorithm>
- #include <cassert>
- #include <iostream>
-
-diff -ru opencity-0.0.4stable.orig/src/networking/netnode.h opencity-0.0.4stable/src/networking/netnode.h
---- opencity-0.0.4stable.orig/src/networking/netnode.h 2006-10-08 10:47:51.000000000 +0000
-+++ opencity-0.0.4stable/src/networking/netnode.h 2007-05-30 16:18:49.000000000 +0000
-@@ -30,14 +30,14 @@
-
- class Netnode {
- public:
-- Netnode() {};
-- Netnode( IPaddress ipAdr, TCPsocket sock ):ip(ipAdr), socket(sock) {};
-+ Netnode() {}
-+ Netnode( IPaddress ipAdr, TCPsocket sock ):ip(ipAdr), socket(sock) {}
- bool operator==( const Netnode& rc ) {
- return ((this->ip.host == rc.ip.host) && (this->ip.port == rc.ip.port)
- && (this->socket == rc.socket));
-- };
-+ }
-
-- ~Netnode() {};
-+ ~Netnode() {}
-
- IPaddress ip;
- TCPsocket socket;
-diff -ru opencity-0.0.4stable.orig/src/pathfinder.cpp opencity-0.0.4stable/src/pathfinder.cpp
---- opencity-0.0.4stable.orig/src/pathfinder.cpp 2006-10-08 10:48:23.000000000 +0000
-+++ opencity-0.0.4stable/src/pathfinder.cpp 2007-05-30 16:18:49.000000000 +0000
-@@ -23,6 +23,8 @@
-
- #include "pathfinder.h"
-
-+#include <algorithm>
-+
- #define OC_PATHFINDER_MAX_LENGTH 0xFFFF0000
- #define OC_PATHFINDER_A_STAR 1 // use Dijkstra + A* algorithm
-
-diff -ru opencity-0.0.4stable.orig/src/simulator/electricitysim.cpp opencity-0.0.4stable/src/simulator/electricitysim.cpp
---- opencity-0.0.4stable.orig/src/simulator/electricitysim.cpp 2006-10-25 18:51:29.000000000 +0000
-+++ opencity-0.0.4stable/src/simulator/electricitysim.cpp 2007-05-30 16:18:49.000000000 +0000
-@@ -26,6 +26,8 @@
-
- #include "propertymanager.h"
-
-+#include <algorithm>
-+
-
- extern PropertyManager* gpPropertyMgr; // Global property manager
-
-diff -ru opencity-0.0.4stable.orig/src/simulator/simulator.h opencity-0.0.4stable/src/simulator/simulator.h
---- opencity-0.0.4stable.orig/src/simulator/simulator.h 2006-10-08 10:48:05.000000000 +0000
-+++ opencity-0.0.4stable/src/simulator/simulator.h 2007-05-30 16:18:49.000000000 +0000
-@@ -103,14 +103,14 @@
- const uint & w1,
- const uint & h1,
- const uint & w2,
-- const uint & h2 ) {};
-+ const uint & h2 ) {}
-
- virtual void
- RemoveStructure(
- const uint & w1,
- const uint & h1,
- const uint & w2,
-- const uint & h2 ) {};
-+ const uint & h2 ) {}
-
-
- void
-diff -ru opencity-0.0.4stable.orig/src/triangulation/triangulation.h opencity-0.0.4stable/src/triangulation/triangulation.h
---- opencity-0.0.4stable.orig/src/triangulation/triangulation.h 2006-10-08 10:48:10.000000000 +0000
-+++ opencity-0.0.4stable/src/triangulation/triangulation.h 2007-05-30 16:18:49.000000000 +0000
-@@ -34,8 +34,8 @@
- class Triangulation {
- public:
-
-- Triangulation() {};
-- virtual ~Triangulation() {};
-+ Triangulation() {}
-+ virtual ~Triangulation() {}
-
- //========================================================================
- /** Compute triangulation on vertex, return a Triangle[nVertex-2]
Deleted: packages/trunk/opencity/debian/patches/fix_homedir.diff
===================================================================
--- packages/trunk/opencity/debian/patches/fix_homedir.diff 2008-01-24 15:47:29 UTC (rev 5500)
+++ packages/trunk/opencity/debian/patches/fix_homedir.diff 2008-01-24 21:16:22 UTC (rev 5501)
@@ -1,13 +0,0 @@
-Index: opencity-0.0.4stable/src/main.cpp
-===================================================================
---- opencity-0.0.4stable.orig/src/main.cpp 2006-12-31 09:42:55.000000000 +0100
-+++ opencity-0.0.4stable/src/main.cpp 2006-12-31 09:49:13.000000000 +0100
-@@ -127,7 +127,7 @@
- static int flags = 0;
-
- /// Static so that the others can not access this
-- static string gsHomeDir = "";
-+ static string gsHomeDir = "/usr/share/games/opencity/";
- static string gsSaveDir = "";
-
-
Modified: packages/trunk/opencity/debian/patches/series
===================================================================
--- packages/trunk/opencity/debian/patches/series 2008-01-24 15:47:29 UTC (rev 5500)
+++ packages/trunk/opencity/debian/patches/series 2008-01-24 21:16:22 UTC (rev 5501)
@@ -1,2 +1 @@
-fix_homedir.diff
-fix_gcc-4.3.diff
+no-pedantic.diff
Modified: packages/trunk/opencity/debian/rules
===================================================================
--- packages/trunk/opencity/debian/rules 2008-01-24 15:47:29 UTC (rev 5500)
+++ packages/trunk/opencity/debian/rules 2008-01-24 21:16:22 UTC (rev 5501)
@@ -21,7 +21,7 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=/usr/share/games
+ CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=/usr/share/games --sysconfdir=/etc
build: build-stamp
@@ -32,7 +32,7 @@
# Add here commands to compile the package.
$(MAKE)
docbook-to-man debian/manpage.sgml > debian/opencity.6
- convert -geometry 32x32 ./OpenCity.png debian/opencity.xpm
+ convert -geometry 32x32 ./opencity.png debian/opencity.xpm
touch build-stamp
@@ -75,8 +75,7 @@
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
- dh_installdocs ./docs/FAQ.txt
- dh_installdocs ./docs/LEGGIMI.txt
+ dh_installdocs docs/FAQ_it.txt docs/FAQ.txt docs/INSTALL_it.txt docs/README_es.txt docs/README_it.txt
dh_installexamples
dh_installman debian/opencity.6
dh_desktop
More information about the Pkg-games-commits
mailing list