rev 19427 - kde-extras/digikam/trunk/debian

[Pino Toscano]

Author: pino
Date: 2013-04-06 23:49:54 +0000 (Sat, 06 Apr 2013)
New Revision: 19427

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/rules
Log:
improve way of skipping oxygen icons


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:47:05 UTC (rev 19426)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:49:54 UTC (rev 19427)
@@ -11,6 +11,8 @@
     - stop shipping development stuff: headers, cmake config files,
       pkg-config files, .so symlinks, static libs
     - install the libraries in a private /usr/lib/dikigam directory
+  * Instead of skipping oxygen icons installed in the global icon theme,
+    remove them from the destdir; this way we can spot them easily
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 07 Apr 2013 01:21:20 +0200
 

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-04-06 23:47:05 UTC (rev 19426)
+++ kde-extras/digikam/trunk/debian/rules	2013-04-06 23:49:54 UTC (rev 19427)
@@ -20,14 +20,14 @@
 	rm -r --verbose debian/tmp/usr/lib/pkgconfig
 	rm --verbose debian/tmp/usr/lib/*.so
 	rm --verbose debian/tmp/usr/lib/*.a
+	# remove potentially conflicting oxygen icons in global icon theme
+	rm -r --verbose debian/tmp/usr/share/icons/oxygen
 
-
 override_dh_installchangelogs:
 	dh_installchangelogs core/ChangeLog 
 
-# conflicts with oxygen-icon-theme package
 override_dh_install:
-	dh_install -Xmultithread -Xoxygen -XREADME.MACOSX --fail-missing
+	dh_install -Xmultithread -XREADME.MACOSX --fail-missing
 	# remove duplicate libkipiplugins copied also in digikam-private-libs
 	rm --verbose debian/digikam-private-libs/$(PRIVATE_LIBDIR)/libkipiplugins.so.*