r14899 - packages/trunk/lincity-ng/debian

Markus Koschany apo-guest at moszumanska.debian.org
Mon Feb 3 16:55:15 UTC 2014 

Author: apo-guest
Date: 2014-02-03 16:55:15 +0000 (Mon, 03 Feb 2014)
New Revision: 14899

Added:
   packages/trunk/lincity-ng/debian/clean
Removed:
   packages/trunk/lincity-ng/debian/patches/
Modified:
   packages/trunk/lincity-ng/debian/changelog
   packages/trunk/lincity-ng/debian/control
   packages/trunk/lincity-ng/debian/copyright
   packages/trunk/lincity-ng/debian/docs
   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/menu
   packages/trunk/lincity-ng/debian/rules
   packages/trunk/lincity-ng/debian/watch
Log:
Release 2.9~beta-1 to experimental.


Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/changelog	2014-02-03 16:55:15 UTC (rev 14899)
@@ -1,3 +1,34 @@
+lincity-ng (2.9~beta-1) experimental; urgency=medium
+
+  * Imported Upstream version 2.9~beta.
+  * Drop all patches. Fixed upstream.
+    - create-valid-desktop-file.patch
+    - fix-format-not-a-string-literal-error.patch
+    - fix-hyphen-is-used-as-minus-sign.patch
+    - fix-out-of-boundary-crash.patch
+    - failback-to-800x600.patch
+  * debian/control:
+    - Declare compliance with Debian policy 3.9.5.
+    - Depend on fonts-dejavu instead of the deprecated ttf-dejavu package.
+    - Move imagemagick to Build-Depends-Indep.
+    - Remove obsolete Breaks and Replaces fields from lincity-ng binary
+      package. Add Breaks and Replaces lincity-ng (<< 2.9~beta-1) to
+      lincity-ng-data because architecture-independent icons have been moved to
+      this package.
+  * debian/menu: Change section to Games/Simulation.
+  * debian/rules:
+    - Convert icons in dh_auto_build-indep target.
+    - Use dh_auto_build-arch target for jam -q.
+    - Enable verbose build with jam -dax.
+  * wrap-and-sort -sa.
+  * Update lincity-ng-data.links because of the new fonts-dejavu-core package.
+  * Add clean file.
+  * Update watch file and mangle the upstream version correctly.
+  * Update copyright years.
+  * Install README-WaterWell and README-Unlimited with docs file.
+
+ -- Markus Koschany <apo at gambaru.de>  Mon, 03 Feb 2014 16:57:11 +0100
+
 lincity-ng (2.0-4) unstable; urgency=low
 
   * Add -f-switch to rm command when removing the font files in debian/rules.

Added: packages/trunk/lincity-ng/debian/clean
===================================================================
--- packages/trunk/lincity-ng/debian/clean	                        (rev 0)
+++ packages/trunk/lincity-ng/debian/clean	2014-02-03 16:55:15 UTC (rev 14899)
@@ -0,0 +1 @@
+lincity-ng.xpm

Modified: packages/trunk/lincity-ng/debian/control
===================================================================
--- packages/trunk/lincity-ng/debian/control	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/control	2014-02-03 16:55:15 UTC (rev 14899)
@@ -2,11 +2,12 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Cyril Brulebois <kibi at debian.org>, Markus Koschany <apo at gambaru.de>
+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,
@@ -17,7 +18,9 @@
  libxml2-dev,
  pkg-config,
  zlib1g-dev
-Standards-Version: 3.9.4
+Build-Depends-Indep:
+ imagemagick
+Standards-Version: 3.9.5
 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/
@@ -25,12 +28,10 @@
 Package: lincity-ng
 Architecture: any
 Depends:
+ fonts-dejavu,
  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:
@@ -45,8 +46,14 @@
 
 Package: lincity-ng-data
 Architecture: all
-Depends: ${misc:Depends}
-Suggests: lincity-ng
+Depends:
+ ${misc:Depends}
+Breaks:
+ lincity-ng (<< 2.9~beta-1)
+Replaces:
+ lincity-ng (<< 2.9~beta-1)
+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	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/copyright	2014-02-03 16:55:15 UTC (rev 14899)
@@ -23,7 +23,7 @@
 License: MIT
 Copyright: 2004, Adam D. Moss
 
