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

[Pino Toscano]

Author: pino
Date: 2013-04-07 11:08:41 +0000 (Sun, 07 Apr 2013)
New Revision: 19443

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/kipi-plugins-common.install
   kde-extras/digikam/trunk/debian/kipi-plugins.install
Log:
move the desktop files of kipi-plugins in kipi-plugins instead of kipi-plugins-common (#700404)


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-07 10:59:26 UTC (rev 19442)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-07 11:08:41 UTC (rev 19443)
@@ -35,6 +35,8 @@
     against kipi-plugins-common.
   * Centralise the enabling of the private kdegraphics libs, and proper set the
     conflicts according to it.
+  * Install all the desktop files of kipi-plugins in kipi-plugins instead of
+    kipi-plugins-common. (Closes: #700404)
 
  -- 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/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2013-04-07 10:59:26 UTC (rev 19442)
+++ kde-extras/digikam/trunk/debian/control	2013-04-07 11:08:41 UTC (rev 19443)
@@ -162,8 +162,8 @@
 Package: kipi-plugins
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kipi-plugins-common (= ${source:Version}), digikam-private-libs (= ${binary:Version})
-Breaks: digikam (<< 4:2.3.0-2~)
-Replaces: digikam (<< 4:2.3.0-2~)
+Breaks: digikam (<< 4:2.3.0-2~), kipi-plugins-common (<< 4:3.1.0-2~)
+Replaces: digikam (<< 4:2.3.0-2~), kipi-plugins-common (<< 4:3.1.0-2~)
 Recommends: konqueror, imagemagick, hugin, enblend, enfuse, minidnla
 Suggests: gallery, gimp, kmail, vorbis-tools
 Enhances: digikam, gwenview, kphotoalbum, showimg

Modified: kde-extras/digikam/trunk/debian/kipi-plugins-common.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2013-04-07 10:59:26 UTC (rev 19442)
+++ kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2013-04-07 11:08:41 UTC (rev 19443)
@@ -1,9 +1,3 @@
-usr/share/applications/kde4/dngconverter.desktop
-usr/share/applications/kde4/expoblending.desktop
-usr/share/applications/kde4/kipiplugins.desktop
-usr/share/applications/kde4/panoramagui.desktop
-usr/share/applications/kde4/photolayoutseditor.desktop
-usr/share/applications/kde4/scangui.desktop
 usr/share/doc/kde/HTML/en/kipi-plugins
 usr/share/icons/hicolor/*/actions/borderimages.*
 usr/share/icons/hicolor/*/actions/colorimages.*
@@ -43,6 +37,5 @@
 usr/share/kde4/apps/kipi/*.rc
 usr/share/kde4/apps/kipi/tips
 usr/share/kde4/apps/kipiplugin_*
-usr/share/kde4/services/kipiplugin_*
 usr/share/locale/*/LC_MESSAGES/kipiplugin*
 usr/share/templates

Modified: kde-extras/digikam/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.install	2013-04-07 10:59:26 UTC (rev 19442)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.install	2013-04-07 11:08:41 UTC (rev 19443)
@@ -6,3 +6,10 @@
 usr/bin/scangui
 usr/lib/kde4/kipi*
 usr/lib/libkipiplugins.so.* usr/lib/digikam/
+usr/share/applications/kde4/dngconverter.desktop
+usr/share/applications/kde4/expoblending.desktop
+usr/share/applications/kde4/kipiplugins.desktop
+usr/share/applications/kde4/panoramagui.desktop
+usr/share/applications/kde4/photolayoutseditor.desktop
+usr/share/applications/kde4/scangui.desktop
+usr/share/kde4/services/kipiplugin_*