r13669 - packages/trunk/supertuxkart/debian

[Vincent Cheng]

Author: vincentc-guest
Date: 2012-06-04 02:20:35 +0000 (Mon, 04 Jun 2012)
New Revision: 13669

Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/rules
Log:
supertuxkart: Remove duplicate xpm icons


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2012-06-04 02:11:57 UTC (rev 13668)
+++ packages/trunk/supertuxkart/debian/changelog	2012-06-04 02:20:35 UTC (rev 13669)
@@ -1,3 +1,10 @@
+supertuxkart (0.7.3-3) UNRELEASED; urgency=low
+
+  * Hi-res png icon has been installed into /usr/share/pixmaps, so remove
+    duplicate xpm icons from the same directory.
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Sun, 03 Jun 2012 19:19:07 -0700
+
 supertuxkart (0.7.3-2) unstable; urgency=low
 
   * Switch buildsystem to cmake (upstream has deprecated their autotools

Modified: packages/trunk/supertuxkart/debian/rules
===================================================================
--- packages/trunk/supertuxkart/debian/rules	2012-06-04 02:11:57 UTC (rev 13668)
+++ packages/trunk/supertuxkart/debian/rules	2012-06-04 02:20:35 UTC (rev 13669)
@@ -33,15 +33,15 @@
 	# Remove unneeded launcher script in data directory
 	find $(CURDIR)/debian/tmp \( -iname "run_me.sh" \) -delete
 	
-	# Install xpm icons in /usr/share/pixmaps into /usr/share/icons/hicolor as
-	# well. Also install hi-res icon into /usr/share/pixmaps. LP: #937976
+	# Move xpm icons in /usr/share/pixmaps into /usr/share/icons/hicolor.
+	# Also install hi-res icon into /usr/share/pixmaps. LP: #937976
 	install -m 644 $(CURDIR)/debian/tmp/usr/share/games/supertuxkart/data/gui/karts.png \
 	$(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart.png
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps
-	install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_32.xpm \
+	mv -f $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_32.xpm \
 	$(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps/supertuxkart.xpm
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps
-	install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_64.xpm \
+	mv -f $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_64.xpm \
 	$(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps/supertuxkart.xpm
 	
 	dh_install