-Files: data/fonts/*.ttf
+Files: data/fonts/sans.ttf
 Copyright: 2003, Bitstream, Inc
            2006, Tavmjong Bah
 License: Bitstream-Vera-Fonts-Copyright and Arev-Fonts-Copyright
@@ -37,7 +37,7 @@
            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>
+           2013-2014, Markus Koschany <apo at gambaru.de>
 License: GPL-2+
 
 License: GPL-2+

Modified: packages/trunk/lincity-ng/debian/docs
===================================================================
--- packages/trunk/lincity-ng/debian/docs	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/docs	2014-02-03 16:55:15 UTC (rev 14899)
@@ -1,3 +1,4 @@
 README
 TODO
-
+README-Unlimited
+README-WaterWell

Modified: packages/trunk/lincity-ng/debian/lincity-ng-data.install
===================================================================
--- packages/trunk/lincity-ng/debian/lincity-ng-data.install	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/lincity-ng-data.install	2014-02-03 16:55:15 UTC (rev 14899)
@@ -1 +1,3 @@
+lincity-ng.xpm                      usr/share/pixmaps
+data/lincity-ng.png                 usr/share/pixmaps
 usr/share/games/lincity-ng

Modified: packages/trunk/lincity-ng/debian/lincity-ng-data.links
===================================================================
--- packages/trunk/lincity-ng/debian/lincity-ng-data.links	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/lincity-ng-data.links	2014-02-03 16:55:15 UTC (rev 14899)
@@ -1,2 +1 @@
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/lincity-ng/fonts/sans.ttf
-
+usr/share/fonts/truetype/dejavu/DejaVuSans.ttf usr/share/games/lincity-ng/fonts/sans.ttf

Modified: packages/trunk/lincity-ng/debian/lincity-ng.install
===================================================================
--- packages/trunk/lincity-ng/debian/lincity-ng.install	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/lincity-ng.install	2014-02-03 16:55:15 UTC (rev 14899)
@@ -1,3 +1,2 @@
 usr/games/lincity-ng
 usr/share/games/applications        usr/share
-usr/share/games/pixmaps             usr/share

Modified: packages/trunk/lincity-ng/debian/menu
===================================================================
--- packages/trunk/lincity-ng/debian/menu	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/menu	2014-02-03 16:55:15 UTC (rev 14899)
@@ -1,5 +1,5 @@
 ?package(lincity-ng):needs="X11" \
-  section="Games/Strategy" \
+  section="Games/Simulation" \
   icon="/usr/share/pixmaps/lincity-ng.xpm" \
   title="LinCity NG" \
   longtitle="LinCity NG - city simulator game with polished graphics" \

Modified: packages/trunk/lincity-ng/debian/rules
===================================================================
--- packages/trunk/lincity-ng/debian/rules	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/rules	2014-02-03 16:55:15 UTC (rev 14899)
@@ -7,26 +7,22 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	  --prefix=/usr \
-	  --bindir=\$${prefix}/games \
-	  --datarootdir=\$${prefix}/share/games \
-	  --mandir=\$${prefix}/share/man
+		--prefix=/usr \
+		--bindir=\$${prefix}/games \
+		--datarootdir=\$${prefix}/share/games \
+		--mandir=\$${prefix}/share/man
 
-override_dh_auto_build:
-	jam -q
+override_dh_auto_build-arch:
+	jam -q -dax
 
-override_dh_auto_install:
-	jam -sprefix=$(CURDIR)/debian/tmp/usr install
-
-override_dh_install:
+override_dh_auto_build-indep:
 	# 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
+	convert -monitor -resize 32x32 data/lincity-ng.png lincity-ng.xpm
 
+override_dh_auto_install:
+	jam -sprefix=$(CURDIR)/debian/tmp/usr install
 	# Remove duplicate Bitstream Vera font, use links file and symlink
-	# to Debian's ttf-dejavu package.
+	# to Debian's fonts-dejavu package.
 	rm -f $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/*
 
 override_dh_installchangelogs:

Modified: packages/trunk/lincity-ng/debian/watch
===================================================================
--- packages/trunk/lincity-ng/debian/watch	2014-01-29 07:52:49 UTC (rev 14898)
+++ packages/trunk/lincity-ng/debian/watch	2014-02-03 16:55:15 UTC (rev 14899)
@@ -2,6 +2,7 @@
 version=3
 
 # Berlios project, ID 2929, tar.bz2 source
-opts=downloadurlmangle=s/prdownload/download/ \
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\
+downloadurlmangle=s/prdownload/download/ \
   http://developer.berlios.de/project/showfiles.php?group_id=2929 \
   http://prdownload.berlios.de/lincity-ng/lincity-ng-(.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

More information about the Pkg-games-commits mailing list