r13973 - in packages/trunk/lincity-ng/debian: . patches source

Markus Koschany apo-guest at alioth.debian.org
Thu Mar 7 22:03:31 UTC 2013


Author: apo-guest
Date: 2013-03-07 22:03:30 +0000 (Thu, 07 Mar 2013)
New Revision: 13973

Added:
   packages/trunk/lincity-ng/debian/lincity-ng-data.install
   packages/trunk/lincity-ng/debian/lincity-ng-data.links
   packages/trunk/lincity-ng/debian/lincity-ng.install
   packages/trunk/lincity-ng/debian/manpages
   packages/trunk/lincity-ng/debian/menu
   packages/trunk/lincity-ng/debian/patches/create-valid-desktop-file.patch
   packages/trunk/lincity-ng/debian/patches/failback-to-800x600.patch
   packages/trunk/lincity-ng/debian/patches/fix-format-not-a-string-literal-error.patch
   packages/trunk/lincity-ng/debian/patches/fix-hyphen-is-used-as-minus-sign.patch
   packages/trunk/lincity-ng/debian/patches/fix-out-of-boundary-crash.patch
   packages/trunk/lincity-ng/debian/source/
   packages/trunk/lincity-ng/debian/source/format
Removed:
   packages/trunk/lincity-ng/debian/README.Debian
   packages/trunk/lincity-ng/debian/lincity-ng.menu
   packages/trunk/lincity-ng/debian/patches/failback-to-800x600.diff
Modified:
   packages/trunk/lincity-ng/debian/changelog
   packages/trunk/lincity-ng/debian/compat
   packages/trunk/lincity-ng/debian/control
   packages/trunk/lincity-ng/debian/copyright
   packages/trunk/lincity-ng/debian/docs
   packages/trunk/lincity-ng/debian/patches/series
   packages/trunk/lincity-ng/debian/rules
   packages/trunk/lincity-ng/debian/watch
Log:
Debian release 2.0-4

- Switch to package format 3.0 (quilt)
- Hardening support
- compat 9, debhelper 9
- New patches
  fix-out-of-boundary-crash
  fix-format-not-a-string-literal-error
  fix-hyphen-is-used-as-minus-sign
  create-valid-desktop-file
- Lintian clean
- debian/rules use dh sequencer



Deleted: packages/trunk/lincity-ng/debian/README.Debian
===================================================================
--- packages/trunk/lincity-ng/debian/README.Debian	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/README.Debian	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1,29 +0,0 @@
-lincity-ng for Debian
----------------------
-
-If you use a graphics adapter without accelerated GL support try running
-lincity-ng with the -sdl switch.
-
-The developers are seeking feedback for a final 1.0 release. If you want
-to help send suggestions to lincity-ng-devel at lists.berlios.de:
-
-> Well some things we're interested in:
-> * We're always interested in gameplay and usability experiences.
-> Statements like "I had big problems finding out that the harbour needs 4
-> water tiles on it's right" or "it would be helpful to have price
-> information in the tooltips for the buildings" are very helpful to let
-> us judge where we have to tweak to make the game more enjoyable by
-> people. Noone will think you're stupid because you couldn't understand
-> our arcane user interface ;-)
-> * Attracting people to translate the application
-> * Attracting new developers we could esp. need more help in the 3d
-> graphics area.
-> * We're also interested in proposals for new game features or rules. But
-> for now these will have low priority as these would need changes in the
-> game rules which we left pretty untouched. We know there are lots of
-> strange and artificial game rules that should be changed, but this needs
-> to be done very carefully to not introduce new artificial effects or
-> lower the fun of the gameplay.
-
- -- Moritz Muehlenhoff <jmm at inutil.org>, Wed,  8 Jun 2005 23:04:56 +0200
-

Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/changelog	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1,25 +1,71 @@
-lincity-ng (2.0-3) UNRELEASED; urgency=low
+lincity-ng (2.0-4) unstable; urgency=low
 
