This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch quake
in repository game-data-packager.

commit 8803df59ed03b757c74894b2de88f2c7b661858c
Author: Simon McVittie <s...@debian.org>
Date:   Sun Sep 29 17:31:30 2013 +0100

    Generate recoloured icons for Quake mission packs
---
 .gitignore                |  4 +++
 Makefile                  | 64 ++++++++++++++++++++++++++++++++++++++++++++++-
 debian/changelog          |  6 +++++
 debian/quake.install      |  9 +++++++
 quake-armagon.desktop     |  2 +-
 quake-dissolution.desktop |  2 +-
 6 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c4dbfa8..a2e219f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 /32/
 /48/
 /256/
+/tmp-armagon.svg
+/tmp-dissolution.svg
 /quake
 /quake2
 /quake-server
@@ -11,4 +13,6 @@
 /quake.xpm
 /quake2.xpm
 /quake.svg
+/quake-armagon.svg
+/quake-dissolution.svg
 /quake2.svg
diff --git a/Makefile b/Makefile
index 3cc1614..6f53774 100644
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,32 @@ obj = \
        quake.xpm \
        quake2.xpm \
        16/quake.png \
+       16/quake-armagon.png \
+       16/quake-dissolution.png \
        16/quake2.png \
        22/quake.png \
+       22/quake-armagon.png \
+       22/quake-dissolution.png \
        22/quake2.png \
        24/quake.png \
+       24/quake-armagon.png \
+       24/quake-dissolution.png \
        24/quake2.png \
        32/quake.png \
+       32/quake-armagon.png \
+       32/quake-dissolution.png \
        32/quake2.png \
        48/quake.png \
+       48/quake-armagon.png \
+       48/quake-dissolution.png \
        48/quake2.png \
        256/quake.png \
+       256/quake-armagon.png \
+       256/quake-dissolution.png \
        256/quake2.png \
        quake.svg \
+       quake-armagon.svg \
+       quake-dissolution.svg \
        quake2.svg
 
 all: $(obj)
@@ -56,10 +70,28 @@ quake-server: quake.in
                < $< > $@
        chmod +x $@
 
+tmp-dissolution.svg: quake1+2.svg Makefile
+       sed -e 's/#c17d11/#999984/' \
+               -e 's/#d5b582/#dede95/' \
+               -e 's/#5f3b01/#403f31/' \
+               -e 's/#e9b96e/#dede95/' \
+               < $< > $@
+
+tmp-armagon.svg: quake1+2.svg Makefile
+       sed -e 's/#c17d11/#565248/' \
+               -e 's/#d5b582/#aba390/' \
+               -e 's/#5f3b01/#000000/' \
+               -e 's/#e9b96e/#aba390/' \
+               < $< > $@
+
 24/quake.png: 22/quake.png
        install -d 24
        convert -bordercolor Transparent -border 1x1 $< $@
 
+24/quake-%.png: 22/quake-%.png
+       install -d 24
+       convert -bordercolor Transparent -border 1x1 $< $@
+
 24/quake2.png: 22/quake2.png
        install -d 24
        convert -bordercolor Transparent -border 1x1 $< $@
@@ -75,6 +107,28 @@ quake-server: quake.in
                --export-png=$@ \
                $<
 
+%/quake-armagon.png: tmp-armagon.svg
+       install -d $*
+       inkscape \
+               --export-area=0:0:$*:$* \
+               --export-width=$* \
+               --export-height=$* \
+               --export-id=layer-quake-$* \
+               --export-id-only \
+               --export-png=$@ \
+               $<
+
+%/quake-dissolution.png: tmp-dissolution.svg
+       install -d $*
+       inkscape \
+               --export-area=0:0:$*:$* \
+               --export-width=$* \
+               --export-height=$* \
+               --export-id=layer-quake-$* \
+               --export-id-only \
+               --export-png=$@ \
+               $<
+
 %/quake2.png: quake1+2.svg
        install -d $*
        inkscape \
@@ -90,7 +144,7 @@ quake-server: quake.in
        convert $< $@
 
 clean: 
