This is an automated email from the git hooks/post-receive script. jff-guest pushed a commit to branch master in repository simutrans.
commit 59583e6aa323db82ddc06769b1fa90d1254c2a43 Author: Jörg Frings-Fürst <[email protected]> Date: Tue Nov 17 21:57:17 2015 +0100 Move makeobj from /usr/games to /usr/lib/simutrans --- debian/changelog | 13 +++++++++- debian/control | 1 - debian/pixmaps/simutrans.xpm | 52 ++++++++++++++++++++++++++++++++++++++++ debian/rules | 1 - debian/simutrans-makeobj.dirs | 3 +-- debian/simutrans-makeobj.install | 2 +- debian/simutrans-makeobj.postrm | 15 ++++++++++++ debian/simutrans.install | 2 +- 8 files changed, 82 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index a635954..104c1cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +simutrans (120.1.1+repack-2) UNRELEASED; urgency=medium + + [ Jörg Frings-Fürst ] + * Move makeobj from /usr/games to /usr/lib/simutrans (Closes: #780724). + + -- Jörg Frings-Fürst <[email protected]> Tue, 17 Nov 2015 21:11:31 +0100 + simutrans (120.1.1+repack-1) unstable; urgency=medium [ Jörg Frings-Fürst ] @@ -33,8 +40,12 @@ simutrans (120.1.1+repack-1) unstable; urgency=medium * 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 <[email protected]> Sat, 14 Nov 2015 15:35:14 +0100 + -- Jörg Frings-Fürst <[email protected]> Sat, 14 Nov 2015 19:01:56 +0100 simutrans (111.3.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index db6974c..8a45431 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Uploaders: Jörg Frings-Fürst <[email protected]> Build-Depends: debhelper (>= 9), - imagemagick, libbz2-dev, libpng12-dev, libsdl1.2-dev, diff --git a/debian/pixmaps/simutrans.xpm b/debian/pixmaps/simutrans.xpm new file mode 100644 index 0000000..a3c1478 --- /dev/null +++ b/debian/pixmaps/simutrans.xpm @@ -0,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*& & %--", +"-%%%%%%-@+## O& OOO&&&OO &OO -", +"%%%%%%%%--o && OO O&&OO**O ", +"%%%%%%%%---- =O && OO&OO&O ", +"%%%%%%%%------@@=O && OO*&O ", +"-%%--%%%%-------@@=O && &&O &", +"------%%%%--------@@=O && OO $", +"------%%%%%---------@@=O & @*", +"----%%%%%%%%%------%%%@@ $ @@ ", +"---%%%%%%%%%%%%%%%%%%%%% *@ --", +"---%%%%%%%%%%%%%%%%%%%%%%% %---", +"----%%%%--%%%%%%%%%%%%--%%%%..--", +"-----%%----%%%%%%%%%%----%%---..", +"----------%%%%%--%%%%%----------", +"----------%%%%%--%%%%%----------", +"-----------%%%----%%%-----------" +}; diff --git a/debian/rules b/debian/rules index 77f4101..3ae6e28 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,6 @@ export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) 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 diff --git a/debian/simutrans-makeobj.dirs b/debian/simutrans-makeobj.dirs index 550c4fd..8bc298a 100644 --- a/debian/simutrans-makeobj.dirs +++ b/debian/simutrans-makeobj.dirs @@ -1,2 +1 @@ -usr/games - +usr/lib/simutrans diff --git a/debian/simutrans-makeobj.install b/debian/simutrans-makeobj.install index 53a35e5..31f147b 100644 --- a/debian/simutrans-makeobj.install +++ b/debian/simutrans-makeobj.install @@ -1 +1 @@ -build/default/makeobj/makeobj usr/games +build/default/makeobj/makeobj usr/lib/simutrans diff --git a/debian/simutrans-makeobj.postrm b/debian/simutrans-makeobj.postrm new file mode 100644 index 0000000..26275eb --- /dev/null +++ b/debian/simutrans-makeobj.postrm @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +# +# remove backup files +# New at 120.1.1+repack-2 +# Debian bug #780724 +# +if [ -e /usr/games/makeobj ] ; then + rm -f /usr/games/makeobj +fi + + +#DEBHELPER# diff --git a/debian/simutrans.install b/debian/simutrans.install index e13743c..ca7713f 100644 --- a/debian/simutrans.install +++ b/debian/simutrans.install @@ -1,2 +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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
