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 4c125d5afdd35dfe478e9b32f5cf1975ffdbbee8 Author: Simon McVittie <s...@debian.org> Date: Wed Oct 9 22:55:01 2013 +0100 Put built files in build/ --- .gitignore | 19 +------ Makefile | 131 +++++++++++++++++++++++-------------------- debian/changelog | 1 + debian/quake-server.install | 2 +- debian/quake.install | 40 ++++++------- debian/quake2-server.install | 2 +- debian/quake2.install | 22 ++++---- 7 files changed, 105 insertions(+), 112 deletions(-) diff --git a/.gitignore b/.gitignore index a2e219f..84c048a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1 @@ -/16/ -/22/ -/24/ -/32/ -/48/ -/256/ -/tmp-armagon.svg -/tmp-dissolution.svg -/quake -/quake2 -/quake-server -/quake2-server -/quake.xpm -/quake2.xpm -/quake.svg -/quake-armagon.svg -/quake-dissolution.svg -/quake2.svg +/build/ diff --git a/Makefile b/Makefile index 6f53774..9d7c9b9 100644 --- a/Makefile +++ b/Makefile @@ -1,44 +1,45 @@ # Makefile - used for building icon obj = \ - quake \ - quake2 \ - quake-server \ - quake2-server \ - 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 + build/quake \ + build/quake2 \ + build/quake-server \ + build/quake2-server \ + build/quake.xpm \ + build/quake2.xpm \ + build/16/quake.png \ + build/16/quake-armagon.png \ + build/16/quake-dissolution.png \ + build/16/quake2.png \ + build/22/quake.png \ + build/22/quake-armagon.png \ + build/22/quake-dissolution.png \ + build/22/quake2.png \ + build/24/quake.png \ + build/24/quake-armagon.png \ + build/24/quake-dissolution.png \ + build/24/quake2.png \ + build/32/quake.png \ + build/32/quake-armagon.png \ + build/32/quake-dissolution.png \ + build/32/quake2.png \ + build/48/quake.png \ + build/48/quake-armagon.png \ + build/48/quake-dissolution.png \ + build/48/quake2.png \ + build/256/quake.png \ + build/256/quake-armagon.png \ + build/256/quake-dissolution.png \ + build/256/quake2.png \ + build/quake.svg \ + build/quake-armagon.svg \ + build/quake-dissolution.svg \ + build/quake2.svg all: $(obj) -quake: quake.in +build/quake: quake.in + install -d build sed -e 's/@self@/quake/g' \ -e 's/@role@/client/g' \ -e 's/@options@//g' \ @@ -46,7 +47,8 @@ quake: quake.in < $< > $@ chmod +x $@ -quake2: quake2.in +build/quake2: quake2.in + install -d build sed -e 's/@self@/quake2/g' \ -e 's/@role@/client/g' \ -e 's/@options@//g' \ @@ -54,7 +56,8 @@ quake2: quake2.in < $< > $@ chmod +x $@ -quake2-server: quake2.in +build/quake2-server: quake2.in + install -d build sed -e 's/@self@/quake2-server/g' \ -e 's/@role@/dedicated server/g' \ -e 's/@options@/+set dedicated 1/g' \ @@ -62,7 +65,8 @@ quake2-server: quake2.in < $< > $@ chmod +x $@ -quake-server: quake.in +build/quake-server: quake.in + install -d build sed -e 's/@self@/quake-server/g' \ -e 's/@role@/server/g' \ -e 's/@options@/-dedicated/g' \ @@ -70,34 +74,36 @@ quake-server: quake.in < $< > $@ chmod +x $@ -tmp-dissolution.svg: quake1+2.svg Makefile +build/tmp-dissolution.svg: quake1+2.svg Makefile + install -d build sed -e 's/#c17d11/#999984/' \ -e 's/#d5b582/#dede95/' \ -e 's/#5f3b01/#403f31/' \ -e 's/#e9b96e/#dede95/' \ < $< > $@ -tmp-armagon.svg: quake1+2.svg Makefile +build/tmp-armagon.svg: quake1+2.svg Makefile + install -d build 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 +build/24/quake.png: build/22/quake.png + install -d build/24 convert -bordercolor Transparent -border 1x1 $< $@ -24/quake-%.png: 22/quake-%.png - install -d 24 +build/24/quake-%.png: build/22/quake-%.png + install -d build/24 convert -bordercolor Transparent -border 1x1 $< $@ -24/quake2.png: 22/quake2.png - install -d 24 +build/24/quake2.png: build/22/quake2.png + install -d build/24 convert -bordercolor Transparent -border 1x1 $< $@ -%/quake.png: quake1+2.svg - install -d $* +build/%/quake.png: quake1+2.svg + install -d build/$* inkscape \ --export-area=0:0:$*:$* \ --export-width=$* \ @@ -107,8 +113,8 @@ tmp-armagon.svg: quake1+2.svg Makefile --export-png=$@ \ $< -%/quake-armagon.png: tmp-armagon.svg - install -d $* +build/%/quake-armagon.png: build/tmp-armagon.svg + install -d build/$* inkscape \ --export-area=0:0:$*:$* \ --export-width=$* \ @@ -118,8 +124,8 @@ tmp-armagon.svg: quake1+2.svg Makefile --export-png=$@ \ $< -%/quake-dissolution.png: tmp-dissolution.svg - install -d $* +build/%/quake-dissolution.png: build/tmp-dissolution.svg + install -d build/$* inkscape \ --export-area=0:0:$*:$* \ --export-width=$* \ @@ -129,8 +135,8 @@ tmp-armagon.svg: quake1+2.svg Makefile --export-png=$@ \ $< -%/quake2.png: quake1+2.svg - install -d $* +build/%/quake2.png: quake1+2.svg + install -d build/$* inkscape \ --export-area=0:0:$*:$* \ --export-width=$* \ @@ -140,14 +146,15 @@ tmp-armagon.svg: quake1+2.svg Makefile --export-png=$@ \ $< -%.xpm: 32/%.png +build/%.xpm: build/32/%.png + install -d build convert $< $@ -clean: - rm -f $(obj) tmp.svg tmp-*.svg - rm -rf 16 22 24 32 48 256 +clean: + rm -rf build -quake.svg: quake1+2.svg Makefile +build/quake.svg: quake1+2.svg Makefile + install -d build xmlstarlet ed -d "//*[local-name() = 'g' and @id != 'layer-quake-256']" < $< > tmp.svg inkscape \ --export-area-page \ @@ -155,7 +162,8 @@ quake.svg: quake1+2.svg Makefile tmp.svg rm -f tmp.svg -quake-%.svg: tmp-%.svg Makefile +build/quake-%.svg: build/tmp-%.svg Makefile + install -d build xmlstarlet ed -d "//*[local-name() = 'g' and @id != 'layer-quake-256']" < $< > tmp.svg inkscape \ --export-area-page \ @@ -163,7 +171,8 @@ quake-%.svg: tmp-%.svg Makefile tmp.svg rm -f tmp.svg -quake2.svg: quake1+2.svg Makefile +build/quake2.svg: quake1+2.svg Makefile + install -d build xmlstarlet ed -d "//*[local-name() = 'g' and @id != 'layer-quake2-256']" < $< > tmp.svg inkscape \ --export-area-page \ diff --git a/debian/changelog b/debian/changelog index 4e398bc..543d896 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ quake (5) UNRELEASED; urgency=low * Generate recoloured icons for Quake mission packs + * Put built files in build/ -- Simon McVittie <s...@debian.org> Sun, 29 Sep 2013 17:28:47 +0100 diff --git a/debian/quake-server.install b/debian/quake-server.install index d6292bb..2c8e03a 100644 --- a/debian/quake-server.install +++ b/debian/quake-server.install @@ -1,2 +1,2 @@ -quake-server /usr/games +build/quake-server /usr/games debian/server.cfg /etc/quake-server diff --git a/debian/quake.install b/debian/quake.install index 9c8dcf3..9866429 100644 --- a/debian/quake.install +++ b/debian/quake.install @@ -1,22 +1,22 @@ -quake /usr/games -need-data.sh /usr/share/games/quake -quake.desktop /usr/share/applications +build/quake /usr/games +need-data.sh /usr/share/games/quake +quake.desktop /usr/share/applications 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 +build/quake.xpm /usr/share/pixmaps +build/256/quake.png /usr/share/icons/hicolor/256x256/apps +build/256/quake.png /usr/share/icons/hicolor/256x256/apps +build/48/quake.png /usr/share/icons/hicolor/48x48/apps +build/32/quake.png /usr/share/icons/hicolor/32x32/apps +build/24/quake.png /usr/share/icons/hicolor/24x24/apps +build/22/quake.png /usr/share/icons/hicolor/22x22/apps +build/16/quake.png /usr/share/icons/hicolor/16x16/apps +build/quake.svg /usr/share/icons/hicolor/scalable/apps +build/256/quake-*.png /usr/share/icons/hicolor/256x256/apps +build/256/quake-*.png /usr/share/icons/hicolor/256x256/apps +build/48/quake-*.png /usr/share/icons/hicolor/48x48/apps +build/32/quake-*.png /usr/share/icons/hicolor/32x32/apps +build/24/quake-*.png /usr/share/icons/hicolor/24x24/apps +build/22/quake-*.png /usr/share/icons/hicolor/22x22/apps +build/16/quake-*.png /usr/share/icons/hicolor/16x16/apps +build/quake-*.svg /usr/share/icons/hicolor/scalable/apps diff --git a/debian/quake2-server.install b/debian/quake2-server.install index f45034d..1932242 100644 --- a/debian/quake2-server.install +++ b/debian/quake2-server.install @@ -1,3 +1,3 @@ -quake2-server /usr/games +build/quake2-server /usr/games debian/q2/debian_server.cfg /etc/quake2-server debian/q2/demo/debian_server.cfg /etc/quake2-server/demo diff --git a/debian/quake2.install b/debian/quake2.install index 9592bae..f60b593 100644 --- a/debian/quake2.install +++ b/debian/quake2.install @@ -1,11 +1,11 @@ -quake2 /usr/games -need-data.sh /usr/share/games/quake2 -quake2.desktop /usr/share/applications -quake2.xpm /usr/share/pixmaps -256/quake2.png /usr/share/icons/hicolor/256x256/apps -48/quake2.png /usr/share/icons/hicolor/48x48/apps -32/quake2.png /usr/share/icons/hicolor/32x32/apps -24/quake2.png /usr/share/icons/hicolor/24x24/apps -22/quake2.png /usr/share/icons/hicolor/22x22/apps -16/quake2.png /usr/share/icons/hicolor/16x16/apps -quake2.svg /usr/share/icons/hicolor/scalable/apps +build/quake2 /usr/games +need-data.sh /usr/share/games/quake2 +quake2.desktop /usr/share/applications +build/quake2.xpm /usr/share/pixmaps +build/256/quake2.png /usr/share/icons/hicolor/256x256/apps +build/48/quake2.png /usr/share/icons/hicolor/48x48/apps +build/32/quake2.png /usr/share/icons/hicolor/32x32/apps +build/24/quake2.png /usr/share/icons/hicolor/24x24/apps +build/22/quake2.png /usr/share/icons/hicolor/22x22/apps +build/16/quake2.png /usr/share/icons/hicolor/16x16/apps +build/quake2.svg /usr/share/icons/hicolor/scalable/apps -- 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