[opencity] 75/91: Debian release 0.0.6.4stable-2
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Mar 25 12:23:06 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 b09751d773978740f9f7430fd4e8f7fa16a33235
Author: Markus Koschany <apo at gambaru.de>
Date: Fri Jan 3 13:21:22 2014 +0000
Debian release 0.0.6.4stable-2
---
debian/README.source | 13 --
debian/changelog | 50 +++++-
debian/clean | 1 +
debian/compat | 2 +-
debian/control | 30 ++--
debian/copyright | 169 ++++++++++++---------
debian/docs | 5 +
debian/manpage.sgml | 166 --------------------
debian/manpages | 1 +
debian/menu | 8 +-
debian/opencity-data.install | 5 +-
debian/opencity.6 | 42 +++++
debian/opencity.desktop | 5 +-
debian/opencity.install | 4 +-
debian/patches/gcc-4.7-fixes.patch | 24 +++
.../patches/remove-use-of-embedded-tinyxml.patch | 118 ++++++++------
debian/patches/series | 1 +
debian/rules | 138 +++--------------
debian/watch | 9 +-
19 files changed, 344 insertions(+), 447 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b74e8..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,13 +0,0 @@
-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 6339136..c020f0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opencity (0.0.6.4stable-2.1) UNRELEASED; urgency=low
+opencity (0.0.6.4stable-2) unstable; urgency=medium
[ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
@@ -6,7 +6,41 @@ opencity (0.0.6.4stable-2.1) UNRELEASED; urgency=low
[ Christoph Egger ]
* remove myself from uploaders
- -- Christoph Egger <christoph at debian.org> Tue, 24 Dec 2013 13:31:56 +0100
+ [ Markus Koschany ]
+ * Add myself to Uploaders.
+ * Thanks to Matej Vela for the last NMU.
+ * Bump compat level to 9 and require debhelper >= 9.
+ * debian/control:
+ - Declare compliance with Debian Policy 3.9.5.
+ - Drop docbook-to-man dependency and convert the man page to opencity.6
+ manually.
+ - Move imagemagick to Build-Depends-Indep.
+ - opencity-data: Remove obsolete Conflicts field.
+ - opencity-data: Change Recommends: opencity to Suggests.
+ * Add opencity.xpm to clean file.
+ * Add manpages file.
+ * Switch to dh sequencer and simplify debian/rules.
+ * Enable default hardening build flags. Pass CPPFLAGS to CXXFLAGS.
+ * Add an icon entry and longtitle to the menu file. (Closes: #726846)
+ * opencity.desktop: Add comments and GenericName in German. Add keywords.
+ * Update debian/copyright to copyright format 1.0.
+ - Add missing Expat and ZLib licenses.
+ * debian/watch: Make the extension regex more flexible.
+ * Install opencity.png to /usr/share/pixmaps.
+ * Add DEP-3 headers to all patches.
+ * Install documentation with docs file and remove duplicate files in
+ /usr/share/games/doc.
+ * Drop README.source. Source format 3.0 uses quilt by default.
+
+ -- Markus Koschany <apo at gambaru.de> Fri, 03 Jan 2014 14:08:48 +0100
+
+opencity (0.0.6.4stable-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * gcc-4.7-fixes: Fix build failure with GCC 4.7. Closes: #667310.
+ - src/tinyxpath/node_set.cpp: Include "../main.h" for HAVE_STDINT_H.
+
+ -- Matej Vela <vela at debian.org> Fri, 18 May 2012 15:19:25 +0100
opencity (0.0.6.4stable-1) unstable; urgency=low
@@ -42,7 +76,7 @@ opencity (0.0.6.1stable-5) unstable; urgency=low
* opencity-data conflicts with opencity (<< 0.0.5.1stable-2), thanks
Goswin Brederlow (Closes: #517669)
* Fix a typo in opencity-data description, thanks Enrico Zini and
- Steve Cotton (Closes: #517219)
+ Steve Cotton (Closes: #517219)
-- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 01 Mar 2009 16:04:31 +0100
@@ -54,13 +88,13 @@ opencity (0.0.6.1stable-4) unstable; urgency=low
[ Gonéri Le Bouder ]
* Drop a trailing whitespace in the Architecture: field of opencity-data,
- see #517555
+ see #517555
-- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 28 Feb 2009 17:07:16 +0100
opencity (0.0.6.1stable-3) unstable; urgency=low
- * Upload in unstable
+ * Upload in unstable
-- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 14 Feb 2009 15:08:29 +0100
@@ -85,7 +119,7 @@ opencity (0.0.6.1stable-1) experimental; urgency=low
* Clean debian/opencity.xpm
* use dh_clean to clean temp files
* upload to experimental because of Lenny freeze
- * Use the config.status target to install up to date config.{sub,guess}
+ * Use the config.status target to install up to date config.{sub,guess}
* opencity depends on opencity-data (= source:Upstream-Version) instead of
(>= source:Version)
* update the copyright section for the debian/* files
@@ -167,7 +201,7 @@ opencity (0.0.4stable-3) unstable; urgency=low
opencity (0.0.4stable-2) unstable; urgency=low
* datafiles in /usr/share/games/opencity (Closes: #405042)
- - add fix_homedir.diff to preinitialise this value
+ - add fix_homedir.diff to preinitialise this value
- use quilt to apply the patch
* add desktop and icon files
* add the patch from Martin Michlmayr to fix the build with gcc-4.3
@@ -183,7 +217,7 @@ opencity (0.0.4stable-1) unstable; urgency=low
* update of the copyright file (thanks Duong-Khang NGUYEN)
* minor clean up in rules file
* add libglu1-mesa-dev in builddeps
-
+
-- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 30 Nov 2006 16:06:21 +0100
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..7fc0a0d
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/opencity.xpm
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 6827d90..97a1bbc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,25 +3,30 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders:
-Build-Depends: debhelper (>= 5.0.0),
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
autotools-dev,
- libsdl1.2-dev,
- libsdl-mixer1.2-dev,
- libsdl-image1.2-dev,
- libsdl-net1.2-dev (>= 1.2.5-7),
- docbook-to-man,
+ debhelper (>= 9),
libglu1-mesa-dev,
- imagemagick,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-net1.2-dev,
+ libsdl1.2-dev,
libtinyxml-dev,
pkg-config
-Standards-Version: 3.9.2
+Build-Depends-Indep:
+ imagemagick
+Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/opencity/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/opencity/
Homepage: http://www.opencity.info/
Package: opencity
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, opencity-data (= ${source:Version})
+Depends:
+ opencity-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: 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
@@ -32,9 +37,10 @@ Description: 3D city simulator game
Package: opencity-data
Architecture: all
-Depends: ${misc:Depends}
-Conflicts: opencity (<< 0.0.5.1stable-2)
-Recommends: opencity
+Depends:
+ ${misc:Depends}
+Suggests:
+ opencity
Description: data for opencity, 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.
diff --git a/debian/copyright b/debian/copyright
index 337673a..6e4ad18 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,72 +1,97 @@
-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
-<pkg-games-devel at lists.alioth.debian.org>
-
-Upstream Authors:
- Duong-Khang NGUYEN <neoneurone at users sf net>
- Frédéric RODRIGO
-
- Minor parts are from Victor Stinner, Hongli Lai, Jeff Molofee, Sam Lantinga,
- Brodie Thiesfield, Angelo "Encelo" Theodorou, Yves Berquin, Lee Thomason
- and Tyge Løvset.
-
-Graphist
- Frédéric RODRIGO <f.rodrigo at free fr>
-
-Contributors
- Bartosz Debski
- Stephen M. Webb
-
-Quality Assurance
- Wolfgang Bauer
- Tymon DOUGLAS
- Bruno DLUBAK
-
-Contributors
- Stephen M. WEBB
- Victor STINNER
- Bartosz DEBSKI
- Nicolas PASCOLI
- "pucelo"
- Jacopo SIRIANNI
- Cristian Deluxe
-
-It was downloaded from http://www.opencity.info/
-
- Upstream Authors: Duong-Khang NGUYEN
-
- 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) 2006 Angelo "Encelo" THEODOROU
- Copyright (C) 2002-2004 Yves BERQUIN
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-The files under src/binreloc/ have been put in the public domain by
-Hongli Lai <h.lai at chello.nl>:
- This source code is public domain. You can relicense this code
- under whatever license you want.
-
-The Debian packaging is:
- (C) 2006-2009, Gonéri Le Bouder <goneri at rulezlan.org>
- (C) 2007, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-and is licensed under the GPL.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OpenCity
+Source: https://sourceforge.net/projects/opencity/
+
+Files: *
+Copyright: 2003-2008, Duong-Khang NGUYEN
+ 2003-2008, Frédéric RODRIGO
+ 2006-2007, Brodie THIESFIELD
+ 1999, Jeff Molofee
+ 2006, Angelo "Encelo" THEODOROU
+ 2002-2004, Yves BERQUIN
+License: GPL-2+
+Comment:
+ Please refer to the AUTHORS file for a complete list of contributors to
+ OpenCity.
+
+Files: src/binreloc/*
+Copyright: Hongli Lai <h.lai at chello.nl>
+License: public-domain
+ These files have been put in the public domain by Hongli Lai.
+
+Files: src/tinyxml/*
+Copyright: 2000-2007, Lee Thomason <leethomason at mindspring.com>
+ 2002-2004, Yves Berquin <yvesb at users.sourceforge.net>
+License: ZLib
+
+Files: src/tinyxpath/*
+Copyright: 2002-2004, Yves Berquin <yvesb at users.sourceforge.net>
+License: ZLib
+
+Files: debian/*
+Copyright: 2006-2009, Gonéri Le Bouder <goneri at rulezlan.org>
+ 2007, Cyril Brulebois <kibi at debian.org>
+ 2009-2011, Christoph Egger <christoph at debian.org>
+ 2014, Markus Koschany <apo at gambaru.de>
+License: GPL-2+
+
+License: ZLib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and
+ must not be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+
+Files: src/SimpleOpt.h
+Copyright: 2006-2007, Brodie Thiesfield
+License: Expat
+ Copyright (c) 2006-2007, Brodie Thiesfield
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is furnished
+ to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..44785f5
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,5 @@
+docs/FAQ_it.txt
+docs/FAQ.txt
+docs/INSTALL_it.txt
+docs/README_es.txt
+docs/README_it.txt
diff --git a/debian/manpage.sgml b/debian/manpage.sgml
deleted file mode 100644
index e0848d2..0000000
--- a/debian/manpage.sgml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
- less'. A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
- docbook-to-man $< > $@
-
-
- The docbook-to-man binary is found in the docbook-to-man package.
- Please remember that if you create the nroff version in one of the
- debian/rules file targets (such as build), you will need to include
- docbook-to-man in your Build-Depends control field.
-
- -->
-
- <!-- Fill in your name for FIRSTNAME and SURNAME. -->
- <!ENTITY dhfirstname "<firstname>Goneri</firstname>">
- <!ENTITY dhsurname "<surname>Le Bouder</surname>">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>mars 28, 2006</date>">
- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
- allowed: see man(7), man(1). -->
- <!ENTITY dhsection "<manvolnum>6</manvolnum>">
- <!ENTITY dhemail "<email>goneri at rulezlan.org</email>">
- <!ENTITY dhusername "Goneri Le Bouder">
- <!ENTITY dhucpackage "<refentrytitle>OPENCITY</refentrytitle>">
- <!ENTITY dhpackage "opencity">
-
- <!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY gnu "<acronym>GNU</acronym>">
- <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2006</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
-
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>a 3D city simulator game</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>&dhpackage;</command>
-
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para>This manual page documents briefly the
- <command>&dhpackage;</command> and <command>bar</command>
- commands.</para>
-
- <para>This manual page was written for the &debian; distribution
- because the original program does not have a manual page.
- </para>
-
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
-
- <para>These programs follow the usual &gnu; command line syntax,
- with long options starting with two dashes (`-'). A summary of
- options is included below. For a complete description, see the
- <application>Info</application> files.</para>
-
- <variablelist>
- <varlistentry>
- <term>
- <option>--help</option>
- </term>
- <listitem>
- <para>Show summary of options.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--no-dl</option>
- </term>
- <listitem>
- <para>Disable display list.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--gl-version</option>
- </term>
- <listitem>
- <para>Dispaly GL version in the console.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--homedir</option>
- </term>
- <listitem>
- <para>Change to another data directory.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--server</option>
- </term>
- <listitem>
- <para>launch opencity in server mode.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
- </refsect1>
- <refsect1>
- <title>AUTHOR</title>
-
- <para>This manual page was written by &dhusername; &dhemail; for
- the &debian; system (but may be used by others). Permission is
- granted to copy, distribute and/or modify this document under
- the terms of the &gnu; General Public License, Version 2 any
- later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
- </para>
-
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..c53ace2
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/opencity.6
diff --git a/debian/menu b/debian/menu
index f74a2d3..edd9833 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,6 @@
-?package(opencity):needs="X11" section="Games/Action"\
- title="opencity" command="/usr/games/opencity"
+?package(opencity):needs="X11" \
+ section="Games/Action" \
+ title="OpenCity" \
+ longtitle="OpenCity - 3D city simulator game" \
+ command="/usr/games/opencity" \
+ icon="/usr/share/pixmaps/opencity.xpm"
diff --git a/debian/opencity-data.install b/debian/opencity-data.install
index 7b80bd3..c8f39f9 100644
--- a/debian/opencity-data.install
+++ b/debian/opencity-data.install
@@ -1,2 +1,3 @@
-debian/tmp/usr/share/games
-debian/tmp/etc
+etc
+usr/share/games
+opencity.png usr/share/pixmaps
diff --git a/debian/opencity.6 b/debian/opencity.6
new file mode 100644
index 0000000..cddf1a5
--- /dev/null
+++ b/debian/opencity.6
@@ -0,0 +1,42 @@
+.TH "OPENCITY" "6"
+.SH "NAME"
+opencity \(em a 3D city simulator game
+.SH "SYNOPSIS"
+.PP
+\fBopencity\fR
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBopencity\fR and \fBbar\fR commands.
+.PP
+This manual page was written for the \fBDebian\fP distribution
+because the original program does not have a manual page.
+
+.SH "OPTIONS"
+.PP
+These programs follow the usual GNU command line syntax,
+with long options starting with two dashes (`\-'). A summary of
+options is included below. For a complete description, see the
+\fBInfo\fP files.
+.IP " \fB\-\-help\fP " 10
+Show summary of options.
+.IP " \fB\-\-no-dl\fP " 10
+Disable display list.
+.IP " \fB\-\-gl-version\fP " 10
+Dispaly GL version in the console.
+.IP " \fB\-\-homedir\fP " 10
+Change to another data directory.
+.IP " \fB\-\-server\fP " 10
+launch opencity in server mode.
+.SH "AUTHOR"
+.PP
+This manual page was written by Goneri Le Bouder goneri at rulezlan.org for
+the \fBDebian\fP system (but may be used by others). Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
+
diff --git a/debian/opencity.desktop b/debian/opencity.desktop
index 2882f22..ade61eb 100644
--- a/debian/opencity.desktop
+++ b/debian/opencity.desktop
@@ -2,10 +2,13 @@
Name=OpenCity
Comment=a 3D city simulator game
Comment[fr]=Un jeu de simulation de ville en 3D
+Comment[de]=Ein 3D-Spiel, in dem eine Stadt simuliert wird
Exec=opencity
Icon=opencity
Terminal=false
Type=Application
Categories=Game;StrategyGame;
GenericName=City simulator
-GenericName[fr]=Simulateur de ville
\ No newline at end of file
+GenericName[fr]=Simulateur de ville
+GenericName[de]=Stadtsimulator
+Keywords=simulator;strategy;city;buildings;plants;roads;industry;
diff --git a/debian/opencity.install b/debian/opencity.install
index d9f3f41..3b4e500 100644
--- a/debian/opencity.install
+++ b/debian/opencity.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/games
-debian/opencity.xpm usr/share/pixmaps/
debian/opencity.desktop usr/share/applications/
+debian/opencity.xpm usr/share/pixmaps/
+usr/games
diff --git a/debian/patches/gcc-4.7-fixes.patch b/debian/patches/gcc-4.7-fixes.patch
new file mode 100644
index 0000000..f52399c
--- /dev/null
+++ b/debian/patches/gcc-4.7-fixes.patch
@@ -0,0 +1,24 @@
+From: Matej Vela <vela at debian.org>
+Date: Thu, 2 Jan 2014 23:04:46 +0100
+Subject: gcc-4.7-fixes
+
+Fix build failure with GCC 4.7.
+src/tinyxpath/node_set.cpp: Include "../main.h" for HAVE_STDINT_H.
+
+Bug-Debian: http://bugs.debian.org/667310
+---
+ src/tinyxpath/node_set.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tinyxpath/node_set.cpp b/src/tinyxpath/node_set.cpp
+index 3e1b00d..93f8939 100644
+--- a/src/tinyxpath/node_set.cpp
++++ b/src/tinyxpath/node_set.cpp
+@@ -22,6 +22,7 @@ must not be misrepresented as being the original software.
+ distribution.
+ */
+
++#include "../main.h"
+ #include "node_set.h"
+ #ifdef HAVE_STDINT_H
+ #include "stdint.h" // for intptr_t (32/64 bits void* pointer compatibility)
diff --git a/debian/patches/remove-use-of-embedded-tinyxml.patch b/debian/patches/remove-use-of-embedded-tinyxml.patch
index 22513cb..03eab26 100644
--- a/debian/patches/remove-use-of-embedded-tinyxml.patch
+++ b/debian/patches/remove-use-of-embedded-tinyxml.patch
@@ -1,7 +1,23 @@
-diff -ur opencity-0.0.6.4stable/configure opencity-0.0.6.4stable.work/configure
---- opencity-0.0.6.4stable/configure 2011-07-03 19:14:48.000000000 +0200
-+++ opencity-0.0.6.4stable.work/configure 2011-09-02 19:45:54.253932007 +0200
-@@ -6194,8 +6194,6 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jan 2014 23:04:45 +0100
+Subject: remove-use-of-embedded-tinyxml
+
+---
+ configure | 3 ---
+ src/Makefile.in | 11 +++++------
+ src/tinyxpath/Makefile.in | 2 --
+ src/tinyxpath/node_set.cpp | 8 ++++----
+ src/tinyxpath/xpath_processor.cpp | 10 +++++-----
+ src/tinyxpath/xpath_stream.h | 1 -
+ src/zen.cpp | 2 +-
+ viewer/Makefile.in | 5 ++---
+ 8 files changed, 17 insertions(+), 25 deletions(-)
+
+diff --git a/configure b/configure
+index 233a971..43c44ad 100755
+--- a/configure
++++ b/configure
+@@ -6194,8 +6194,6 @@ ac_config_files="$ac_config_files src/simulator/Makefile"
ac_config_files="$ac_config_files src/structure/Makefile"
@@ -10,7 +26,7 @@ diff -ur opencity-0.0.6.4stable/configure opencity-0.0.6.4stable.work/configure
ac_config_files="$ac_config_files src/tinyxpath/Makefile"
ac_config_files="$ac_config_files src/triangulation/Makefile"
-@@ -6856,7 +6854,6 @@
+@@ -6856,7 +6854,6 @@ do
"src/pngfuncs/Makefile") CONFIG_FILES="$CONFIG_FILES src/pngfuncs/Makefile" ;;
"src/simulator/Makefile") CONFIG_FILES="$CONFIG_FILES src/simulator/Makefile" ;;
"src/structure/Makefile") CONFIG_FILES="$CONFIG_FILES src/structure/Makefile" ;;
@@ -18,10 +34,11 @@ diff -ur opencity-0.0.6.4stable/configure opencity-0.0.6.4stable.work/configure
"src/tinyxpath/Makefile") CONFIG_FILES="$CONFIG_FILES src/tinyxpath/Makefile" ;;
"src/triangulation/Makefile") CONFIG_FILES="$CONFIG_FILES src/triangulation/Makefile" ;;
"viewer/Makefile") CONFIG_FILES="$CONFIG_FILES viewer/Makefile" ;;
-diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/Makefile.in
---- opencity-0.0.6.4stable/src/Makefile.in 2011-07-03 19:14:47.000000000 +0200
-+++ opencity-0.0.6.4stable.work/src/Makefile.in 2011-09-02 19:18:19.921844387 +0200
-@@ -64,7 +64,7 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c593df3..76c4562 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -64,7 +64,7 @@ oczen_OBJECTS = $(am_oczen_OBJECTS)
oczen_DEPENDENCIES = binreloc/libbinreloc.a mapgen/libmapgen.a \
mas/libmas.a model/libmodel.a networking/libnet.a \
pngfuncs/libpngfuncs.a simulator/libsim.a \
@@ -30,7 +47,7 @@ diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/
tinyxpath/libtinyxpath.a triangulation/libtriangulation.a
am__opencity_SOURCES_DIST = audiomanager.cpp audiomanagersdl.cpp \
buildinglayer.cpp city.cpp conf.cpp destination.cpp \
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ opencity_OBJECTS = $(am_opencity_OBJECTS)
opencity_DEPENDENCIES = binreloc/libbinreloc.a mapgen/libmapgen.a \
mas/libmas.a model/libmodel.a networking/libnet.a \
pngfuncs/libpngfuncs.a simulator/libsim.a \
@@ -39,7 +56,7 @@ diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/
tinyxpath/libtinyxpath.a triangulation/libtriangulation.a
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -226,7 +226,7 @@
+@@ -226,7 +226,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -48,7 +65,7 @@ diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/
AM_CPPFLAGS = \
-I at top_srcdir@/src/ \
-I at top_srcdir@/src/binreloc/ \
-@@ -238,7 +238,6 @@
+@@ -238,7 +238,6 @@ AM_CPPFLAGS = \
-I at top_srcdir@/src/pngfuncs/ \
-I at top_srcdir@/src/simulator/ \
-I at top_srcdir@/src/structure/ \
@@ -56,7 +73,7 @@ diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/
-I at top_srcdir@/src/tinyxpath/ \
-I at top_srcdir@/src/triangulation/ \
-DDATADIR=\"@datadir@\" \
-@@ -257,7 +256,7 @@
+@@ -257,7 +256,7 @@ networking/libnet.a \
pngfuncs/libpngfuncs.a \
simulator/libsim.a \
structure/libstruct.a \
@@ -65,7 +82,7 @@ diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/
tinyxpath/libtinyxpath.a \
triangulation/libtriangulation.a
-@@ -342,7 +341,7 @@
+@@ -342,7 +341,7 @@ networking/libnet.a \
pngfuncs/libpngfuncs.a \
simulator/libsim.a \
structure/libstruct.a \
@@ -74,10 +91,11 @@ diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/
tinyxpath/libtinyxpath.a \
triangulation/libtriangulation.a
-diff -ur opencity-0.0.6.4stable/src/tinyxpath/Makefile.in opencity-0.0.6.4stable.work/src/tinyxpath/Makefile.in
---- opencity-0.0.6.4stable/src/tinyxpath/Makefile.in 2011-07-03 19:14:47.000000000 +0200
-+++ opencity-0.0.6.4stable.work/src/tinyxpath/Makefile.in 2011-09-02 19:34:36.870620447 +0200
-@@ -178,8 +178,6 @@
+diff --git a/src/tinyxpath/Makefile.in b/src/tinyxpath/Makefile.in
+index afed569..d379283 100644
+--- a/src/tinyxpath/Makefile.in
++++ b/src/tinyxpath/Makefile.in
+@@ -178,8 +178,6 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -86,10 +104,11 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/Makefile.in opencity-0.0.6.4stable
noinst_LIBRARIES = libtinyxpath.a
libtinyxpath_a_SOURCES = \
-diff -ur opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp opencity-0.0.6.4stable.work/src/tinyxpath/node_set.cpp
---- opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp 2011-07-03 18:36:33.000000000 +0200
-+++ opencity-0.0.6.4stable.work/src/tinyxpath/node_set.cpp 2011-09-02 19:39:08.579948777 +0200
-@@ -95,7 +95,7 @@
+diff --git a/src/tinyxpath/node_set.cpp b/src/tinyxpath/node_set.cpp
+index 1e4fa9c..3e1b00d 100644
+--- a/src/tinyxpath/node_set.cpp
++++ b/src/tinyxpath/node_set.cpp
+@@ -95,7 +95,7 @@ void node_set::v_copy_selected_node_recursive (
if ((! cp_lookup) || ! strcmp (XNp_root -> Value (), cp_lookup))
v_add_node_in_set (XNp_root);
@@ -98,7 +117,7 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp opencity-0.0.6.4stabl
{
XAp_attrib = XNp_root -> ToElement () -> FirstAttribute ();
while (XAp_attrib)
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ TIXML_STRING node_set::S_get_string_value () const
if (! op_attrib [u_node])
{
XNp_node = (const TiXmlNode *) vpp_node_set [u_node];
@@ -107,7 +126,7 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp opencity-0.0.6.4stabl
S_res += XNp_node -> Value ();
}
}
-@@ -211,7 +211,7 @@
+@@ -211,7 +211,7 @@ void node_set::v_add_all_foll_node (
XNp_ptr = XNp_ptr -> NextSiblingElement ();
}
XNp_ptr = XNp_node -> Parent ();
@@ -116,7 +135,7 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp opencity-0.0.6.4stabl
v_add_all_foll_node (XNp_ptr, S_name);
}
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ void node_set::v_add_all_prec_node (
XNp_ptr = XNp_node -> PreviousSibling ();
while (XNp_ptr)
{
@@ -125,10 +144,11 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp opencity-0.0.6.4stabl
{
v_add_node_in_set_if_name_or_star (XNp_ptr, S_name);
v_copy_node_children (XNp_ptr, cp_lookup);
-diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6.4stable.work/src/tinyxpath/xpath_processor.cpp
---- opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp 2011-07-03 18:36:33.000000000 +0200
-+++ opencity-0.0.6.4stable.work/src/tinyxpath/xpath_processor.cpp 2011-09-02 19:40:09.756247843 +0200
-@@ -49,7 +49,7 @@
+diff --git a/src/tinyxpath/xpath_processor.cpp b/src/tinyxpath/xpath_processor.cpp
+index c559c55..e8fa31f 100644
+--- a/src/tinyxpath/xpath_processor.cpp
++++ b/src/tinyxpath/xpath_processor.cpp
+@@ -49,7 +49,7 @@ public :
class TiXmlNodeManip : public TiXmlNode
{
public :
@@ -137,7 +157,7 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6
void v_reset (const TiXmlNode * XNp_parent, const TiXmlNode * XNp_next, const TiXmlNode * XNp_prev)
{
parent = (TiXmlNode *) XNp_parent;
-@@ -1196,7 +1196,7 @@
+@@ -1196,7 +1196,7 @@ void xpath_processor ::v_execute_step (
XNp_next = XEp_father -> PreviousSibling ();
while (XNp_next)
{
@@ -146,7 +166,7 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6
ns_target . v_add_node_in_set_if_name_or_star (XNp_next, S_name);
XNp_next = XNp_next -> PreviousSibling ();
}
-@@ -1229,7 +1229,7 @@
+@@ -1229,7 +1229,7 @@ void xpath_processor ::v_execute_step (
XNp_next = XEp_father -> FirstChild ();
while (XNp_next)
{
@@ -155,7 +175,7 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6
ns_target . v_add_node_in_set (XNp_next);
XNp_next = XNp_next -> NextSibling ();
}
-@@ -1238,7 +1238,7 @@
+@@ -1238,7 +1238,7 @@ void xpath_processor ::v_execute_step (
XNp_next = XEp_father -> FirstChild ();
while (XNp_next)
{
@@ -164,7 +184,7 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6
ns_target . v_add_node_in_set (XNp_next);
XNp_next = XNp_next -> NextSibling ();
}
-@@ -1728,7 +1728,7 @@
+@@ -1728,7 +1728,7 @@ void xpath_processor::v_function_text (
XNp_child = XEp_context -> FirstChild ();
while (XNp_child)
{
@@ -173,10 +193,11 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6
S_res += XNp_child -> Value ();
XNp_child = XNp_child -> NextSibling ();
}
-diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_stream.h opencity-0.0.6.4stable.work/src/tinyxpath/xpath_stream.h
---- opencity-0.0.6.4stable/src/tinyxpath/xpath_stream.h 2011-07-03 18:36:33.000000000 +0200
-+++ opencity-0.0.6.4stable.work/src/tinyxpath/xpath_stream.h 2011-09-02 19:48:56.646823680 +0200
-@@ -34,7 +34,6 @@
+diff --git a/src/tinyxpath/xpath_stream.h b/src/tinyxpath/xpath_stream.h
+index 46fb376..7fd10ef 100644
+--- a/src/tinyxpath/xpath_stream.h
++++ b/src/tinyxpath/xpath_stream.h
+@@ -34,7 +34,6 @@ distribution.
#include "byte_stream.h"
#include "xpath_syntax.h"
#include "tinyxml.h"
@@ -184,11 +205,11 @@ diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_stream.h opencity-0.0.6.4sta
namespace TinyXPath
{
-Only in opencity-0.0.6.4stable.work/src/tinyxpath: xpath_stream.h~
-diff -ur opencity-0.0.6.4stable/src/zen.cpp opencity-0.0.6.4stable.work/src/zen.cpp
---- opencity-0.0.6.4stable/src/zen.cpp 2011-07-03 18:36:34.000000000 +0200
-+++ opencity-0.0.6.4stable.work/src/zen.cpp 2011-09-02 19:47:20.726354749 +0200
-@@ -37,7 +37,7 @@
+diff --git a/src/zen.cpp b/src/zen.cpp
+index 8dfe42d..b0a26a2 100644
+--- a/src/zen.cpp
++++ b/src/zen.cpp
+@@ -37,7 +37,7 @@ extern GlobalVar gVars;
// Libraries headers
#include "SDL_image.h"
#include "binreloc.h" // BinReloc routines from AutoPackage
@@ -197,10 +218,11 @@ diff -ur opencity-0.0.6.4stable/src/zen.cpp opencity-0.0.6.4stable.work/src/zen.
#include "SimpleOpt.h" // Simple command line argument parser
// Standard headers
-diff -ur opencity-0.0.6.4stable/viewer/Makefile.in opencity-0.0.6.4stable.work/viewer/Makefile.in
---- opencity-0.0.6.4stable/viewer/Makefile.in 2011-07-03 19:14:47.000000000 +0200
-+++ opencity-0.0.6.4stable.work/viewer/Makefile.in 2011-09-02 19:31:26.905691759 +0200
-@@ -54,7 +54,7 @@
+diff --git a/viewer/Makefile.in b/viewer/Makefile.in
+index a66372d..e0d0b7e 100644
+--- a/viewer/Makefile.in
++++ b/viewer/Makefile.in
+@@ -54,7 +54,7 @@ viewer_OBJECTS = $(am_viewer_OBJECTS)
viewer_DEPENDENCIES = ../src/model/libmodel.a \
../src/pngfuncs/libpngfuncs.a ../src/structure/libstruct.a \
../src/triangulation/libtriangulation.a \
@@ -209,7 +231,7 @@ diff -ur opencity-0.0.6.4stable/viewer/Makefile.in opencity-0.0.6.4stable.work/v
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -185,7 +185,6 @@
+@@ -185,7 +185,6 @@ AM_CPPFLAGS = \
-I at top_srcdir@/src/networking/ \
-I at top_srcdir@/src/pngfuncs/ \
-I at top_srcdir@/src/structure/ \
@@ -217,7 +239,7 @@ diff -ur opencity-0.0.6.4stable/viewer/Makefile.in opencity-0.0.6.4stable.work/v
-I at top_srcdir@/src/tinyxpath/
viewer_LDADD = \
-@@ -193,7 +192,7 @@
+@@ -193,7 +192,7 @@ viewer_LDADD = \
../src/pngfuncs/libpngfuncs.a \
../src/structure/libstruct.a \
../src/triangulation/libtriangulation.a \
diff --git a/debian/patches/series b/debian/patches/series
index 843ddce..93fc85d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
remove-use-of-embedded-tinyxml.patch
+gcc-4.7-fixes.patch
diff --git a/debian/rules b/debian/rules
index c5e48ed..388215e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,114 +1,26 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-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
- [ ! -f Makefile ] || $(MAKE) distclean
-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
- # 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 --sysconfdir=/etc
-
-
-build-arch build-indep: build
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # 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
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean debian/opencity.xpm config.log \
- debian/opencity.6 config.sub config.guess config.status
- rm -rf .pc
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # 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 \
-# debian/opencity/usr/share/games/opencity/OpenCity.desktop
-# dh_install debian/opencity.desktop usr/share/applications
-# dh_install debian/opencity.xpm usr/share/pixmaps
-
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_install -i
- dh_installchangelogs -i ChangeLog
- dh_installdocs -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_install -a
- dh_installchangelogs -a ChangeLog
- dh_installdocs -a docs/FAQ_it.txt docs/FAQ.txt docs/INSTALL_it.txt docs/README_es.txt docs/README_it.txt
- dh_installmenu -a
- dh_installman -a debian/opencity.6
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
-
-get-orig-source:
- cd $(DEBIAN_DIR)/.. && uscan --force-download --repack
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS+=$(CPPFLAGS)
+
+%:
+ dh $@ --parallel --with autotools_dev
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --prefix=/usr \
+ --bindir=/usr/games \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --datadir=/usr/share/games \
+ --sysconfdir=/etc
+
+override_dh_auto_build-indep:
+ convert -monitor -resize 32x32 opencity.png debian/opencity.xpm
+
+override_dh_auto_install:
+ dh_auto_install
+ $(RM) -r \
+ $(CURDIR)/debian/tmp/usr/share/games/applications/ \
+ $(CURDIR)/debian/tmp/usr/share/games/pixmaps/ \
+ $(CURDIR)/debian/tmp/usr/share/games/doc/
diff --git a/debian/watch b/debian/watch
index 8dabf2b..a4484ce 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,3 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
-# Find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/opencity/opencity-([\d.]+stable)\.tar\.bz2
+opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
+http://sf.net/opencity/opencity-([\d.]+stable)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git
More information about the Pkg-games-commits
mailing list