r12799 - in packages/trunk/simutrans-pak128.britain/debian: . patches

Ansgar Burchardt ansgar at alioth.debian.org
Sat Nov 12 10:29:09 UTC 2011 

Author: ansgar
Date: 2011-11-12 10:29:09 +0000 (Sat, 12 Nov 2011)
New Revision: 12799

Added:
   packages/trunk/simutrans-pak128.britain/debian/README.source
   packages/trunk/simutrans-pak128.britain/debian/patches/
   packages/trunk/simutrans-pak128.britain/debian/patches/build.patch
   packages/trunk/simutrans-pak128.britain/debian/patches/series
Removed:
   packages/trunk/simutrans-pak128.britain/debian/build
Modified:
   packages/trunk/simutrans-pak128.britain/debian/changelog
   packages/trunk/simutrans-pak128.britain/debian/control
   packages/trunk/simutrans-pak128.britain/debian/rules
   packages/trunk/simutrans-pak128.britain/debian/simutrans-pak128.britain.install
Log:
* New upstream release.
* Update debian/rules.
* Add README.source (from simutrans-pak64).
* Bump Standards-Version to 3.9.2 (no changes).

Added: packages/trunk/simutrans-pak128.britain/debian/README.source
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/README.source	                        (rev 0)
+++ packages/trunk/simutrans-pak128.britain/debian/README.source	2011-11-12 10:29:09 UTC (rev 12799)
@@ -0,0 +1,10 @@
+To generate a tarball for a new upstream release, change the variables SVNREV
+and VERSION in debian/rules and then run
+
+ $ make -f debian/rules get-orig-source
+
+This will generate an upstream tarball in the current directory.
+
+Please also change UPSTREAM_SVNREV to match the upstream release. You can find
+the correct value in ground.Outside.pak in the upstream binary release (the
+"607:609" in "pak128.Britain 1.09 111.0 r607:609").

Deleted: packages/trunk/simutrans-pak128.britain/debian/build
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/build	2011-11-11 22:29:56 UTC (rev 12798)
+++ packages/trunk/simutrans-pak128.britain/debian/build	2011-11-12 10:29:09 UTC (rev 12799)
@@ -1,50 +0,0 @@
-#! /bin/sh
-set -e
-
-: ${MAKEOBJ:=/usr/games/makeobj}
-
-mkdir -p build
-
-while read pak dir ; do
-	$MAKEOBJ pak224 build/$pak $dir
-done <<EOT
-  BritBoat224.pak     ./boats/boats224/
-EOT
-
-while read pak dir ; do
-	$MAKEOBJ pak192 build/$pak $dir
-done <<EOT
-  BritBoat192.pak     ./boats/boat192/
-EOT
-
-while read pak dir ; do
-	$MAKEOBJ pak128 build/$pak $dir
-done <<EOT
-  BritAttractions.pak ./attractions/
-  BritBoat.pak        ./boats/
-  BritBus.pak         ./bus/
-  BritCity.pak        ./citybuildings/
-  BritCitycar.pak     ./citycars/
-  BritDepot.pak       ./depots/
-  BritGoods.pak       ./goods/
-  BritHQ.pak          ./hq/
-  ./                  ./grounds/
-  ./                  ./gui/gui128/
-  BritIndustry.pak    ./industry/
-  BritLU.pak          ./london-underground/
-  BritMaglev.pak      ./maglev/
-  BritPedestrian.pak  ./pedestrians/
-  BritSmoke.pak       ./smokes/
-  BritStation.pak     ./stations/
-  BritHall.pak        ./townhall/
-  BritRail.pak        ./trains/
-  BritTram.pak        ./trams/
-  BritTree.pak        ./trees/
-  BritWay.pak         ./ways/
-EOT
-
-while read pak dir ; do
-	$MAKEOBJ pak build/$pak $dir
-done <<EOT
-  BritGUI64.pak       ./gui/gui64/
-EOT

