From d8f93cb83eaba37dfeba8dbdf07b352d3fa559af Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 27 Jul 2013 17:54:06 +0200
Subject: [PATCH] Replace legacy application icon by new one

---
 src/ui/gui/app-icons/16x16/pspp.png | Bin 746 -> 0 bytes
 src/ui/gui/automake.mk              |   6 +-----
 src/ui/gui/icons/automake.mk        |   2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 src/ui/gui/app-icons/16x16/pspp.png

diff --git a/src/ui/gui/app-icons/16x16/pspp.png b/src/ui/gui/app-icons/16x16/pspp.png
deleted file mode 100644
index f8ed8bbbf6e761a8c9a05213a3c2cf9514de6900..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)eI9CBLg?Gp<)040(VJ7
zK~y-)b&_95Q(+j!pL5Pmb5kKuCv3@%a*z-y(*E4kjSwc&Qg0%58xe?I3E#Pix+%^9
z1+(a4bYm2CCAgvxLX43l22EwVIA;X8HTK6f=XTV&xvz_{19R)Udw=iqKHu|xd<_0`
zHa8<g*Yjv;q2PHAot>RZJsoorghFu=iDb)72C&;1a9ml&vMdBaQ0f|Jnnt#^!t%yO
z(!eZB(bs2%*=#ljD5Y>Zos!99f+&iLsWL1G0$i@wP}O5Y+|W>j$I}ak!(p&|J`bMf
zQ7V<nmsA?jXacIbU$Y~nw5m3n%}68?Mr{~mvpN92N?a%~*xv_qU9aNBVzJhsx3^od
zSPE6b<6{mhD|<+#a>!&dMjDI7QfmMJ!^1+&3JVKitgXf2@o0$0{~{KPK@`RM28uE!
z*=+R08YZMt6n=jiKmohERx~#^*Ei_uI-@Kv-<A6N8^ACngL}PyFg|XF+Z{k45XS22
zMs-Y0)5yu_KHpC=H}{dw&VHaipP!`DyQIP?rKB>$R16lqzvN&r47;NhH%I!U*=L{S
zYgf-g*AEa3M&NL?qNk@FOG}$*YHGsxShqAVa7i&%SpT76X4);W>?ur4ypr$VyDr7!
zIjpaTFf;9z7>389*N@TBix?WZAia6}O|DAt@X;5!t<8#HAcd)^L1}*8CwFwTV0$|W
zTYDpdffO!Z5uvIf92{`CG3dmD$x+65gWGpr&`2ah4i5|D$<t3X7R!=bV=w8DYuey*
z&%e@l@4wT%y+fj^Dggjf`4?u<Xe}a_iy@Z-Y&Hh2k;n4+a{@p)gC89w!EvV%jsC{Y
cP7(m{5Bt0#73`f+fB*mh07*qoM6N<$f{D0C)&Kwi

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 95f0a0fe90..b0eb0aeff3 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -107,10 +107,8 @@ install-lang:
 
 install-legacy-icons:
 	for size in 16x16 ; do \
-	  $(MKDIR_P) $(thetemedir)/$$size/$(thecontext) ; \
+	  $(MKDIR_P) $(thethemedir)/$$size/$(thecontext) ; \
           $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(thethemedir)/$$size/$(thecontext) ; \
-	  $(MKDIR_P) $(thethemedir)/$$size/apps ; \
-	  $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(thethemedir)/$$size/apps ; \
 	done 
 
 INSTALL_DATA_HOOKS += install-legacy-icons install-lang
@@ -118,7 +116,6 @@ INSTALL_DATA_HOOKS += install-legacy-icons install-lang
 uninstall-legacy-icons:
 	for size in 16x16 ; do \
           rm -r -f $(thethemedir)/$$size/$(thecontext); \
-          rm -f $(thethemedir)/$$size/apps/pspp.png; \
 	done 
 
 update-icon-cache:
@@ -130,7 +127,6 @@ UNINSTALL_DATA_HOOKS += uninstall-legacy-icons
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
-	$(top_srcdir)/src/ui/gui/app-icons/16x16/pspp.png \
 	$(top_srcdir)/src/ui/gui/pspp.lang \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk
index 2d304af02d..c2bc16bfd1 100644
--- a/src/ui/gui/icons/automake.mk
+++ b/src/ui/gui/icons/automake.mk
@@ -8,8 +8,8 @@ sizes=16x16 22x22  24x24 32x32 48x48 256x256
 
 install-ext-icons:
 	for context in apps mimetypes; do \
-		$(MKDIR_P) $(themedir)/$$size/$$context ; \
 		for size in $(sizes); do \
+		$(MKDIR_P) $(themedir)/$$size/$$context ; \
 			if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \
 				(test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
 				$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$context/$$size/* $(themedir)/$$size/$$context ; \
-- 
2.30.2