-       rm -f $(obj) tmp.svg
+       rm -f $(obj) tmp.svg tmp-*.svg
        rm -rf 16 22 24 32 48 256
 
 quake.svg: quake1+2.svg Makefile
@@ -101,6 +155,14 @@ quake.svg: quake1+2.svg Makefile
                tmp.svg
        rm -f tmp.svg
 
+quake-%.svg: tmp-%.svg Makefile
+       xmlstarlet ed -d "//*[local-name() = 'g' and @id != 'layer-quake-256']" 
< $< > tmp.svg
+       inkscape \
+               --export-area-page \
+               --export-plain-svg=$@ \
+               tmp.svg
+       rm -f tmp.svg
+
 quake2.svg: quake1+2.svg Makefile
        xmlstarlet ed -d "//*[local-name() = 'g' and @id != 
'layer-quake2-256']" < $< > tmp.svg
        inkscape \
diff --git a/debian/changelog b/debian/changelog
index 0a46bb8..4e398bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+quake (5) UNRELEASED; urgency=low
+
+  * Generate recoloured icons for Quake mission packs
+
+ -- Simon McVittie <s...@debian.org>  Sun, 29 Sep 2013 17:28:47 +0100
+
 quake (4) experimental; urgency=low
 
   * Add support for Quake II
diff --git a/debian/quake.install b/debian/quake.install
index dbb5030..9c8dcf3 100644
--- a/debian/quake.install
+++ b/debian/quake.install
@@ -5,9 +5,18 @@ quake-armagon.desktop /usr/share/applications
 quake-dissolution.desktop /usr/share/applications
 quake.xpm      /usr/share/pixmaps
 256/quake.png  /usr/share/icons/hicolor/256x256/apps
+256/quake.png  /usr/share/icons/hicolor/256x256/apps
 48/quake.png   /usr/share/icons/hicolor/48x48/apps
 32/quake.png   /usr/share/icons/hicolor/32x32/apps
 24/quake.png   /usr/share/icons/hicolor/24x24/apps
 22/quake.png   /usr/share/icons/hicolor/22x22/apps
 16/quake.png   /usr/share/icons/hicolor/16x16/apps
 quake.svg      /usr/share/icons/hicolor/scalable/apps
+256/quake-*.png /usr/share/icons/hicolor/256x256/apps
+256/quake-*.png /usr/share/icons/hicolor/256x256/apps
+48/quake-*.png /usr/share/icons/hicolor/48x48/apps
+32/quake-*.png /usr/share/icons/hicolor/32x32/apps
+24/quake-*.png /usr/share/icons/hicolor/24x24/apps
+22/quake-*.png /usr/share/icons/hicolor/22x22/apps
+16/quake-*.png /usr/share/icons/hicolor/16x16/apps
+quake-*.svg    /usr/share/icons/hicolor/scalable/apps
diff --git a/quake-armagon.desktop b/quake-armagon.desktop
index 85d151b..25f6cfd 100644
--- a/quake-armagon.desktop
+++ b/quake-armagon.desktop
@@ -3,7 +3,7 @@ Type=Application
 Version=1.0
 Name=Quake: Scourge of Armagon
 Comment=Mission Pack 1 for the classic first person shooter
-Icon=quake
+Icon=quake-armagon
 TryExec=/usr/share/games/quake/hipnotic-tryexec.sh
 Exec=/usr/games/quake -hipnotic
 Categories=Game;ActionGame;
diff --git a/quake-dissolution.desktop b/quake-dissolution.desktop
index b1cb396..02dbb62 100644
--- a/quake-dissolution.desktop
+++ b/quake-dissolution.desktop
@@ -3,7 +3,7 @@ Type=Application
 Version=1.0
 Name=Quake: Dissolution of Eternity
 Comment=Mission Pack 2 for the classic first person shooter
-Icon=quake
+Icon=quake-dissolution
 TryExec=/usr/share/games/quake/rogue-tryexec.sh
 Exec=/usr/games/quake -rogue
 Categories=Game;ActionGame;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/game-data-packager.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to