Modified: packages/trunk/simutrans-pak128.britain/debian/changelog
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/changelog	2011-11-11 22:29:56 UTC (rev 12798)
+++ packages/trunk/simutrans-pak128.britain/debian/changelog	2011-11-12 10:29:09 UTC (rev 12799)
@@ -1,3 +1,12 @@
+simutrans-pak128.britain (1.09-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update debian/rules.
+  * Add README.source (from simutrans-pak64).
+  * Bump Standards-Version to 3.9.2 (no changes).
+
+ -- Ansgar Burchardt <ansgar at debian.org>  Sat, 12 Nov 2011 11:28:59 +0100
+
 simutrans-pak128.britain (1.08-2) unstable; urgency=low
 
   * Use XZ compression for the binary package.

Modified: packages/trunk/simutrans-pak128.britain/debian/control
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/control	2011-11-11 22:29:56 UTC (rev 12798)
+++ packages/trunk/simutrans-pak128.britain/debian/control	2011-11-12 10:29:09 UTC (rev 12799)
@@ -5,7 +5,7 @@
 Uploaders: Ansgar Burchardt <ansgar at debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: simutrans-makeobj (>= 102.2)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.simutrans.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/simutrans-pak128.britain/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/simutrans-pak128.britain/

Added: packages/trunk/simutrans-pak128.britain/debian/patches/build.patch
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/patches/build.patch	                        (rev 0)
+++ packages/trunk/simutrans-pak128.britain/debian/patches/build.patch	2011-11-12 10:29:09 UTC (rev 12799)
@@ -0,0 +1,26 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Sat, 12 Nov 2011 11:14:49 +0100
+Subject: build changes for Debian
+
+--- brit.orig/Makefile
++++ brit/Makefile
+@@ -2,7 +2,8 @@
+ #   make clean all archives
+ # to get fresh and ready to deploy .tbz2 and .zip archives
+ 
+-MAKEOBJ ?= ./makeobj
++SHELL=/bin/bash
++MAKEOBJ ?= makeobj
+ 
+ DESTDIR  ?= simutrans
+ PAKDIR   ?= $(DESTDIR)/pak128.Britain
+@@ -102,7 +103,8 @@
+ 	@mkdir -p $(PAKDIR)
+ 	@$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
+ 	@echo -e -n "Obj=ground\nName=Outside\ncopyright=pak128.Britain 1.09 111.0 r" >$@/outsiderev.dat
+-	@svnversion >>$@/outsiderev.dat
++	#@svnversion >>$@/outsiderev.dat
++	echo $(SVNREV) >>$@/outsiderev.dat
+ 	@echo -e "Image[0][0]=images/ls-water-128.0.0\n-" >>$@/outsiderev.dat
+ 	@$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
+ 	@rm $@/outsiderev.dat

Added: packages/trunk/simutrans-pak128.britain/debian/patches/series
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/patches/series	                        (rev 0)
+++ packages/trunk/simutrans-pak128.britain/debian/patches/series	2011-11-12 10:29:09 UTC (rev 12799)
@@ -0,0 +1 @@
+build.patch

Modified: packages/trunk/simutrans-pak128.britain/debian/rules
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/rules	2011-11-11 22:29:56 UTC (rev 12798)
+++ packages/trunk/simutrans-pak128.britain/debian/rules	2011-11-12 10:29:09 UTC (rev 12799)
@@ -1,23 +1,26 @@
 #! /usr/bin/make -f
 
+# revision to use when building .orig.tar.gz
+SVNREV  = 609
+VERSION = 1.09
+SVNROOT = https://simutrans.svn.sourceforge.net/svnroot/simutrans
+UPSTREAM_SVNREV = 607:609 # see README.source
+
+STAGING := $(CURDIR)/debian/simutrans-pak128.britain
+
 %:
 	dh $@
 
 override_dh_auto_build:
-	sh debian/build
+	$(MAKE) SVNREV=$(UPSTREAM_SVNREV) all
 
-override_dh_clean:
-	dh_clean
-	[ ! -d build ] || $(RM) -r build
+override_dh_install:
+	dh_install
+	rmdir --ignore-fail-on-non-empty $(STAGING)/usr/share/games/simutrans/pak128.Britain/text/citylist
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-# revision to use when building .orig.tar.gz
-SVNREV  = 609
-VERSION = 1.09
-SVNROOT = https://simutrans.svn.sourceforge.net/svnroot/simutrans
-
 get-orig-source:
 	svn export -r $(SVNREV) $(SVNROOT)/pak128.Britain simutrans-pak128.britain-$(VERSION)
 	find simutrans-pak128.britain-$(VERSION) -name "*.pak" -print -delete

Modified: packages/trunk/simutrans-pak128.britain/debian/simutrans-pak128.britain.install
===================================================================
--- packages/trunk/simutrans-pak128.britain/debian/simutrans-pak128.britain.install	2011-11-11 22:29:56 UTC (rev 12798)
+++ packages/trunk/simutrans-pak128.britain/debian/simutrans-pak128.britain.install	2011-11-12 10:29:09 UTC (rev 12799)
@@ -1,5 +1 @@
-config/*.tab		usr/share/games/simutrans/pak128.Britain/config
-text/*.*		usr/share/games/simutrans/pak128.Britain/text
-text/citylists/*.*	usr/share/games/simutrans/pak128.Britain/text/citylists
-compat.tab demo.sve	usr/share/games/simutrans/pak128.Britain
-build/*			usr/share/games/simutrans/pak128.Britain
+simutrans usr/share/games

More information about the Pkg-games-commits mailing list