[lincity-ng] 02/03: Release 2.9~beta-1 to experimental.

Markus Koschany apo-guest at moszumanska.debian.org
Tue Mar 24 11:03:37 UTC 2015 

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

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

commit ce50438defe33c8fc9acc7483952b52926a5204d
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Feb 3 16:55:15 2014 +0000

    Release 2.9~beta-1 to experimental.
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch
---
 debian/clean                                       |  1 +
 debian/control                                     | 15 +++++----
 debian/copyright                                   |  4 +--
 debian/docs                                        |  3 +-
 debian/lincity-ng-data.install                     |  2 ++
 debian/lincity-ng-data.links                       |  3 +-
 debian/lincity-ng.install                          |  1 -
 debian/menu                                        |  2 +-
 debian/patches/create-valid-desktop-file.patch     | 31 ------------------
 debian/patches/failback-to-800x600.patch           | 27 ---------------
 .../fix-format-not-a-string-literal-error.patch    | 36 --------------------
 .../patches/fix-hyphen-is-used-as-minus-sign.patch | 22 -------------
 debian/patches/fix-out-of-boundary-crash.patch     | 38 ----------------------
 debian/patches/series                              |  5 ---
 debian/rules                                       | 26 +++++++--------
 debian/watch                                       |  2 --
 16 files changed, 29 insertions(+), 189 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..1bdb30f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+lincity-ng.xpm
diff --git a/debian/control b/debian/control
index 461eef1..88173d4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
 Build-Depends:
  autotools-dev,
  debhelper (>= 9),
- imagemagick,
  jam,
  libphysfs-dev,
  libsdl-gfx1.2-dev,
@@ -28,12 +27,10 @@ Homepage: http://lincity-ng.berlios.de/
 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:
@@ -48,8 +45,14 @@ Description: City simulator game with polished graphics
 
 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:
diff --git a/debian/copyright b/debian/copyright
index 23dcd06..1ada7e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,7 +23,7 @@ Files: src/tinygettext/findlocale.*
 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 @@ Copyright: 2005-2006, Moritz Muehlenhoff <jmm at debian.org>
            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+
diff --git a/debian/docs b/debian/docs
index cf4ddc8..d8f51b1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,4 @@
 README
 TODO
-
+README-Unlimited
+README-WaterWell
diff --git a/debian/lincity-ng-data.install b/debian/lincity-ng-data.install
index a348f85..760555d 100644
--- a/debian/lincity-ng-data.install
+++ b/debian/lincity-ng-data.install
@@ -1 +1,3 @@
+lincity-ng.xpm                      usr/share/pixmaps
+data/lincity-ng.png                 usr/share/pixmaps
 usr/share/games/lincity-ng
diff --git a/debian/lincity-ng-data.links b/debian/lincity-ng-data.links
index 337a24f..400f2dd 100644
--- a/debian/lincity-ng-data.links
+++ b/debian/lincity-ng-data.links
@@ -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
diff --git a/debian/lincity-ng.install b/debian/lincity-ng.install
index 38e125f..ca1736f 100644
--- a/debian/lincity-ng.install
+++ b/debian/lincity-ng.install
@@ -1,3 +1,2 @@
 usr/games/lincity-ng
 usr/share/games/applications        usr/share
-usr/share/games/pixmaps             usr/share
diff --git a/debian/menu b/debian/menu
index a286b55..0962895 100644
--- a/debian/menu
+++ b/debian/menu
@@ -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" \
diff --git a/debian/patches/create-valid-desktop-file.patch b/debian/patches/create-valid-desktop-file.patch
deleted file mode 100644
index 5f8377b..0000000
--- a/debian/patches/create-valid-desktop-file.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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;
diff --git a/debian/patches/failback-to-800x600.patch b/debian/patches/failback-to-800x600.patch
deleted file mode 100644
index 2939c96..0000000
--- a/debian/patches/failback-to-800x600.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 ("
diff --git a/debian/patches/fix-format-not-a-string-literal-error.patch b/debian/patches/fix-format-not-a-string-literal-error.patch
deleted file mode 100644
index 0b29714..0000000
--- a/debian/patches/fix-format-not-a-string-literal-error.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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);
- }
- 
diff --git a/debian/patches/fix-hyphen-is-used-as-minus-sign.patch b/debian/patches/fix-hyphen-is-used-as-minus-sign.patch
deleted file mode 100644
index 764d1d9..0000000
--- a/debian/patches/fix-hyphen-is-used-as-minus-sign.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.
- 
diff --git a/debian/patches/fix-out-of-boundary-crash.patch b/debian/patches/fix-out-of-boundary-crash.patch
deleted file mode 100644
index 4fe0c28..0000000
--- a/debian/patches/fix-out-of-boundary-crash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 ||
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d0db0a3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/debian/rules b/debian/rules
index 200c883..404813d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,26 +7,22 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 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:
diff --git a/debian/watch b/debian/watch
index f5f7f33..74600bd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
-# mandatory line -- format version
 version=3
-
 https://github.com/lincity-ng/lincity-ng/tags (.+)lincity-ng-(.+)\.tar\.gz

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

More information about the Pkg-games-commits mailing list