[opencity] 67/91: 0.0.6.2stable update, minor cleanup, drop upstream merged patch

Wed Mar 25 12:23:05 UTC 2015

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository opencity.

commit 448ff18bd6954aca3f3fdc188285b7a2ee192146
Author: Christoph Egger <christoph at debian.org>
Date:   Sun Dec 20 17:07:17 2009 +0000

    0.0.6.2stable update, minor cleanup, drop upstream merged patch
---
 debian/README.source            | 13 +++++++++++++
 debian/changelog                |  9 +++++++++
 debian/control                  | 13 +++++++------
 debian/copyright                |  4 ++--
 debian/opencity.desktop         |  2 ++
 debian/patches/gcc-4.4-fixes    | 36 ------------------------------------
 debian/patches/no-pedantic.diff | 11 -----------
 debian/patches/series           |  2 +-
 debian/rules                    |  3 +++
 9 files changed, 37 insertions(+), 56 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..18b74e8
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,13 @@
+Task: apply debian patches
+Tools: quilt
+Command: quilt push -a
+Description:
+  Please read /usr/share/doc/quilt/README.source how to use quilt for
+  managing Debian patches.
+  .
+  This might not be needed for there are not always patches. The steps
+  outlined above should always work nonetheless. If you want to see if
+  there are patches, check if there are files in debian/patches apart
+  from the one called «series»
+
+ -- Christoph Egger <christoph at akazieLX>, Sun, 20 Dec 2009 12:18:51 +0100
diff --git a/debian/changelog b/debian/changelog
index 86c4eb6..5aba339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+opencity (0.0.6.2stable-1) unstable; urgency=low
+
+  * New upstream Release
+  * Add myself to uploaders
+  * Drop patch »gcc-4.4-fixes« (applied upstream)
+  * Bump standards Version 3.8.0 -> 3.8.3 (no changes)
+
+ -- Christoph Egger <christoph at debian.org>  Sun, 20 Dec 2009 08:34:18 +0100
+
 opencity (0.0.6.1stable-5) unstable; urgency=low
 
   * opencity-data conflicts with opencity (<< 0.0.5.1stable-2), thanks
diff --git a/debian/control b/debian/control
index aba9e2d..5582446 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: opencity
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
+Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>,
+  Christoph Egger <christoph at debian.org>
 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.8.0
+ docbook-to-man, libglu1-mesa-dev, quilt, imagemagick, pkg-config
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/opencity/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/opencity/?op=log
 Homepage: http://www.opencity.info/
@@ -15,8 +16,8 @@ Package: opencity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, opencity-data (= ${source:Version})
 Description: a 3D city simulator game
- OpenCity is 3D city construction simulator. You can build some zones of 
- housing, trading and industry, electric plant and roads. Besides you can also 
+ OpenCity is 3D city construction simulator. You can build some zones of
+ housing, trading and industry, electric plant and roads. Besides you can also
  raise or lower the terrain.
  OpenCity is similar in spirit to other city construction games, heading
  towards a classic SimCity feeling, although with some additional features.
@@ -31,4 +32,4 @@ Description: data for opencity, a 3D city simulator game
  zones of housing, trading and industry, electric plant and roads.
  .
  This package contains the architecture-independent data for opencity. For more
- information, see the opencity package. 
+ information, see the opencity package.
diff --git a/debian/copyright b/debian/copyright
index 2fc3cec..337673a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Gonéri Le Bouder <goneri at rulezlan.org> on
 Tue, 28 Mar 2006 00:15:33 +0200.
 
-The current Debian maintainer is the Debian Games Team 
+The current Debian maintainer is the Debian Games Team
 <pkg-games-devel at lists.alioth.debian.org>
 
 Upstream Authors:
@@ -40,7 +40,7 @@ It was downloaded from http://www.opencity.info/
  Copyright (C) 2003-2008 Duong-Khang NGUYEN
  Copyright (C) 2003-2008 Frédéric RODRIGO
  Copyright (C) 2006-2007 Brodie THIESFIELD
