This is an automated email from the git hooks/post-receive script. jff-guest pushed a commit to branch master in repository simutrans-pak128.britain.
commit fa4499a04260c4aeab9e69c4f91bc6ac34af577f Author: Jörg Frings-Fürst <[email protected]> Date: Sun Nov 15 12:01:30 2015 +0100 Imported Upstream version 1.16 --- .gitignore | 3 - debian/README.source | 10 --- debian/changelog | 69 ------------------ debian/compat | 1 - debian/control | 29 -------- debian/copyright | 125 -------------------------------- debian/patches/0100-filenames.patch | 45 ------------ debian/patches/0500-build.patch | 37 ---------- debian/patches/series | 2 - debian/rules | 26 ------- debian/simutrans-pak128.britain.docs | 1 - debian/simutrans-pak128.britain.install | 1 - debian/source/format | 1 - debian/watch | 3 - 14 files changed, 353 deletions(-) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 37c7f74..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.bzr -.bzrignore -.pc diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 172cb49..0000000 --- a/debian/README.source +++ /dev/null @@ -1,10 +0,0 @@ -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"). diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 5d15996..0000000 --- a/debian/changelog +++ /dev/null @@ -1,69 +0,0 @@ -simutrans-pak128.britain (1.16-1) unstable; urgency=medium - - [ Jörg Frings-Fürst ] - * New upstream release. - * debian/control: - - Add myself as uploader. - - Bump Standards-Version to 3.9.6 (No changes required). - - Change debhelper version to >= 9. - - Change simutrans-makeobj version to >= 120.0. - * Change debian/compat to 9. - * debian/rules: - - Change SVNREV and VERSION for new upstream release. - - Remove override_dh_builddeb because compression xz is now standard. - * debian/copyright: - - Add myself to debian/*. - - Rewrite for new upstream release. - * Rewrite debian/patches/build.patch and rename to 0500-build.patch. - * debian/source/options: - - Removed because xz is now standard compression. - * New debian/patches/0100-filenames.patch to correct UTF-8 filenames. - * Rewrite debian/watch. - - -- Jörg Frings-Fürst <[email protected]> Wed, 20 May 2015 21:14:55 +0200 - -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 <[email protected]> Sat, 12 Nov 2011 11:28:59 +0100 - -simutrans-pak128.britain (1.08-2) unstable; urgency=low - - * Use XZ compression for the binary package. - - -- Ansgar Burchardt <[email protected]> Thu, 11 Aug 2011 13:03:04 +0200 - -simutrans-pak128.britain (1.08-1) unstable; urgency=low - - * New upstream release. - + Update debian/build and debian/copyright. - * debian/rules: Update get-orig-source target for 1.08. - * debian/build: Use mkdir -p instead of testing for non-existance first. - * debian/control: Remove DM-Upload-Allowed. - * Bump Standards-Version to 3.9.1 (no changes). - * Update my email address. - - -- Ansgar Burchardt <[email protected]> Sat, 27 Nov 2010 11:52:40 +0100 - -simutrans-pak128.britain (1.07-1) unstable; urgency=low - - * New upstream release. - + Update debian/build. - * Install demo.sve. - * Add debian/watch. - * Use source format 3.0 (quilt). - * Bump Standards-Version to 3.8.4 (no changes). - * debian/control: Add Vcs-* fields. - * debian/control: Add DM-Upload-Allowed: yes. - - -- Ansgar Burchardt <[email protected]> Fri, 26 Feb 2010 16:42:22 +0900 - -simutrans-pak128.britain (1.06-1) unstable; urgency=low - - * Initial release. (Closes: #539835) - - -- Ansgar Burchardt <[email protected]> Sat, 02 Jan 2010 23:58:21 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index 8d2e82b..0000000 --- a/debian/control +++ /dev/null @@ -1,29 +0,0 @@ -Source: simutrans-pak128.britain -Section: games -Priority: extra -Maintainer: Debian Games Team <[email protected]> -Uploaders: - Ansgar Burchardt <[email protected]>, - Jörg Frings-Fürst <[email protected]> -Build-Depends: - debhelper (>= 9) -Build-Depends-Indep: - simutrans-makeobj (>= 120.0) -Standards-Version: 3.9.6 -Homepage: http://www.simutrans.com/ -Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/simutrans-pak128.britain/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/simutrans-pak128.britain/ - -Package: simutrans-pak128.britain -Architecture: all -Depends: ${misc:Depends} -Pre-Depends: dpkg (>= 1.15.6) -Recommends: simutrans (>= 120.0) -Enhances: simutrans -Description: transportation simulator (data files) - Simutrans is a free transportation simulator: The player operates a - transportation company and has to transport goods and passengers between - factories and different cities. - . - This package contains the pak128.Britain data set which includes - British vehicles and buildings. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9643fdb..0000000 --- a/debian/copyright +++ /dev/null @@ -1,125 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: pak128.Britain -Upstream-Contact: The Simutrans Team <[email protected]> -Source: https://simutrans.svn.sourceforge.net/svnroot/simutrans/pak128.Britain - -Files: * -Copyright: 2004-2012 The Simutrans Team <[email protected]> - Kieron Green <[email protected]> - James Hood <[email protected]> - James Petts <[email protected]> - and others -License: Artistic-1.0 - -Files: debian/* -Copyright: 2009 Ansgar Burchardt <[email protected]> - 2015 Jörg Frings-Fürst <[email protected]> -License: Artistic-1.0 - -License: Artistic-1.0 - The Artistic License - . - Preamble - . - The intent of this document is to state the conditions under which a - Package may be copied, such that the Copyright Holder maintains some - semblance of artistic control over the development of the package, - while giving the users of the package the right to use and distribute - the Package in a more-or-less customary fashion, plus the right to make - reasonable modifications. - . - Definitions: - . - * "Package" refers to the collection of files distributed by the - Copyright Holder, and derivatives of that collection of files - created through textual modification. - * "Standard Version" refers to such a Package if it has not been - modified, or has been modified in accordance with the wishes - of the Copyright Holder. - * "Copyright Holder" is whoever is named in the copyright or - copyrights for the package. - * "You" is you, if you're thinking about copying or distributing - this Package. - * "Reasonable copying fee" is whatever you can justify on the - basis of media cost, duplication charges, time of people involved, - and so on. (You will not be required to justify it to the - Copyright Holder, but only to the computing community at large - as a market that must bear the fee.) - * "Freely Available" means that no fee is charged for the item - itself, though there may be fees involved in handling the item. - It also means that recipients of the item may redistribute it - under the same conditions they received it. - . - 1. You may make and give away verbatim copies of the source form of the - Standard Version of this Package without restriction, provided that you - duplicate all of the original copyright notices and associated disclaimers. - . - 2. You may apply bug fixes, portability fixes and other modifications - derived from the Public Domain or from the Copyright Holder. A Package - modified in such a way shall still be considered the Standard Version. - . - 3. You may otherwise modify your copy of this Package in any way, provided - that you insert a prominent notice in each changed file stating how and - when you changed that file, and provided that you do at least ONE of the - following: - . - a) place your modifications in the Public Domain or otherwise make them - Freely Available, such as by posting said modifications to Usenet or - an equivalent medium, or placing the modifications on a major archive - site such as ftp.uu.net, or by allowing the Copyright Holder to include - your modifications in the Standard Version of the Package. - . - b) use the modified Package only within your corporation or - organization. - . - c) rename any non-standard executables so the names do not conflict - with standard executables, which must also be provided, and provide - a separate manual page for each non-standard executable that clearly - documents how it differs from the Standard Version. - . - d) make other distribution arrangements with the Copyright Holder. - . - 4. You may distribute the programs of this Package in object code or - executable form, provided that you do at least ONE of the following: - . - a) distribute a Standard Version of the executables and library files, - together with instructions (in the manual page or equivalent) on where - to get the Standard Version. - . - b) accompany the distribution with the machine-readable source of - the Package with your modifications. - . - c) accompany any non-standard executables with their corresponding - Standard Version executables, giving the non-standard executables - non-standard names, and clearly documenting the differences in manual - pages (or equivalent), together with instructions on where to get - the Standard Version. - . - d) make other distribution arrangements with the Copyright Holder. - . - 5. You may charge a reasonable copying fee for any distribution of this - Package. You may charge any fee you choose for support of this Package. - You may not charge a fee for this Package itself. However, - you may distribute this Package in aggregate with other (possibly - commercial) programs as part of a larger (possibly commercial) software - distribution provided that you do not advertise this Package as a - product of your own. - . - 6. The scripts and library files supplied as input to or produced as - output from the programs of this Package do not automatically fall - under the copyright of this Package, but belong to whomever generated - them, and may be sold commercially, and may be aggregated with this - Package. - . - 7. C or perl subroutines supplied by you and linked into this Package - shall not be considered part of this Package. - . - 8. The name of the Copyright Holder may not be used to endorse or promote - products derived from this software without specific prior written - permission. - . - 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - . - The End diff --git a/debian/patches/0100-filenames.patch b/debian/patches/0100-filenames.patch deleted file mode 100644 index 2c92400..0000000 --- a/debian/patches/0100-filenames.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: Change to correct UTF-8 filenames -Author: Jörg Frings-Fürst <[email protected]> -Last-Update: 2015-05-18 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/citybuildings/res-50.dat -=================================================================== ---- trunk.orig/citybuildings/res-50.dat -+++ trunk/citybuildings/res-50.dat -@@ -151,7 +151,7 @@ BackImage[3][0][0][1][0][1]=images/res/5 - BackImage[3][0][0][0][0][1]=images/res/50-apartments-xtall.3.3 - -- - Obj=building --Name=RES_A_1950�_01_24 -+Name=RES_A_1950_01_24 - #Ugly Appartments set #2 - copyright=Archon - type=RES -@@ -181,7 +181,7 @@ BackImage[3][0][0][1][0][1]=images/res/5 - BackImage[3][0][0][0][0][1]=images/res/50-apartments2-1.3.3 - -- - Obj=building --Name=RES_A_1950�_01_28 -+Name=RES_A_1950_01_28 - #Ugly Appartments set #2 - copyright=Archon - type=RES -@@ -211,7 +211,7 @@ BackImage[3][0][0][1][0][1]=images/res/5 - BackImage[3][0][0][0][0][1]=images/res/50-apartments2-2.3.3 - -- - Obj=building --Name=RES_A_1950�_01_32 -+Name=RES_A_1950_01_32 - #Ugly Appartments set #2 - copyright=Archon - type=RES -@@ -241,7 +241,7 @@ BackImage[3][0][0][1][0][1]=images/res/5 - BackImage[3][0][0][0][0][1]=images/res/50-apartments2-3.3.3 - -- - Obj=building --Name=RES_A_1950�_01_36 -+Name=RES_A_1950_01_36 - #Ugly Appartments set #2 - copyright=Archon - type=RES diff --git a/debian/patches/0500-build.patch b/debian/patches/0500-build.patch deleted file mode 100644 index 8517bb3..0000000 --- a/debian/patches/0500-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Ansgar Burchardt <[email protected]> -Date: Sat, 12 Nov 2011 11:14:49 +0100 -Subject: build changes for Debian - -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -8,7 +8,8 @@ VERSION_STRING = "pak128.Britain 1.13 11 - # - # - # --MAKEOBJ ?= ./makeobj -+SHELL=/bin/bash -+MAKEOBJ ?= /usr/games/makeobj - - DESTDIR ?= simutrans - PAKDIR ?= $(DESTDIR)/pak128.Britain -@@ -109,7 +110,7 @@ copy: - @mkdir -p $(PAKDIR)/text $(PAKDIR)/text/citylists $(PAKDIR)/config - @cp -p compat.tab $(PAKDIR) - @cp -p demo.sve $(PAKDIR) -- @cp -p licence.txt $(PAKDIR) -+# @cp -p licence.txt $(PAKDIR) - @cp -p readme.txt $(PAKDIR) - @cp -p config/* $(PAKDIR)/config - # @mkdir -p $(PAKDIR)/sound $(PAKDIR)/text $(PAKDIR)/config $(PAKDIR)/scenario -@@ -152,7 +153,8 @@ $(OUTSIDE): - @mkdir -p $(PAKDIR) - @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null - @echo -e -n "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/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 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 78a6463..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0100-filenames.patch -0500-build.patch diff --git a/debian/rules b/debian/rules deleted file mode 100755 index e28ae45..0000000 --- a/debian/rules +++ /dev/null @@ -1,26 +0,0 @@ -#! /usr/bin/make -f - -# revision to use when building .orig.tar.gz -SVNREV = 1690 -VERSION = 1.16 -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: - $(MAKE) SVNREV=$(SVNREV) all - -override_dh_install: - dh_install - rmdir --ignore-fail-on-non-empty $(STAGING)/usr/share/games/simutrans/pak128.Britain/text/citylists - -get-orig-source: - svn export -r $(SVNREV) $(SVNROOT)/pak128.Britain ../simutrans-pak128.britain-$(VERSION) - find ../simutrans-pak128.britain-$(VERSION) -name "*.pak" -print -delete - cd ../simutrans-pak128.britain-$(VERSION) && \ - tar -caf "../simutrans-pak128.britain_$(VERSION).orig.tar.xz" * - $(RM) -r ..\simutrans-pak128.britain-$(VERSION) diff --git a/debian/simutrans-pak128.britain.docs b/debian/simutrans-pak128.britain.docs deleted file mode 100644 index b2b2a78..0000000 --- a/debian/simutrans-pak128.britain.docs +++ /dev/null @@ -1 +0,0 @@ -readme.txt diff --git a/debian/simutrans-pak128.britain.install b/debian/simutrans-pak128.britain.install deleted file mode 100644 index 582de24..0000000 --- a/debian/simutrans-pak128.britain.install +++ /dev/null @@ -1 +0,0 @@ -simutrans usr/share/games diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 988bdb3..0000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -# pak128.Britain.1.13-112-0.zip -version=3 -opts="uversionmangle=s/-/./;s/-//g" http://sf.net/simutrans/pak128\.?[bB]ritain\.([0-9]\.[0-9]+).*\.zip -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans-pak128.britain.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
