r11761 - in packages/trunk/simutrans-pak64/debian: . patches

[Ansgar Burchardt]

Author: ansgar
Date: 2011-02-16 23:09:13 +0000 (Wed, 16 Feb 2011)
New Revision: 11761

Modified:
   packages/trunk/simutrans-pak64/debian/changelog
   packages/trunk/simutrans-pak64/debian/compat
   packages/trunk/simutrans-pak64/debian/control
   packages/trunk/simutrans-pak64/debian/patches/buildsystem
   packages/trunk/simutrans-pak64/debian/rules
Log:
* New upstream release.
* Use source format 3.0 (quilt).
* Bump Standards-Version to 3.9.1 (no changes).

Modified: packages/trunk/simutrans-pak64/debian/changelog
===================================================================
--- packages/trunk/simutrans-pak64/debian/changelog	2011-02-16 22:38:56 UTC (rev 11760)
+++ packages/trunk/simutrans-pak64/debian/changelog	2011-02-16 23:09:13 UTC (rev 11761)
@@ -1,9 +1,12 @@
-simutrans-pak64 (102.2.2-2) UNRELEASED; urgency=low
+simutrans-pak64 (110.0-1) unstable; urgency=low
 
+  * New upstream release.
   * debian/control: Remove DM-Upload-Allowed.
+  * Use source format 3.0 (quilt).
+  * Bump Standards-Version to 3.9.1 (no changes).
   * Update my email address.
 
- -- Ansgar Burchardt <ansgar at debian.org>  Mon, 11 Oct 2010 12:29:22 +0200
+ -- Ansgar Burchardt <ansgar at debian.org>  Thu, 17 Feb 2011 00:05:41 +0100
 
 simutrans-pak64 (102.2.2-1) unstable; urgency=low
 

Modified: packages/trunk/simutrans-pak64/debian/compat
===================================================================
--- packages/trunk/simutrans-pak64/debian/compat	2011-02-16 22:38:56 UTC (rev 11760)
+++ packages/trunk/simutrans-pak64/debian/compat	2011-02-16 23:09:13 UTC (rev 11761)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/simutrans-pak64/debian/control
===================================================================
--- packages/trunk/simutrans-pak64/debian/control	2011-02-16 22:38:56 UTC (rev 11760)
+++ packages/trunk/simutrans-pak64/debian/control	2011-02-16 23:09:13 UTC (rev 11761)
@@ -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.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.simutrans.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/simutrans-pak64/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/simutrans-pak64/?op=log

Modified: packages/trunk/simutrans-pak64/debian/patches/buildsystem
===================================================================
--- packages/trunk/simutrans-pak64/debian/patches/buildsystem	2011-02-16 22:38:56 UTC (rev 11760)
+++ packages/trunk/simutrans-pak64/debian/patches/buildsystem	2011-02-16 23:09:13 UTC (rev 11761)
@@ -1,7 +1,7 @@
 Changes to Makefile required for building the Debian package
 
---- simutrans-pak64-102.2.orig/Makefile
-+++ simutrans-pak64-102.2/Makefile
+--- simutrans-pak64-110.0.orig/Makefile
++++ simutrans-pak64-110.0/Makefile
 @@ -2,7 +2,7 @@
  #   make clean all archives
  # to get fresh and ready to deploy .tbz2 and .zip archives
@@ -11,7 +11,7 @@
  
  DESTDIR  ?= simutrans
  PAKDIR   ?= $(DESTDIR)/pak
-@@ -42,7 +42,7 @@
+@@ -45,7 +45,7 @@
  
  .PHONY: $(DIRS) copy tar zip
  
@@ -20,7 +20,7 @@
  
  archives: tar zip
  
-@@ -59,12 +59,13 @@
+@@ -62,12 +62,12 @@
  
  copy:
  	@echo "===> COPY"
@@ -36,7 +36,16 @@
 +	install -m 644 config/* $(PAKDIR)/config
 +	install -m 644 scenario/* $(PAKDIR)/scenario
 +	install -m 644 pak.text/* $(PAKDIR)/text
-+	install -m 644 simutrans/pak/* $(PAKDIR)/
  
  $(DIRS64):
  	@echo "===> PAK64 $@"
+@@ -83,7 +83,8 @@
+ 	@echo "===> OUTSIDE with REVISION and grounds"
+ 	@mkdir -p $(PAKDIR)
+ 	@echo -e -n "Obj=ground\nName=Outside\ncopyright=pak64 110.0 r" >$@/outside.dat
+-	@svnversion >>$@/outside.dat
++	#@svnversion >>$@/outside.dat
++	@echo $(SVNREV) >>$@/outside.dat
+ 	@echo -e "Image[0][0]=outside.0.0\n-" >>$@/outside.dat
+ 	@$(MAKEOBJ) PAK64 $(PAKDIR)/ $@/ > /dev/null
+ 	@rm $@/outside.dat

Modified: packages/trunk/simutrans-pak64/debian/rules
===================================================================
--- packages/trunk/simutrans-pak64/debian/rules	2011-02-16 22:38:56 UTC (rev 11760)
+++ packages/trunk/simutrans-pak64/debian/rules	2011-02-16 23:09:13 UTC (rev 11761)
@@ -1,18 +1,19 @@
 #!/usr/bin/make -f
+
+# SVN revision and package version to use when building .orig.tar.gz
+SVNREV  = 419
+VERSION = 110.0
+SVNROOT = https://simutrans.svn.sourceforge.net/svnroot/simutrans
+
 %:
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_build:
-	$(MAKE) all
+	$(MAKE) SVNREV=$(SVNREV) all
 
 override_dh_auto_install:
 	$(MAKE) PAKDIR=$(CURDIR)/debian/simutrans-pak64/usr/share/games/simutrans/pak copy
 
-# SVN revision and package version to use when building .orig.tar.gz
-SVNREV  = 419
-VERSION = 110.0
-SVNROOT = https://simutrans.svn.sourceforge.net/svnroot/simutrans
-
 get-orig-source:
 	svn export -r $(SVNREV) $(SVNROOT)/pak64 simutrans-pak64-$(VERSION)
 	tar c simutrans-pak64-$(VERSION) | gzip -9 >simutrans-pak64_$(VERSION).orig.tar.gz