- Copyright (C) 1999 Jeff Molofee 
+ Copyright (C) 1999 Jeff Molofee
  Copyright (C) 2006 Angelo "Encelo" THEODOROU
  Copyright (C) 2002-2004 Yves BERQUIN
 
diff --git a/debian/opencity.desktop b/debian/opencity.desktop
index 1d50d6f..2882f22 100644
--- a/debian/opencity.desktop
+++ b/debian/opencity.desktop
@@ -7,3 +7,5 @@ Icon=opencity
 Terminal=false
 Type=Application
 Categories=Game;StrategyGame;
+GenericName=City simulator
+GenericName[fr]=Simulateur de ville
\ No newline at end of file
diff --git a/debian/patches/gcc-4.4-fixes b/debian/patches/gcc-4.4-fixes
deleted file mode 100644
index 2b210a6..0000000
--- a/debian/patches/gcc-4.4-fixes
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: opencity-0.0.6stable/src/model/ac3dmaterial.cpp
-===================================================================
---- opencity-0.0.6stable.orig/src/model/ac3dmaterial.cpp	2008-12-23 18:12:54.000000000 +0000
-+++ opencity-0.0.6stable/src/model/ac3dmaterial.cpp	2008-12-23 18:13:06.000000000 +0000
-@@ -22,6 +22,7 @@
- #include "macros.h"				// for debugging macros
- #include "ac3dmacros.h"
- 
-+#include <cstdio>
- #include <sstream>
- 
- using std::stringstream;
-Index: opencity-0.0.6stable/src/model/ac3dobject.cpp
-===================================================================
---- opencity-0.0.6stable.orig/src/model/ac3dobject.cpp	2008-12-23 18:12:34.000000000 +0000
-+++ opencity-0.0.6stable/src/model/ac3dobject.cpp	2008-12-23 18:12:45.000000000 +0000
-@@ -23,6 +23,7 @@
- #include "ac3dmacros.h"			// AC3D specific macros
- 
- #include <cstring>
-+#include <cstdio>
- #include <cstdlib>
- 
- 
-Index: opencity-0.0.6stable/src/model/ac3dsurface.cpp
-===================================================================
---- opencity-0.0.6stable.orig/src/model/ac3dsurface.cpp	2008-12-23 18:13:14.000000000 +0000
-+++ opencity-0.0.6stable/src/model/ac3dsurface.cpp	2008-12-23 18:13:26.000000000 +0000
-@@ -22,6 +22,7 @@
- #include "macros.h"		// debug macros
- #include "ac3dmacros.h"
- 
-+#include <cstdio>
- #include <cstring>
- 
- namespace AC3D {
diff --git a/debian/patches/no-pedantic.diff b/debian/patches/no-pedantic.diff
deleted file mode 100644
index da617f4..0000000
--- a/debian/patches/no-pedantic.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -4914,7 +4914,7 @@
- fi;
- 
- 
--CXXFLAGS="-Wall -Wmissing-braces -Wparentheses -ansi -pedantic-errors $CXXFLAGS"
-+CXXFLAGS="-Wall -Wmissing-braces -Wparentheses -ansi $CXXFLAGS"
- 
- CXXFLAGS="-I$with_gl_prefix/include $enable_gprof $enable_debug $CXXFLAGS"
- 
diff --git a/debian/patches/series b/debian/patches/series
index e901c11..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-gcc-4.4-fixes
+
diff --git a/debian/rules b/debian/rules
index 8a440be..c3c960f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,9 @@ install: build
 	# Add here commands to install the package into debian/opencity.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	mv debian/tmp/usr/bin debian/tmp/usr/games
+
+	rm -rf $(CURDIR)/debian/tmp/usr/share/games/applications/ $(CURDIR)/debian/tmp/usr/share/games/pixmaps/
+
 #	rm -rf debian/opencity/usr/share/games/opencity/docs \
 #	  debian/opencity/usr/share/games/opencity/autopackage \
 #	  debian/opencity/usr/share/games/opencity/OpenCity.png \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git