+  * Add -f-switch to rm command when removing the font files in debian/rules.
+    Prevents FTBFS on buildd.
+
+ -- Markus Koschany <apo at gambaru.de>  Thu, 07 Mar 2013 18:41:28 +0100
+
+lincity-ng (2.0-3) unstable; urgency=low
+
+  [ Markus Koschany ]
+  * Add myself to Uploaders.
+  * Switch to package format 3.0 (quilt).
+  * Bump compat level to 9 and require debhelper >= 9.
+  * debian/control:
+    - Bump Standards-Version to 3.9.4, no changes needed.
+    - Drop quilt dependency. Package format 3.0 uses quilt by default.
+    - Do not use versioned dependencies. They are not necessary anymore.
+    - Add ${misc:Depends} to binary packages.
+    - lincity-ng-data: Suggest lincity-ng.
+    - Update to use canonical Vcs-fields. Fix broken Vcs-Browser link.
+    - Change Conflicts to Breaks and Replaces relation which allows the dpkg
+      package management system to find the best upgrade path more freely.
+  * debian/rules:
+    - Use dh sequencer to simplify debian/rules.
+    - Build with --parallel and --autotools_dev addon.
+    - Install RELNOTES as upstream changelog. Do not install it via docs file.
+    - Build with hardening=+all.
+  * Update debian/copyright to copyright format 1.0.
+  * Install doc/lincity-ng.6 via manpages files.
+  * Install arch-dependent files with lincity-ng.install and arch-independent
+    files with lincity-ng-data.install.
+  * Drop README.Debian. The information presented in this README file is
+    outdated. (Closes: #638667)
+  * New patches:
+    - create-valid-desktop-file.patch: Remove deprecated UTF-8 Encoding key.
+      Fix a typo and use the icon name without file extension. Add keywords.
+      (LP: #674519)
+    - Add fix-format-is-not-a-string-literal-error.patch to prevent a FTBFS.
+    - fix-hyphen-is-used-as-minus-sign.patch: Creates a 100% valid manpage.
+    - fix-out-of-boundary-crash.patch: The game can crash in rare cicumstances
+      if you zoom out as far as possible and select the bulldozer tool. This
+      patch fixes the issue. Thanks to Alain Baeckeroot for the report and
+      patch. (Closes: #604172)
+    - Add dep3 headers to all patches.
+  * Symlink only sans.ttf, the other two fonts were removed by upstream.
+
+  [ Gonéri Le Bouder ]
+  * Remove myself from Uploaders.
+
   [ Cyril Brulebois ]
   * Update my mail address.
 
   [ Bruno "Fuddl" Kleinert ]
-  * Fix typo in lincity-ng-data package description. "This packages" -> "This
-    package" (Closes: #557683)
+  * Fix typo in lincity-ng-data package description. (Closes: #557683)
 
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Tue, 24 Nov 2009 18:19:55 +0100
+ -- Markus Koschany <apo at gambaru.de>  Thu, 07 Mar 2013 16:37:16 +0100
 
 lincity-ng (2.0-2) unstable; urgency=low
 
-  * Upload to unstable 
+  * Upload to unstable
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Sat, 14 Feb 2009 15:12:24 +0100
 
 lincity-ng (2.0-1) experimental; urgency=low
 
-  * New upstream release 
+  * New upstream release
   * Update debian/copyright
-  * Standard version: 3.8.0, no change 
+  * Standard version: 3.8.0, no change
   * Add failback-to-800x600.diff to be able to launch the game
     even if the screen doesn't accept 1024x768
 
@@ -94,7 +140,7 @@
   * Add myself in Uploaders:
   * copy config.{sub,guess} from autotools-dev during the configure
   * lincity depends on lincity-ng-data (= ${source:Version}) instead of
-    (>= 0.9rc1) to avoid unexpected error 
+    (>= 0.9rc1) to avoid unexpected error
   * add icon description in Debian menu. Thanks Mark Purcell (Closes: #407359)
   * game data in /usr/share/games
 

Modified: packages/trunk/lincity-ng/debian/compat
===================================================================
--- packages/trunk/lincity-ng/debian/compat	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/compat	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/lincity-ng/debian/control
===================================================================
--- packages/trunk/lincity-ng/debian/control	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/control	2013-03-07 22:03:30 UTC (rev 13973)
@@ -2,17 +2,35 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Cyril Brulebois <kibi at debian.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), quilt, imagemagick
-Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/lincity-ng/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/lincity-ng/?op=log
+Uploaders: Cyril Brulebois <kibi at debian.org>, Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ imagemagick,
+ jam,
+ libphysfs-dev,
+ libsdl-gfx1.2-dev,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-ttf2.0-dev,
+ libsdl1.2-dev,
+ libxml2-dev,
+ pkg-config,
+ zlib1g-dev
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/lincity-ng/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/lincity-ng/
 Homepage: http://lincity-ng.berlios.de/
 
 Package: lincity-ng
 Architecture: any
-Depends: ${shlibs:Depends}, lincity-ng-data (= ${source:Version}), ttf-dejavu
-Conflicts: lincity-ng-data (<< 1.1.1)
+Depends:
+ lincity-ng-data (= ${source:Version}),
+ ttf-dejavu,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: lincity-ng-data (<< 1.1.1)
+Replaces: lincity-ng-data (<< 1.1.1)
 Description: City simulator game with polished graphics
  LinCity-NG is a City Simulation Game. It is a polished and improved
  version of the old LinCity game:
@@ -27,6 +45,8 @@
 
 Package: lincity-ng-data
 Architecture: all
+Depends: ${misc:Depends}
+Suggests: lincity-ng
 Description: Media files for the city simulator game LinCity-NG
  LinCity-NG is a City Simulation Game. It is a polished and improved
  version of the old LinCity game:

Modified: packages/trunk/lincity-ng/debian/copyright
===================================================================
--- packages/trunk/lincity-ng/debian/copyright	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/copyright	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1,164 +1,180 @@
-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
-(at your option) any later version.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: LinCityNG
+Source: http://lincity-ng.berlios.de
 
-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.
+Files: *
+Copyright: 1995-1997, I J Peters
+           1997-2002, Greg Sharp
+           2000-2004, Corey Keasling
+           2004,      Ingo Ruhnke <grumbel at gmx.de>
+           2005,      David Kamphausen <david.kamphausen at web.de>
+           2005,      Jimmy Salmon
+           2005-2007, Wolfgang Becker <uafr at gmx.de>
+           2004-2008, Matthias Braun <matze at braunis.de>
+           2008,      Xabier Cancela
+License: GPL-2+
+Comment:
+ The models, SVG images and sound effects are dual-licensed under the GNU
+ General Public and the "Creative Commons Attribution Sharealike v2" license.
+ This Debian package makes use of the GPL. Please refer to the CREDITS file for
+ more information about contributors to LinCityNG.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-Boston, MA 02110-1301, USA.
+Files: src/tinygettext/findlocale.*
+License: MIT
+Copyright: 2004, Adam D. Moss
 
-On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+Files: data/fonts/*.ttf
+Copyright: 2003, Bitstream, Inc
+           2006, Tavmjong Bah
+License: Bitstream-Vera-Fonts-Copyright and Arev-Fonts-Copyright
+Comment:
+ Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+ Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below).
 
-getopt.c is covered under a different, yet GPL compatible license:
- * This module contains code made available by IBM
- * Corporation on an AS IS basis.  Any one receiving the
- * module is considered to be licensed under IBM copyrights
- * to use the IBM-provided source code in any way he or she
- * deems fit, including copying it, compiling it, modifying
- * it, and redistributing it, with or without
- * modifications.  No license under any IBM patents or
- * patent applications is to be implied from this copyright
- * license.
- *
- * A user of the module should understand that IBM cannot
- * provide technical support for the module and will not be
- * responsible for any consequences of use of the program.
- *
- * Any notices, including this one, are not to be removed
- * from the module without the prior written consent of
- * IBM.
+Files: debian/*
+Copyright: 2005-2006, Moritz Muehlenhoff <jmm at debian.org>
+           2006,      Martin Michlmayr <tbm at cyrius.com>
+           2006,      Steinar H. Gunderson <sesse at debian.org>
+           2006-2007, Cyril Brulebois <kibi at debian.org>
+           2007-2009, Gonéri Le Bouder <goneri at rulezlan.org>
+           2013,      Markus Koschany <apo at gambaru.de>
+License: GPL-2+
 
-prefix.cpp and prefix.h are licensed as "public domain":
- * This source code is public domain. You can relicense this code
- * under whatever license you want.
+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
+ (at your option) 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
+ 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 models, SVG images and sound effects are dual-licensed under
-the GNU General Public and the "Creative Commons Attribution
-Sharealike v2" license. This Debian packages makes use of the GPL.
+License: MIT
+ 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 fur-
+ nished 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, FIT-
+ NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+ NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the Author of the
+ Software shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in this Software without prior written authorization
+ from the Author.
 
-Copyright holders:
-copyright 2004-2008 Matthias Braun <matze at braunis.de>
-copyright 2005      David Kamphausen <david.kamphausen at web.de>
-copyright 2005-2007 Wolfgang Becker <uafr at gmx.de>
-copyright 2005      Jimmy Salmon 
-copyright 2004      Ingo Ruhnke <grumbel at gmx.de>
-copyright 1995-1997 I J Peters
-copyright 1997-2002 Greg Sharp
-copyright 2000-2004 Corey Keasling
-copyright 2005-2008 THE lincity-ng'S COPYRIGHT HOLDER
-copyright 2008 Xabier Cancela
+License: Bitstream-Vera-Fonts-Copyright
+ Bitstream Vera Fonts Copyright
+ ------------------------------
+ .
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+ a trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute the
+ Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright and trademark notices and this permission notice shall
+ be included in all copies of one or more of the Font Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in particular
+ the designs of glyphs or characters in the Fonts may be modified and
+ additional glyphs or characters may be added to the Fonts, only if the fonts
+ are renamed to names not containing either the words "Bitstream" or the word
+ "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream
+ Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but no
+ copy of one or more of the Font Software typefaces may be sold by itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+ FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+ FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font Software
+ without prior written authorization from the Gnome Foundation or Bitstream
+ Inc., respectively. For further information, contact: fonts at gnome dot
+ org.
 
-data/fonts/*.ttf
-  Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-  Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below)
-  
-  Bitstream Vera Fonts Copyright
-  ------------------------------
-  
-  Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-  a trademark of Bitstream, Inc.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of the fonts accompanying this license ("Fonts") and associated
-  documentation files (the "Font Software"), to reproduce and distribute the
-  Font Software, including without limitation the rights to use, copy, merge,
-  publish, distribute, and/or sell copies of the Font Software, and to permit
-  persons to whom the Font Software is furnished to do so, subject to the
-  following conditions:
-  
-  The above copyright and trademark notices and this permission notice shall
-  be included in all copies of one or more of the Font Software typefaces.
-  
-  The Font Software may be modified, altered, or added to, and in particular
-  the designs of glyphs or characters in the Fonts may be modified and
-  additional glyphs or characters may be added to the Fonts, only if the fonts
-  are renamed to names not containing either the words "Bitstream" or the word
-  "Vera".
-  
-  This License becomes null and void to the extent applicable to Fonts or Font
-  Software that has been modified and is distributed under the "Bitstream
-  Vera" names.
-  
-  The Font Software may be sold as part of a larger software package but no
-  copy of one or more of the Font Software typefaces may be sold by itself.
-  
-  THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-  TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-  FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-  ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-  THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-  FONT SOFTWARE.
-  
-  Except as contained in this notice, the names of Gnome, the Gnome
-  Foundation, and Bitstream Inc., shall not be used in advertising or
-  otherwise to promote the sale, use or other dealings in this Font Software
-  without prior written authorization from the Gnome Foundation or Bitstream
-  Inc., respectively. For further information, contact: fonts at gnome dot
-  org. 
-  
-  Arev Fonts Copyright
-  ------------------------------
-  
-  Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-  
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of the fonts accompanying this license ("Fonts") and
-  associated documentation files (the "Font Software"), to reproduce
-  and distribute the modifications to the Bitstream Vera Font Software,
-  including without limitation the rights to use, copy, merge, publish,
-  distribute, and/or sell copies of the Font Software, and to permit
-  persons to whom the Font Software is furnished to do so, subject to
-  the following conditions:
-  
-  The above copyright and trademark notices and this permission notice
-  shall be included in all copies of one or more of the Font Software
-  typefaces.
-  
-  The Font Software may be modified, altered, or added to, and in
-  particular the designs of glyphs or characters in the Fonts may be
-  modified and additional glyphs or characters may be added to the
-  Fonts, only if the fonts are renamed to names not containing either
-  the words "Tavmjong Bah" or the word "Arev".
-  
-  This License becomes null and void to the extent applicable to Fonts
-  or Font Software that has been modified and is distributed under the 
-  "Tavmjong Bah Arev" names.
-  
-  The Font Software may be sold as part of a larger software package but
-  no copy of one or more of the Font Software typefaces may be sold by
-  itself.
-  
-  THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-  OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-  TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-  DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-  OTHER DEALINGS IN THE FONT SOFTWARE.
-  
-  Except as contained in this notice, the name of Tavmjong Bah shall not
-  be used in advertising or otherwise to promote the sale, use or other
-  dealings in this Font Software without prior written authorization
-  from Tavmjong Bah. For further information, contact: tavmjong @ free
-  . fr.
-
-
-Lincity-ng was downloaded from http://lincity-ng.berlios.de
-
-Lincity-ng was debianized by Moritz Muehlenhoff <jmm at inutil.org>, all
-Debian packaging stuff is covered under the GNU General Public License.
-
-It was taken over by the Debian Games Team in August 2006, under the
-same license.
+License: Arev-Fonts-Copyright
+ Arev Fonts Copyright
+ ------------------------------
+ .
+ Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the fonts accompanying this license ("Fonts") and
+ associated documentation files (the "Font Software"), to reproduce
+ and distribute the modifications to the Bitstream Vera Font Software,
+ including without limitation the rights to use, copy, merge, publish,
+ distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright and trademark notices and this permission notice
+ shall be included in all copies of one or more of the Font Software
+ typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in
+ particular the designs of glyphs or characters in the Fonts may be
+ modified and additional glyphs or characters may be added to the
+ Fonts, only if the fonts are renamed to names not containing either
+ the words "Tavmjong Bah" or the word "Arev".
+ .
+ This License becomes null and void to the extent applicable to Fonts
+ or Font Software that has been modified and is distributed under the
+ "Tavmjong Bah Arev" names.
+ .
+ The Font Software may be sold as part of a larger software package but
+ no copy of one or more of the Font Software typefaces may be sold by
+ itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+ TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
+ .
+ Except as contained in this notice, the name of Tavmjong Bah shall not
+ be used in advertising or otherwise to promote the sale, use or other
+ dealings in this Font Software without prior written authorization
+ from Tavmjong Bah. For further information, contact: tavmjong @ free
+ . fr.

Modified: packages/trunk/lincity-ng/debian/docs
===================================================================
--- packages/trunk/lincity-ng/debian/docs	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/docs	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1,4 +1,3 @@
 README
 TODO
-RELNOTES
 

Added: packages/trunk/lincity-ng/debian/lincity-ng-data.install
===================================================================
--- packages/trunk/lincity-ng/debian/lincity-ng-data.install	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/lincity-ng-data.install	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1 @@
+usr/share/games/lincity-ng

Added: packages/trunk/lincity-ng/debian/lincity-ng-data.links
===================================================================
--- packages/trunk/lincity-ng/debian/lincity-ng-data.links	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/lincity-ng-data.links	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,2 @@
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/lincity-ng/fonts/sans.ttf
+

Added: packages/trunk/lincity-ng/debian/lincity-ng.install
===================================================================
--- packages/trunk/lincity-ng/debian/lincity-ng.install	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/lincity-ng.install	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,3 @@
+usr/games/lincity-ng
+usr/share/games/applications        usr/share
+usr/share/games/pixmaps             usr/share

Deleted: packages/trunk/lincity-ng/debian/lincity-ng.menu
===================================================================
--- packages/trunk/lincity-ng/debian/lincity-ng.menu	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/lincity-ng.menu	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1,3 +0,0 @@
-?package(lincity-ng):needs="X11" section="Games/Strategy"\
-  icon="/usr/share/pixmaps/lincity-ng.xpm" \
-  title="LinCity NG" command="/usr/games/lincity-ng"

Added: packages/trunk/lincity-ng/debian/manpages
===================================================================
--- packages/trunk/lincity-ng/debian/manpages	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/manpages	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1 @@
+doc/lincity-ng.6

Added: packages/trunk/lincity-ng/debian/menu
===================================================================
--- packages/trunk/lincity-ng/debian/menu	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/menu	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,6 @@
+?package(lincity-ng):needs="X11" \
+  section="Games/Strategy" \
+  icon="/usr/share/pixmaps/lincity-ng.xpm" \
+  title="LinCity NG" \
+  longtitle="LinCity NG - city simulator game with polished graphics" \
+  command="/usr/games/lincity-ng"

Added: packages/trunk/lincity-ng/debian/patches/create-valid-desktop-file.patch
===================================================================
--- packages/trunk/lincity-ng/debian/patches/create-valid-desktop-file.patch	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/create-valid-desktop-file.patch	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,31 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 2 Mar 2013 22:55:02 +0100
+Subject: create valid desktop file
+
+Forwarded: http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3428&group_id=2929
+---
+ lincity-ng.desktop |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lincity-ng.desktop b/lincity-ng.desktop
+index 7137451..0e13116 100644
+--- a/lincity-ng.desktop
++++ b/lincity-ng.desktop
+@@ -1,13 +1,14 @@
+ [Desktop Entry]
+ Type=Application
+ Version=1.0
+-Encoding=UTF-8
+ Name=Lincity-NG
+ GenericName=City Simulation Game
+ GenericName[de]=Stadtsimulationsspiel
+-Comment=Plan and Build a city and take care of transport, economics, electricityand others.
+-Icon=lincity-ng.png
++Comment=Plan and build a city and take care of transport, economics, electricity and others.
++Comment[de]=Plane und baue eine Stadt und kümmere dich um das Verkehrswesen, die Wirtschaft, Elektrizität und mehr.
++Icon=lincity-ng
+ Exec=lincity-ng
+ Terminal=false
+ StartupNotify=false
+ Categories=Game;Simulation;
++Keywords=game;simulation;city;strategy;3D;economics;transport;buildings;

Deleted: packages/trunk/lincity-ng/debian/patches/failback-to-800x600.diff
===================================================================
--- packages/trunk/lincity-ng/debian/patches/failback-to-800x600.diff	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/patches/failback-to-800x600.diff	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1,19 +0,0 @@
-diff --git a/src/lincity-ng/main.cpp b/src/lincity-ng/main.cpp
-index b6a1d1b..549c7a4 100644
---- a/src/lincity-ng/main.cpp
-+++ b/src/lincity-ng/main.cpp
-@@ -217,6 +217,14 @@ void initVideo(int width, int height)
-     SDL_Surface* screen
-         = SDL_SetVideoMode(width, height, bpp, flags);
-     SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0);
-+
-+    if(!screen) {
-+        // Debian: Try harder to get a working screen
-+        // The default 1024x768 is to large for most of the
-+        // netBook computer.
-+        screen = SDL_SetVideoMode(800, 600, bpp, flags);
-+    }
-+
-     if(!screen) {
-         std::stringstream msg;
-         msg << "Couldn't set video mode ("

Added: packages/trunk/lincity-ng/debian/patches/failback-to-800x600.patch
===================================================================
--- packages/trunk/lincity-ng/debian/patches/failback-to-800x600.patch	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/failback-to-800x600.patch	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,27 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 2 Mar 2013 15:12:49 +0100
+Subject: failback-to-800x600
+
+---
+ src/lincity-ng/main.cpp |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/lincity-ng/main.cpp b/src/lincity-ng/main.cpp
+index b6a1d1b..549c7a4 100644
+--- a/src/lincity-ng/main.cpp
++++ b/src/lincity-ng/main.cpp
+@@ -217,6 +217,14 @@ void initVideo(int width, int height)
+     SDL_Surface* screen
+         = SDL_SetVideoMode(width, height, bpp, flags);
+     SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0);
++
++    if(!screen) {
++        // Debian: Try harder to get a working screen
++        // The default 1024x768 is to large for most of the
++        // netBook computer.
++        screen = SDL_SetVideoMode(800, 600, bpp, flags);
++    }
++
+     if(!screen) {
+         std::stringstream msg;
+         msg << "Couldn't set video mode ("

Added: packages/trunk/lincity-ng/debian/patches/fix-format-not-a-string-literal-error.patch
===================================================================
--- packages/trunk/lincity-ng/debian/patches/fix-format-not-a-string-literal-error.patch	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/fix-format-not-a-string-literal-error.patch	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,36 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 2 Mar 2013 15:14:38 +0100
+Subject: fix format not a string literal error
+
+Forwarded: http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3430&group_id=2929
+---
+ src/lincity-ng/Dialog.cpp |    2 +-
+ src/lincity/fileutil.cpp  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lincity-ng/Dialog.cpp b/src/lincity-ng/Dialog.cpp
+index 241a28e..1137b8a 100644
+--- a/src/lincity-ng/Dialog.cpp
++++ b/src/lincity-ng/Dialog.cpp
+@@ -378,7 +378,7 @@ void Dialog::gameStats(){
+         setParagraphN( "statistic_text", line++, outf );
+     }
+     if (sustain_flag){
+-	    snprintf (outf, maxlength, _("Economy is sustainable"));
++	    snprintf (outf, maxlength, _("Economy is sustainable"), "%s");
+         setParagraphN( "statistic_text", line++, outf );
+     }
+     snprintf (outf, maxlength, _("Population  %d  of which  %d  are not housed.")
+diff --git a/src/lincity/fileutil.cpp b/src/lincity/fileutil.cpp
+index fa6edbd..7a2cc5c 100644
+--- a/src/lincity/fileutil.cpp
++++ b/src/lincity/fileutil.cpp
+@@ -498,7 +498,7 @@ void check_savedir(void)
+ 
+ void malloc_failure(void)
+ {
+-    printf(_("Out of memory: malloc failure\n"));
++    printf(_("Out of memory: malloc failure \n"), "%s");
+     exit(1);
+ }
+ 

Added: packages/trunk/lincity-ng/debian/patches/fix-hyphen-is-used-as-minus-sign.patch
===================================================================
--- packages/trunk/lincity-ng/debian/patches/fix-hyphen-is-used-as-minus-sign.patch	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/fix-hyphen-is-used-as-minus-sign.patch	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 2 Mar 2013 22:43:26 +0100
+Subject: fix hyphen is used as minus sign
+
+Forwarded: http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3429&group_id=2929
+---
+ doc/lincity-ng.6 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/lincity-ng.6 b/doc/lincity-ng.6
+index b0ca5c6..b24ec0c 100644
+--- a/doc/lincity-ng.6
++++ b/doc/lincity-ng.6
+@@ -76,7 +76,7 @@ speficify how quick is the fast speed. (eg. \-q 1 is the fastest possible with f
+ .SH UPGRADE from 1.x to 2.x
+ A new format for saved games is used since 2.0, but old games can be imported and automagically converted. Just copy $HOME/.lincity/*   (old location for lincity and lincity-ng 1.x) to $HOME/.lincity-ng/ (new location since 2.0).
+ 
+-   cp -a ~/.lincity/* ~/.lincity-ng/
++   cp \-a ~/.lincity/* ~/.lincity-ng/
+ 
+ At the start of the game, one message will popup to remind you have some changes to do in your city.
+ 

Added: packages/trunk/lincity-ng/debian/patches/fix-out-of-boundary-crash.patch
===================================================================
--- packages/trunk/lincity-ng/debian/patches/fix-out-of-boundary-crash.patch	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/patches/fix-out-of-boundary-crash.patch	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1,38 @@
+From: Alain Baeckeroot <alain.baeckeroot at laposte.net> 
+Date: Sun, 3 Mar 2013 01:01:27 +0100
+Subject: fix out of boundary crash
+
+Patch was committed to upstream's svn repository. Revision 1605.
+
+Bug: http://bugs.debian.org/604172
+---
+ src/lincity-ng/GameView.cpp |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/lincity-ng/GameView.cpp b/src/lincity-ng/GameView.cpp
+index ca100fd..cca6740 100644
+--- a/src/lincity-ng/GameView.cpp
++++ b/src/lincity-ng/GameView.cpp
+@@ -1724,6 +1724,12 @@ void GameView::printStatusMessage( std::string message ){
+ int GameView::bulldozeCost( MapPoint tile ){
+     int group;
+     int prize = 0;
++    if ( (tile.x < 0) || (tile.x >= WORLD_SIDE_LEN) || (tile.y < 0) || (tile.y >= WORLD_SIDE_LEN) )
++      return 0;
++
++    if( selected_module_type == CST_NONE )
++    	return 0;
++    
+     if (MP_TYPE( tile.x, tile.y) == CST_USED)
+         group = MP_GROUP( MP_INFO(tile.x,tile.y).int_1,
+                           MP_INFO(tile.x,tile.y).int_2 );
+@@ -1737,6 +1743,9 @@ int GameView::buildCost( MapPoint tile ){
+     if( selected_module_type == CST_NONE ){
+     	return 0;
+     }    
++    if ( (tile.x < 0) || (tile.x >= WORLD_SIDE_LEN) || (tile.y < 0) || (tile.y >= WORLD_SIDE_LEN) )
++      return 0;
++
+     if (MP_TYPE( tile.x, tile.y ) == CST_USED)
+         return 0;
+     if (( selected_module_type == CST_TRACK_LR || selected_module_type == CST_ROAD_LR ||

Modified: packages/trunk/lincity-ng/debian/patches/series
===================================================================
--- packages/trunk/lincity-ng/debian/patches/series	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/patches/series	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1 +1,5 @@
-failback-to-800x600.diff
+failback-to-800x600.patch
+fix-format-not-a-string-literal-error.patch
+fix-hyphen-is-used-as-minus-sign.patch
+create-valid-desktop-file.patch
+fix-out-of-boundary-crash.patch

Modified: packages/trunk/lincity-ng/debian/rules
===================================================================
--- packages/trunk/lincity-ng/debian/rules	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/rules	2013-03-07 22:03:30 UTC (rev 13973)
@@ -1,118 +1,33 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
 #export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# Needed to cross-compile
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh $@ --parallel --with autotools_dev
 
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	  --prefix=/usr \
+	  --bindir=\$${prefix}/games \
+	  --datarootdir=\$${prefix}/share/games \
+	  --mandir=\$${prefix}/share/man
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-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
-	$(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
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
+override_dh_auto_build:
 	jam -q
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
+override_dh_auto_install:
+	jam -sprefix=$(CURDIR)/debian/tmp/usr install
 
-	-jam clean
+override_dh_install:
+	# create a .xpm file for the Debian menu
+	convert -monitor -resize 32x32 \
+	  $(CURDIR)/debian/tmp/usr/share/games/pixmaps/lincity-ng.png \
+	  $(CURDIR)/debian/tmp/usr/share/games/pixmaps/lincity-ng.xpm
+	dh_install
 
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	rm -Rf debian/lincity-ng.6 \
-		build-stamp config.status config.sub config.guess \
-		config.log config.h \
-		build lincity-ng Jamconfig
-	dh_clean
+	# Remove duplicate Bitstream Vera font, use links file and symlink
+	# to Debian's ttf-dejavu package.
+	rm -f $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/*
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	jam -sprefix=$(CURDIR)/debian/lincity-ng/usr install
-
-	# Prune the docs installed by "jam install", they'll be added the debhelper
-	rm -rf $(CURDIR)/debian/lincity-ng/usr/share/games/doc
-
-	# 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/lincity-ng $(CURDIR)/debian/lincity-ng-data/usr/share/games
-	mv $(CURDIR)/debian/lincity-ng/usr/share/games/* $(CURDIR)/debian/lincity-ng/usr/share
-	rm -rf $(CURDIR)/debian/lincity-ng/usr/share/games
-
-	# Do not duplicate the Bitstream Vera font
-	# Symlinks target /usr/share/fonts/truetype/ttf-dejavu
-	# (and have to be relative, see Policy 10.5)
-	rm $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/*
-	ln -s ../../../fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/fixed.ttf
-	ln -s ../../../fonts/truetype/ttf-dejavu/DejaVuSans.ttf     $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/sans.ttf
-	ln -s ../../../fonts/truetype/ttf-dejavu/DejaVuSerif.ttf    $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/serif.ttf
-
-	# create a .xpm file because Debian menu system want it...
-	convert -geometry 32x32 ./debian/lincity-ng/usr/share/pixmaps/lincity-ng.png ./debian/lincity-ng/usr/share/pixmaps/lincity-ng.xpm
-
-	# Adjust the desktop file until upstream fixes it
-	find $(CURDIR)/debian/lincity-ng -name '*.desktop' -exec \
-		sed -i -e '/^Encoding=/d' {} ';'
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs  -i
-	dh_installdocs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs  -a
-	dh_installdocs -a
-	dh_installmenu -a
-	dh_installman ./doc/lincity-ng.6 -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_installchangelogs:
+	dh_installchangelogs RELNOTES

Added: packages/trunk/lincity-ng/debian/source/format
===================================================================
--- packages/trunk/lincity-ng/debian/source/format	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/source/format	2013-03-07 22:03:30 UTC (rev 13973)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/trunk/lincity-ng/debian/watch
===================================================================
--- packages/trunk/lincity-ng/debian/watch	2013-03-07 21:45:38 UTC (rev 13972)
+++ packages/trunk/lincity-ng/debian/watch	2013-03-07 22:03:30 UTC (rev 13973)
@@ -4,4 +4,4 @@
 # Berlios project, ID 2929, tar.bz2 source
 opts=downloadurlmangle=s/prdownload/download/ \
   http://developer.berlios.de/project/showfiles.php?group_id=2929 \
-  http://prdownload.berlios.de/lincity-ng/lincity-ng-(.*).tar.bz2
+  http://prdownload.berlios.de/lincity-ng/lincity-ng-(.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))




More information about the Pkg-games-commits mailing list