[simutrans] 02/02: Imported Debian patch 120.1.1+repack-1
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Nov 14 21:32:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository simutrans.
commit 253480856d8d716d93685ca74a55b963e576d1d1
Merge: eae5b64 489628f
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date: Sat Nov 14 19:01:56 2015 +0100
Imported Debian patch 120.1.1+repack-1
.gitignore | 28 -
debian/changelog | 8 +-
debian/control | 1 -
debian/pixmaps/simutrans.xpm | 52 +
debian/rules | 6 +-
debian/simutrans.install | 2 +-
simutrans/text/be.tab | 943 ++++++++++++
simutrans/text/bg.tab | 159 ++
simutrans/text/ca.tab | 2073 ++++++++++++++++++++++++++
simutrans/text/cn.tab | 2109 ++++++++++++++++++++++++++
simutrans/text/cz.tab | 2379 ++++++++++++++++++++++++++++++
simutrans/text/de.tab | 2197 +++++++++++++++++++++++++++
simutrans/text/dk.tab | 643 ++++++++
simutrans/text/en.tab | 1593 ++++++++++++++++++++
simutrans/text/es.tab | 2105 ++++++++++++++++++++++++++
simutrans/text/et.tab | 371 +++++
simutrans/text/fi.tab | 1709 +++++++++++++++++++++
simutrans/text/fr.tab | 2063 ++++++++++++++++++++++++++
simutrans/text/gr.tab | 723 +++++++++
simutrans/text/hr.tab | 1693 +++++++++++++++++++++
simutrans/text/hu.tab | 1841 +++++++++++++++++++++++
simutrans/text/id.tab | 2005 +++++++++++++++++++++++++
simutrans/text/id/general.txt | 105 ++
simutrans/text/id/simutrans.txt | 29 +
simutrans/text/it.tab | 2055 ++++++++++++++++++++++++++
simutrans/text/ja.tab | 2069 ++++++++++++++++++++++++++
simutrans/text/ja/enlarge_map.txt | 8 +
simutrans/text/ja/load_relief.txt | 25 +
simutrans/text/ja/monorailtools.txt | 61 +
simutrans/text/ja/removal_tool.txt | 25 +
simutrans/text/ko.tab | 1767 ++++++++++++++++++++++
simutrans/text/lt.tab | 2049 +++++++++++++++++++++++++
simutrans/text/nl.tab | 1931 ++++++++++++++++++++++++
simutrans/text/no.tab | 457 ++++++
simutrans/text/pl.tab | 1751 ++++++++++++++++++++++
simutrans/text/pt.tab | 2157 +++++++++++++++++++++++++++
simutrans/text/ro.tab | 1281 ++++++++++++++++
simutrans/text/ru.tab | 2129 ++++++++++++++++++++++++++
simutrans/text/ru/airtools.txt | 56 +
simutrans/text/ru/baum_build.txt | 16 +
simutrans/text/ru/citybuilding_build.txt | 20 +
simutrans/text/sk.tab | 1609 ++++++++++++++++++++
simutrans/text/sq.tab | 49 +
simutrans/text/sv.tab | 1871 +++++++++++++++++++++++
simutrans/text/th.tab | 173 +++
simutrans/text/tr.tab | 51 +
simutrans/text/uk.tab | 2081 ++++++++++++++++++++++++++
simutrans/text/uk/airtools.txt | 37 +
simutrans/text/uk/baum_build.txt | 8 +
simutrans/text/uk/bridges.txt | 10 +
simutrans/text/uk/citybuilding_build.txt | 14 +
simutrans/text/zh.tab | 2069 ++++++++++++++++++++++++++
52 files changed, 50633 insertions(+), 33 deletions(-)
diff --cc debian/changelog
index 65a410e,0000000..f536626
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,275 -1,0 +1,281 @@@
+simutrans (120.1.1+repack-1) unstable; urgency=medium
+
+ [ Jörg Frings-Fürst ]
+ * New upstream release (Closes: #708837).
+ * Upload to unstable.
+ * debian/control:
+ - Add myself as new uploader (Closes: #783887).
+ - Bump Standards-Version to 3.9.6 (No changes required).
+ - Rewrite Depends.
+ - Rewrite Vcs* to canonical URI.
+ - Remove obsolete Pre-Depends.
+ * debian/source/options:
+ - Removed because xz is now standard compression.
+ * debian/rules:
+ - Remove override_dh_builddeb because compression xz is now standard.
+ - Remove obsolete nettools and skin.
+ - To prevent FTBFS with sbuild add dh_quilt_patch to
+ override_dh_auto_clean.
+ - Remove BROKEN_LANG loop.
++ - Split override_dh_install into override_dh_install-arch and
++ override_dh_install-indep.
+ * debian/copyright:
+ - Add myself to debian/*
+ - Remove obsolete utils/dr_rdgif.c.
+ - Rewrite for the new upstream release.
+ * Remove debian/patches/sha1-replacement.diff.
+ * Remove double debian/patches/path-for-game-data.diff.
+ * Refresh debian/patches/*.
+ * Rewrite source handling:
+ - New debian/repack.sh.
+ - debian/watch: add parameter "debian debian/repack.sh".
+ - Rewrite debian/README.source.
+ * New d/p/0510-missing_uncommon_mk.patch to include missing uncommon.mk.
+ * Update debian/translations.
+ * New debian/gbp.conf.
++ * Remove convert of simutrans.xpm and install it direct (Closes: #804666).
++ - debian/rules: Remove convert call.
++ - debian/control: Remove imagemagick from Build-Depends.
++ - New debian/pixmaps/simutrans.xpm
+
- -- Jörg Frings-Fürst <debian at jff-webhosting.net> Tue, 10 Nov 2015 06:57:07 +0100
++ -- Jörg Frings-Fürst <debian at jff-webhosting.net> Sat, 14 Nov 2015 19:01:56 +0100
+
+simutrans (111.3.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Make simutrans-data and simutrans-makeobj Multi-Arch: foreign.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Thu, 02 Aug 2012 17:41:50 +0200
+
+simutrans (111.2.2-1) unstable; urgency=low
+
+ * New upstream release.
+ + Includes fix for build failure. (Closes: #669475)
+ * Backport patch to add missing include to csv.cc.
+ + new patch: 0001-Add-stdlib-to-csv.h.patch
+ * Fix Endianness issue with SHA1 replacement. (LP: #931181)
+ * Build-depend on libpng-dev instead of libpng12-dev. (Closes: #662502)
+ * Use debhelper compat level 9.
+ * Use copyright format 1.0.
+ * Bumped Standards-Version to 3.9.3.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Sun, 29 Apr 2012 14:40:06 +0200
+
+simutrans (111.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules: Update get-orig-source target for new upstream release.
+ * Use xz compression for source and binary packages.
+ * Use override_* targets to simplify debian/rules.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Thu, 03 Nov 2011 19:59:02 +0100
+
+simutrans (110.0.1-3) unstable; urgency=low
+
+ * Fix compiling with gcc-4.6. (Closes: #625058)
+ + new patch: 0001-jspaces-fix-compiling-with-gcc-4.6.0.patch
+ * Make the build process more verbose.
+ * Use hardening flags from hardening-includes.
+ * Extend txt_convoi_count and txt_convoi_value. (LP: #760999)
+ + new patch: 0001-Extend-txt_convoi_count.patch
+ + new patch: extend-txt_convoi_value.patch
+ * Bump Standards-Version to 3.9.2 (no changes).
+
+ -- Ansgar Burchardt <ansgar at debian.org> Fri, 06 May 2011 00:04:47 +0200
+
+simutrans (110.0.1-2) unstable; urgency=low
+
+ * Add changes upstream decided to add after uploading the first time.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Mon, 14 Mar 2011 20:25:13 +0100
+
+simutrans (110.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove backported patches introduced in 110.0-3.
+ * debian/rules: Update get-orig-source for new upstream release.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Fri, 11 Mar 2011 11:30:50 +0100
+
+simutrans (110.0-3) unstable; urgency=low
+
+ * Apply upstream patches to fix crash on resize.
+ New patches: 0001-FIX-crashes-with-window-resizing-under-SDL.patch,
+ 0002-Code-treat-SYSTEM_RESIZE-event-separate-from-other-e.patch.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Fri, 25 Feb 2011 16:47:49 +0100
+
+simutrans (110.0-2) unstable; urgency=low
+
+ * Do not use compiler flags specific to i386 and amd64. (Closes: #613962)
+ * Use dpkg-buildflags to set compiler flags.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Fri, 18 Feb 2011 17:52:11 +0100
+
+simutrans (110.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Improved wording of license information. (Closes: #590734)
+ + No longer shortens large money amounts. (Closes: #576440)
+ + No longer claims land is owned by another player when building tram
+ tracks on a road with a vehicle on it. (Closes: #609938)
+ + Passengers now get routed correctly. (Closes: #593536)
+ + Adds option to use 12am/pm instead of 0am/pm. (Closes: #590834)
+ * Adapt debian/rules and patches for new upstream release.
+ * Add replacement for non-free SHA-1 implementation.
+ + new patch: sha1-replacement.diff
+ * Link less libraries into makeobj.
+ + new patch: link-less-libraries.diff
+ * debian/copyright: Add copyright information for utils/dr_rdgif.c.
+ * Use source format 3.0 (quilt).
+ * debian/control: Remove DM-Upload-Allowed.
+ * Update my email address.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Wed, 16 Feb 2011 23:58:13 +0100
+
+simutrans (102.2.2~ds1-1) unstable; urgency=low
+
+ * New upstream release.
+ + debian/rules: Update get-orig-source target.
+ + debian/control: Add build-dep on libbz2-dev.
+ + debian/control: Bump dependency on simutrans-pak64 to 102.2.1.
+ See also #565493.
+ + Refresh patches.
+ * Update translations.
+ + debian/rules: Update list of excluded languages.
+ * Correct spelling errors.
+ + new patch: spelling.patch
+ * Bump Standards-Version to 3.8.4 (no changes).
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Fri, 12 Mar 2010 09:23:35 +0900
+
+simutrans (102.2.1~ds1-1) unstable; urgency=low
+
+ * New upstream release.
+ + Allows waypoints for tram on city roads again. (Closes: #555924)
+ + Refresh patches.
+ + Update translations.
+ * debian/watch: Update Debian version mangling.
+ * Do not use "Artistic" as short name for the license. (Closes: #524732)
+ * Use SDL Mixer backend to enable MIDI playback.
+ (Closes: #552564) (LP: #424404)
+ + MIDI playback needs a patch set, so suggest the "freepats" package.
+ * debian/control: Add DM-Upload-Allowed: yes.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Tue, 29 Dec 2009 00:22:27 +0900
+
+simutrans (102.2+svn2786-1) unstable; urgency=low
+
+ * New upstream release.
+ + Refresh patches.
+ + Update translations.
+ * debian/rules: Add get-orig-source target.
+ * debian/rules: Add update-translations target.
+ * debian/README.source: Document get-orig-source and update-translations
+ targets.
+ * Bump Standards-Version to 3.8.3 (no changes).
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Sun, 18 Oct 2009 15:29:14 +0900
+
+simutrans (102.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Refresh patches.
+ + Update translations.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Fri, 06 Mar 2009 20:40:03 +0100
+
+simutrans (101.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Clint Adams <schizo at debian.org> Sun, 01 Mar 2009 13:41:25 -0500
+
+simutrans (101.0-1) experimental; urgency=low
+
+ * New upstream release.
+ + Update translations.
+ * Require latest version of simutrans-pak64 (101.0).
+ * Refresh patches, remove those applied upstream.
+ * debian/rules: Add `-alpha on' when using convert to preserve transparency.
+ * debian/simutrans.desktop: Add Icon key (LP: #314093).
+ * Add patch revert-svn-1937.diff to continue using ~/.simutrans for
+ savegames. Document this in README.Debian.
+ * debian/copyright: Add additional copyright holders, move license text to
+ its own section.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Sun, 18 Jan 2009 19:46:52 +0100
+
+simutrans (100.0+ds1-4) unstable; urgency=low
+
+ * debian/rules: Remove `configure' target
+ * debian/control: Add `Depends: ${misc:Depends}' for simutrans-data
+ and simutrans-makeobj.
+ * Apply upstream fix for power-bridges on vertical slopes
+ (Closes: #507307)
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 15 Dec 2008 00:07:29 +0100
+
+simutrans (100.0+ds1-3) unstable; urgency=low
+
+ * config.diff: Use <endian.h> header to detect endianness
+ (thanks to Peter De Wachter)
+ * debian/watch: Remove "+ds1" from Debian version number
+ * Omit translations for be (Belaruskaja), cn (Sim. Chinese), id (Bahasa),
+ no (Norsk) because they are very incomplete or otherwise broken
+ (Closes: #481266)
+ * Fix makeobj portability issues (Closes: #493409)
+ + 01_png.patch: png_uint_32 might actually be 64bit on some archs
+ (thanks to Peter Green)
+ + 02_makeobj_fixes.patch, 03_makeobj_cleanup.patch: Add proper
+ serialization code instead of dumping in-memory objects
+ (thanks to Peter De Wachter)
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Tue, 19 Aug 2008 00:06:30 +0200
+
+simutrans (100.0+ds1-2) unstable; urgency=low
+
+ * Remove cast from `const char*' to `int' in simconvoi.cc
+ + new patch fix_casts.diff
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Wed, 02 Jul 2008 19:00:03 +0200
+
+simutrans (100.0+ds1-1) unstable; urgency=low
+
+ [ Ansgar Burchardt ]
+ * New Upstream release
+ + makeobj works on big-endian archs (Closes: #472326)
+ + fix crash when calling 'makeobj dump' (Closes: #473245)
+ + fix crash if starting_year is setto a low value
+ and crash in simcity.cc(stadt_t::gib_zufallspunkt)
+ (Closes: #481264)
+ * Repackage source
+ + Upstream relicensed simsys.h, sound/no_sound.cc under a free license
+ * Add debuging symbols to makeobj
+ * Link makeobj with g++ instead of ld (should fix build on mipsel)
+ * Use debhelper 7 to clean up debian/rules
+ * Move translations to debian/translations instead of a patch
+ * Use noopt, debug from DEB_BUILD_OPTIONS
+ * debian/control: Change Vcs-* fields to point to Git repository
+ * Bump Standards Version to 3.8.0
+ + Add debian/README.source
+ * Convert debian/copyright to proposed machine-readable format
+ * Use compiler flags passed by dpkg-buildpackage
+
+ [ Gonéri Le Bouder ]
+ * Update the copyright file
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Tue, 01 Jul 2008 22:11:28 +0200
+
+simutrans (99.18~0.svn1664-2) unstable; urgency=low
+
+ * Fix segfault on startup (Closes: #471244)
+ + new patch: fix-stdarg-calls
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 17 Mar 2008 12:13:40 +0100
+
+simutrans (99.18~0.svn1664-1) unstable; urgency=low
+
+ * Initial release (Closes: #437627)
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Fri, 29 Feb 2008 11:55:58 +0100
diff --cc debian/control
index db6974c,0000000..8a45431
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,59 -1,0 +1,58 @@@
+Source: simutrans
+Section: games
+Priority: extra
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders:
+ Clint Adams <clint at debian.org>,
+ Jörg Frings-Fürst <debian at jff-webhosting.net>
+Build-Depends:
+ debhelper (>= 9),
- imagemagick,
+ libbz2-dev,
+ libpng12-dev,
+ libsdl1.2-dev,
+ libsdl-mixer1.2-dev,
+ libssl-dev,
+ quilt,
+ zlib1g-dev
+Standards-Version: 3.9.6
+Homepage: http://www.simutrans.com/
+Vcs-Git: git://anonscm.debian.org/pkg-games/simutrans.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/simutrans.git
+
+Package: simutrans
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ simutrans-pak64 (>= 120.0.1),
+ simutrans-data (= ${source:Version})
+Suggests: freepats
+Description: transportation simulator
+ Simutrans is a free transportation simulator: The player operates a
+ transportation company and has to transport goods and passengers between
+ factories and different cities.
+
+Package: simutrans-data
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: transportation simulator (base data)
+ 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 base data.
+
+Package: simutrans-makeobj
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: data file compiler for Simutrans
+ 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 makeobj program needed to integrate new objects
+ in Simutrans.
diff --cc debian/pixmaps/simutrans.xpm
index 0000000,0000000..a3c1478
new file mode 100644
--- /dev/null
+++ b/debian/pixmaps/simutrans.xpm
@@@ -1,0 -1,0 +1,52 @@@
++/* XPM */
++static char *simutrans[] = {
++/* columns rows colors chars-per-pixel */
++"32 32 14 1 ",
++" c black",
++". c #200000",
++"X c #202000",
++"o c #600000",
++"O c #606040",
++"+ c #802000",
++"@ c #C02000",
++"# c #FF6000",
++"$ c #FFFF40",
++"% c #60A0FF",
++"& c #808080",
++"* c #C0C0FF",
++"= c white",
++"- c None",
++/* pixels */
++"------------%%-----%%-----------",
++"-----------%%%%---%%%%----------",
++"-----------%%%%---%%%%----------",
++"-----%%----%%%%%-%%%%%---%%-----",
++"----%%%%--%%%%%%%%%%%%%-%%%%----",
++"----%%%%%%%%%%%%%%%%%%%%%%%%%---",
++"--X-%%%%%%%%%%%%%%%%%%%%%%%%%---",
++"XXXX-%%%%%%%%-------%%%%%%%%----",
++"&&XX&.%%%%% X---------%%%%%-----",
++"O&&OO.%%%%X X--OO-----%%%%%----",
++"O%%%.%%%%O& OOOOOO----%%%%----",
++"%%%%%%%%OX*X*OOOOOO ---%%%%%---",
++"%%%%%%%O&&&XO**OO O ----%%%%%%%",
++"&%%%%%%OOO&XOOO &** O --%%%%%%%",
++"--&%%%%+OO&XO*O &*& &&OO %%%%%%%",
++"---%%%%@+O&XO*OOO&&*& &&OO &%%%-",
++"---%%%%@@@+oOOO OOO&&* O*& & %--",
++"-%%%%%%- at +## O& OOO&&&OO &OO -",
++"%%%%%%%%--o && OO O&&OO**O ",
++"%%%%%%%%---- =O && OO&OO&O ",
++"%%%%%%%%------@@=O && OO*&O ",
++"-%%--%%%%-------@@=O && &&O &",
++"------%%%%--------@@=O && OO $",
++"------%%%%%---------@@=O & @*",
++"----%%%%%%%%%------%%%@@ $ @@ ",
++"---%%%%%%%%%%%%%%%%%%%%% *@ --",
++"---%%%%%%%%%%%%%%%%%%%%%%% %---",
++"----%%%%--%%%%%%%%%%%%--%%%%..--",
++"-----%%----%%%%%%%%%%----%%---..",
++"----------%%%%%--%%%%%----------",
++"----------%%%%%--%%%%%----------",
++"-----------%%%----%%%-----------"
++};
diff --cc debian/rules
index 6224ef6,0000000..3ae6e28
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,48 -1,0 +1,50 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# debian/rules file for simutrans
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export VERBOSE = 1
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+export CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+export CCFLAGS = $(CFLAGS)
+export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
+export CXXFLAGS += -D_FORTIFY_SOURCE=2
+export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+
+%:
+ dh $@ --parallel
+
+override_dh_auto_build:
+ dh_auto_build
+ $(MAKE) -C makeobj
- convert simutrans.ico -alpha on debian/simutrans.xpm
+
+override_dh_auto_clean:
+ dh_quilt_patch
+ dh_auto_clean
+ $(MAKE) -C makeobj clean
+ $(RM) -r skin
+ $(RM) -r build
+
- override_dh_install:
++override_dh_install-arch:
+ dh_install
+ install -m 755 build/default/sim $(CURDIR)/debian/simutrans/usr/games/simutrans
+
++override_dh_install-indep:
++ dh_install
++
+override_dh_installchangelogs:
+ dh_installchangelogs simutrans/history.txt
+
+update-translations:
+ dh_testdir
+ wget --post-data "version=0&choice=all&submit=Export!" --delete-after "http://simutrans-germany.com/translator/script/main.php?page=wrap"
+ wget -N http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
+ unzip -o -d debian/translations language_pack-Base+texts.zip "*.tab"
+ $(RM) language_pack-Base+texts.zip
+
+get-orig-source:
+ uscan --verbose --download-current-version --force-download
diff --cc debian/simutrans.install
index e13743c,0000000..ca7713f
mode 100644,000000..100644
--- a/debian/simutrans.install
+++ b/debian/simutrans.install
@@@ -1,2 -1,0 +1,2 @@@
- debian/simutrans.xpm usr/share/pixmaps
++debian/pixmaps/simutrans.xpm usr/share/pixmaps
+debian/simutrans.desktop usr/share/applications
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git
More information about the Pkg-games-commits
mailing list