r3748 - in packages/trunk/lincity-ng/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-08-21 22:24:53 +0000 (Tue, 21 Aug 2007)
New Revision: 3748

Removed:
   packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff
   packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff
Modified:
   packages/trunk/lincity-ng/debian/changelog
   packages/trunk/lincity-ng/debian/patches/series
Log:
+  * new upstream release (Closes: #439034)
+   - remove patches merged in upstream: gcc-4.3.diff and
+     remove-Application-section-from-desktopfile.diff



Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog	2007-08-21 22:11:20 UTC (rev 3747)
+++ packages/trunk/lincity-ng/debian/changelog	2007-08-21 22:24:53 UTC (rev 3748)
@@ -1,3 +1,11 @@
+lincity-ng (1.1.1-1) unstable; urgency=low
+
+  * new upstream release (Closes: #439034)
+   - remove patches merged in upstream: gcc-4.3.diff and
+     remove-Application-section-from-desktopfile.diff
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Wed, 22 Aug 2007 00:09:56 +0200
+
 lincity-ng (1.1.0-2) unstable; urgency=low
 
   [ Gonéri Le Bouder ]

Deleted: packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff
===================================================================
--- packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff	2007-08-21 22:11:20 UTC (rev 3747)
+++ packages/trunk/lincity-ng/debian/patches/gcc-4.3.diff	2007-08-21 22:24:53 UTC (rev 3748)
@@ -1,116 +0,0 @@
-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;

Deleted: packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff
===================================================================
--- packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff	2007-08-21 22:11:20 UTC (rev 3747)
+++ packages/trunk/lincity-ng/debian/patches/remove-Application-section-from-desktopfile.diff	2007-08-21 22:24:53 UTC (rev 3748)
@@ -1,10 +0,0 @@
-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;

Modified: packages/trunk/lincity-ng/debian/patches/series
===================================================================
--- packages/trunk/lincity-ng/debian/patches/series	2007-08-21 22:11:20 UTC (rev 3747)
+++ packages/trunk/lincity-ng/debian/patches/series	2007-08-21 22:24:53 UTC (rev 3748)
@@ -1,2 +0,0 @@
-gcc-4.3.diff
-remove-Application-section-from-desktopfile.diff