This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake.
commit eb9547643e5c34dd7552dc962929595d9bf86d5c Author: Simon McVittie <[email protected]> Date: Thu Jan 22 08:57:18 2015 +0000 Add icons and .desktop files for the Quake II mission packs --- Makefile | 57 +++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 3 +++ debian/control | 17 ++++++++++++-- debian/quake2.install | 22 +++++++++--------- quake2-groundzero.desktop | 10 +++++++++ quake2-reckoning.desktop | 10 +++++++++ 6 files changed, 106 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 43defe2..4aa848f 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,14 @@ obj = \ build/24/quake-armagon.png \ build/24/quake-dissolution.png \ build/24/quake2.png \ + build/24/quake2-reckoning.png \ + build/24/quake2-groundzero.png \ build/quake.svg \ build/quake-armagon.svg \ build/quake-dissolution.svg \ build/quake2.svg \ + build/quake2-reckoning.svg \ + build/quake2-groundzero.svg \ build/quake3.png \ build/quake3.xpm \ build/quake332.xpm \ @@ -29,6 +33,8 @@ obj = \ $(patsubst %,build/%/quake-armagon.png,$(layer_sizes)) \ $(patsubst %,build/%/quake-dissolution.png,$(layer_sizes)) \ $(patsubst %,build/%/quake2.png,$(layer_sizes)) \ + $(patsubst %,build/%/quake2-reckoning.png,$(layer_sizes)) \ + $(patsubst %,build/%/quake2-groundzero.png,$(layer_sizes)) \ $(NULL) all: $(obj) @@ -103,6 +109,22 @@ build/tmp-armagon.svg: quake1+2.svg Makefile -e 's/#e9b96e/#aba390/' \ < $< > $@ +build/tmp-reckoning.svg: quake1+2.svg Makefile + install -d build + sed -e 's/#3a5a1e/#999984/' \ + -e 's/#73ae3a/#eeeeec/' \ + -e 's/#8ae234/#eeeeec/' \ + -e 's/#132601/#233436/' \ + < $< > $@ + +build/tmp-groundzero.svg: quake1+2.svg Makefile + install -d build + sed -e 's/#3a5a1e/#ce5c00/' \ + -e 's/#73ae3a/#fce94f/' \ + -e 's/#8ae234/#fce94f/' \ + -e 's/#132601/#cc0000/' \ + < $< > $@ + build/24/quake.png: build/22/quake.png install -d build/24 convert -bordercolor Transparent -border 1x1 $< $@ @@ -115,6 +137,10 @@ build/24/quake2.png: build/22/quake2.png install -d build/24 convert -bordercolor Transparent -border 1x1 $< $@ +build/24/quake2-%.png: build/22/quake2-%.png + install -d build/24 + convert -bordercolor Transparent -border 1x1 $< $@ + $(patsubst %,build/%/quake.png,$(layer_sizes)): build/%/quake.png: quake1+2.svg install -d build/$* inkscape \ @@ -159,6 +185,28 @@ $(patsubst %,build/%/quake2.png,$(layer_sizes)): build/%/quake2.png: quake1+2.sv --export-png=$@ \ $< +$(patsubst %,build/%/quake2-reckoning.png,$(layer_sizes)): build/%/quake2-reckoning.png: build/tmp-reckoning.svg + install -d build/$* + inkscape \ + --export-area=0:0:$*:$* \ + --export-width=$* \ + --export-height=$* \ + --export-id=layer-quake2-$* \ + --export-id-only \ + --export-png=$@ \ + $< + +$(patsubst %,build/%/quake2-groundzero.png,$(layer_sizes)): build/%/quake2-groundzero.png: build/tmp-groundzero.svg + install -d build/$* + inkscape \ + --export-area=0:0:$*:$* \ + --export-width=$* \ + --export-height=$* \ + --export-id=layer-quake2-$* \ + --export-id-only \ + --export-png=$@ \ + $< + build/%.xpm: build/32/%.png install -d build convert $< $@ @@ -193,6 +241,15 @@ build/quake2.svg: quake1+2.svg Makefile tmp.svg rm -f tmp.svg +build/quake2-%.svg: build/tmp-%.svg Makefile + install -d build + xmlstarlet ed -d "//*[local-name() = 'g' and @id != 'layer-quake2-256']" < $< > tmp.svg + inkscape \ + --export-area-page \ + --export-plain-svg=$@ \ + tmp.svg + rm -f tmp.svg + build/quake3.png: quake3-tango.xcf install -d build xcf2png -o $@ $< diff --git a/debian/changelog b/debian/changelog index dcbb5b1..0c7e978 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ quake (9) UNRELEASED; urgency=medium * quake3.desktop: describe Q3 as an ActionGame, not an ArcadeGame * Install the Q3 icon to the freedesktop.org icon path + * Add recoloured icons and desktop files for the Quake II mission packs + (requires quake2-reckoning and/or quake2-groundzero from + game-data-packager 39) -- Simon McVittie <[email protected]> Tue, 20 Jan 2015 08:57:12 +0000 diff --git a/debian/control b/debian/control index 2af5b32..6cfaede 100644 --- a/debian/control +++ b/debian/control @@ -58,8 +58,13 @@ Architecture: all Depends: quake2-full-data | quake2-demo-data | game-data-packager (>= 34), yamagi-quake2 | quake2-engine, ${misc:Depends} -Suggests: quake2-music -Recommends: x11-utils | zenity | kde-baseapps-bin +Suggests: + quake2-music, + quake2-reckoning, + quake2-groundzero, +Recommends: + game-data-packager (>= 39), + x11-utils | zenity | kde-baseapps-bin, Description: classic science-fiction-themed first person shooter Quake II is a classic first-person shooter game by id Software, released in 1997. This package contains a launcher script and menu @@ -69,6 +74,11 @@ Description: classic science-fiction-themed first person shooter non-distributable packages by using the game-data-packager package: either quake2-full-data or quake2-demo-data. Creating quake2-full-data requires data files from a Quake II installation or CD-ROM. + . + game-data-packager (>= 39) can also produce packages for the offical mission + packs The Reckoning (developed by Xatrix Entertainment) and Ground Zero + (developed by Rogue Entertainment). Additional menu entries should + appear automatically if those expansions are installed. Package: quake2-server Architecture: all @@ -76,6 +86,9 @@ Depends: adduser, quake2-full-data | quake2-demo-data | game-data-packager (>= 34), yamagi-quake2-core | quake2-engine-server, ${misc:Depends} +Suggests: + quake2-reckoning, + quake2-groundzero, Description: dedicated server for Quake II This package contains a launcher script and init script to run a Quake II server automatically, with any suitable engine. diff --git a/debian/quake2.install b/debian/quake2.install index 6536085..009e6f8 100644 --- a/debian/quake2.install +++ b/debian/quake2.install @@ -1,11 +1,11 @@ -build/16/quake2.png /usr/share/icons/hicolor/16x16/apps -build/22/quake2.png /usr/share/icons/hicolor/22x22/apps -build/24/quake2.png /usr/share/icons/hicolor/24x24/apps -build/256/quake2.png /usr/share/icons/hicolor/256x256/apps -build/32/quake2.png /usr/share/icons/hicolor/32x32/apps -build/48/quake2.png /usr/share/icons/hicolor/48x48/apps -build/quake2 /usr/games -build/quake2.svg /usr/share/icons/hicolor/scalable/apps -build/quake2.xpm /usr/share/pixmaps -need-data.sh /usr/share/games/quake2 -quake2.desktop /usr/share/applications +build/16/quake2*.png usr/share/icons/hicolor/16x16/apps +build/22/quake2*.png usr/share/icons/hicolor/22x22/apps +build/24/quake2*.png usr/share/icons/hicolor/24x24/apps +build/256/quake2*.png usr/share/icons/hicolor/256x256/apps +build/32/quake2*.png usr/share/icons/hicolor/32x32/apps +build/48/quake2*.png usr/share/icons/hicolor/48x48/apps +build/quake2 usr/games +build/quake2*.svg usr/share/icons/hicolor/scalable/apps +build/quake2*.xpm usr/share/pixmaps +need-data.sh usr/share/games/quake2 +quake2*.desktop usr/share/applications diff --git a/quake2-groundzero.desktop b/quake2-groundzero.desktop new file mode 100644 index 0000000..c9a76a5 --- /dev/null +++ b/quake2-groundzero.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Quake II MP2: Ground Zero +Comment=Mission Pack 2 for the classic first person shooter +Icon=quake2-groundzero +TryExec=/usr/share/games/quake2/quake2-groundzero +Exec=/usr/games/quake2 +set game rogue +Categories=Game;ActionGame; +Keywords=first person shooter;fps;3d;deathmatch;rogue entertainment;mission pack 2; diff --git a/quake2-reckoning.desktop b/quake2-reckoning.desktop new file mode 100644 index 0000000..cf99cd4 --- /dev/null +++ b/quake2-reckoning.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Quake II MP1: The Reckoning +Comment=Mission Pack 1 for the classic first person shooter +Icon=quake2-reckoning +TryExec=/usr/share/games/quake2/quake2-reckoning +Exec=/usr/games/quake2 +set game xatrix +Categories=Game;ActionGame; +Keywords=first person shooter;fps;3d;deathmatch;xatrix entertainment;mission pack 1; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
