rev 18264 - kde-extras/kraft/trunk/debian

[Felix Geyer]

Author: debfx-guest
Date: 2010-06-04 17:51:05 +0000 (Fri, 04 Jun 2010)
New Revision: 18264

Added:
   kde-extras/kraft/trunk/debian/kraft.dirs
Modified:
   kde-extras/kraft/trunk/debian/changelog
   kde-extras/kraft/trunk/debian/rules
Log:
Install demand.png and alternative.png to private icons dir
to prevent possible file conflicts.


Modified: kde-extras/kraft/trunk/debian/changelog
===================================================================
--- kde-extras/kraft/trunk/debian/changelog	2010-06-04 17:17:43 UTC (rev 18263)
+++ kde-extras/kraft/trunk/debian/changelog	2010-06-04 17:51:05 UTC (rev 18264)
@@ -19,6 +19,8 @@
   * Add 02_fix_desktop_file.patch to remove duplicate "Encoding" entries.
   * Add Vcs fields in debian/control.
   * Add manpages for kraft and kplant.
+  * Install demand.png and alternative.png to private icons dir to prevent
+    possible file conflicts.
 
  -- Mark Purcell <msp at debian.org>  Sat, 08 May 2010 10:28:50 +1000
 

Added: kde-extras/kraft/trunk/debian/kraft.dirs
===================================================================
--- kde-extras/kraft/trunk/debian/kraft.dirs	                        (rev 0)
+++ kde-extras/kraft/trunk/debian/kraft.dirs	2010-06-04 17:51:05 UTC (rev 18264)
@@ -0,0 +1,2 @@
+/usr/share/kde4/apps/kraft/icons/hicolor/16x16/actions
+/usr/share/kde4/apps/kraft/icons/crystalsvg/16x16/actions

Modified: kde-extras/kraft/trunk/debian/rules
===================================================================
--- kde-extras/kraft/trunk/debian/rules	2010-06-04 17:17:43 UTC (rev 18263)
+++ kde-extras/kraft/trunk/debian/rules	2010-06-04 17:51:05 UTC (rev 18264)
@@ -5,3 +5,19 @@
 
 %:
 	dh --parallel --with kde $@
+
+override_dh_auto_install:
+	dh_auto_install
+
+	# move these icons to private icons folder to prevent possible conflicts
+	mv debian/kraft/usr/share/icons/hicolor/16x16/actions/demand.png \
+	    debian/kraft/usr/share/kde4/apps/kraft/icons/hicolor/16x16/actions
+	mv debian/kraft/usr/share/icons/hicolor/16x16/actions/alternative.png \
+	    debian/kraft/usr/share/kde4/apps/kraft/icons/hicolor/16x16/actions
+	rmdir debian/kraft/usr/share/icons/hicolor/16x16/actions
+
+	mv debian/kraft/usr/share/icons/crystalsvg/16x16/actions/demand.png \
+	    debian/kraft/usr/share/kde4/apps/kraft/icons/crystalsvg/16x16/actions
+	mv debian/kraft/usr/share/icons/crystalsvg/16x16/actions/alternative.png \
+	    debian/kraft/usr/share/kde4/apps/kraft/icons/crystalsvg/16x16/actions
+	rmdir debian/kraft/usr/share/icons/crystalsvg/16x16/actions