From f6fcee16002770cc8a8c0485b9d8adc8647133b9 Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Tue, 30 Sep 2014 23:01:38 -0700
Subject: [PATCH] dist: new application icons and Makefile

Continuing the discussion started on GitHub over
2014-09-30T01:33:29Z!mikeonthecomputer@gmail.com, all desktop entries
now have unique icons. Keeping my own personal bias, stfkill3 is still
used for FreeDM, but the Debian choices for their own distro are used
for Phases 1 and 2.

Also, the icons are actually generated automatically now.
---
 Makefile          |  10 ++++++----
 dist/.gitignore   |   1 +
 dist/Makefile     |  18 ++++++++++++++++++
 dist/freedoom.png | Bin 592 -> 0 bytes
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 dist/Makefile
 delete mode 100644 dist/freedoom.png

diff --git a/Makefile b/Makefile
index 5f3d90e4..79eb9077 100644
--- a/Makefile
+++ b/Makefile
@@ -135,13 +135,15 @@ waddir?=/share/games/doom
 target=$(DESTDIR)$(prefix)
 
 %.6:
-	sed -e s/freedoom/$*/ dist/freedoom.adoc > dist/$*.adoc
-	a2x -f manpage dist/$*.adoc
+	$(MAKE) -C dist man-$*
+
+%.png:
+	$(MAKE) -C dist icon-$*
 
 # This is bad because it assumes the IWADs will always be defined like
 # this.  I just can't see another way to do it.  Fix later if possible.
 
-install-%: $(WADS)/%.wad %.6
+install-%: $(WADS)/%.wad %.6 %.png
 	install -d "$(target)$(bindir)"
 	install -m 755 dist/freedoom "$(target)$(bindir)/$*"
 	install -d "$(target)$(mandir)/man6"
@@ -153,7 +155,7 @@ install-%: $(WADS)/%.wad %.6
 	install -d "$(target)/share/appdata"
 	install -m 644 dist/$*.appdata.xml "$(target)/share/appdata"
 	install -d "$(target)/share/icons"
-	install -m 644 dist/freedoom.png "$(target)/share/icons/$*.png"
+	install -m 644 dist/$*.png "$(target)/share/icons/$*.png"
 
 uninstall-%:
 	rm "$(target)$(bindir)/$*"
diff --git a/dist/.gitignore b/dist/.gitignore
index 40340965..82eb2ec4 100644
--- a/dist/.gitignore
+++ b/dist/.gitignore
@@ -1,3 +1,4 @@
 *.6
+*.png
 freedm.adoc
 freedoom[12].adoc
diff --git a/dist/Makefile b/dist/Makefile
new file mode 100644
index 00000000..dbbfbfe1
--- /dev/null
+++ b/dist/Makefile
@@ -0,0 +1,18 @@
+man-%: freedoom.adoc
+	sed -e s/freedoom/$*/ freedoom.adoc > $*.adoc
+	a2x -f manpage $*.adoc
+
+icon-freedm:
+	convert -trim +repage -extent 32x32 -gravity center \
+	    -transparent \#00ffff -background \#00ffff \
+	    ../graphics/stfkill3.gif freedm.png
+
+icon-freedoom1:
+	convert -trim +repage -extent 48x48 -gravity center \
+	    -transparent \#00ffff -background \#00ffff \
+	    ../sprites/playa2a8.gif freedoom1.png
+
+icon-freedoom2:
+	convert -trim +repage -extent 64x64 -gravity center \
+	    -transparent \#00ffff -background \#00ffff \
+	    ../sprites/heada1.gif freedoom2.png
diff --git a/dist/freedoom.png b/dist/freedoom.png
deleted file mode 100644
index 492b3f36abcc0b8ed88e42d8c4d98f60c21d4032..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyoCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#9;Y0mg2mIKWKEz@W`IwKE0F&89|YLh*@cCLm6esXmHCaeh3)mlot>S7+1Z2b
z<&%?>v-$b6v$KnZh0Fc5%gf8#!;L3To;=&wcy_Y&Vr%Qw`OfRz-8XOEygNL6f3^4N
z?CjI0PhT!BzJ2@l{mIF%r%(UCxw)u9iyLSeb4ie2Fp&OLcH|zAVodUOcVSB7u1Nv1
z<2+p)Lo9mNUcMOgMuCUz!PEqYy7Okod;=r<HQ)cA5Lc4EG<NRCLw5{X`@g(*;BU8I
zDd5Cm62_s}qN}iIM)EU>^(ibaEFFy%8Ac3B=Yn_{j5@-$y<NbT!eFWNeCt`U2F87R
z5_}8YnLBD`%D&2*{cyI_f$J*$hs|Xr_OLzF-H|u_+JPjM8?{GMcXw4c&tNzs&5)#&
zk-PW18WUr_aRp0YY4)?UtI?)MbUnPzJoELL6`iIrnRh{|sM4vVylIP-vW4UuRJK0O
zw&|KF6aRSQsza$fGmn1BEzHe(b$a%yMS1+$X7BT^-8r+jI`oa6&&=xb?0eb4@AtlS
z{9*pLoN<q4S4F62^@7b#YJxsXS1?rvurw8YdbfNfhsxbMSsE!-6*W~gGq^;yD>xSZ
z|MTzTzZ(0sudM}yo;=;7bNc7fHLt4$H0GuW&-PFKyD`sULD9Rt^SwFk8w9+(R>sWd
c+rP^H<q4@-*RsRj0E3;u)78&qol`;+0L@43{r~^~