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

[Pino Toscano]

Author: pino
Date: 2013-04-07 10:26:52 +0000 (Sun, 07 Apr 2013)
New Revision: 19440

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam-data.install
   kde-extras/digikam/trunk/debian/kipi-plugins-common.install
   kde-extras/digikam/trunk/debian/showfoto.install
Log:
sort better some data files (icons, libkipi stuff)


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-07 08:55:24 UTC (rev 19439)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-07 10:26:52 UTC (rev 19440)
@@ -28,7 +28,9 @@
     no more shipped.
   * Remove digikamthemedesigner's man page, since that executable does not
     exist anymore.
-  * Update .install files.
+  * Update .install files, making sure to install libkipi data and digikam icon
+    in digikam-data, and showfoto icon with showfoto; add proper breaks/replaces
+    against kipi-plugins-common.
 
  -- 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 08:55:24 UTC (rev 19439)
+++ kde-extras/digikam/trunk/debian/control	2013-04-07 10:26:52 UTC (rev 19440)
@@ -115,6 +115,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, digikam-private-libs (= ${binary:Version})
 Recommends: dolphin, kipi-plugins
+Breaks: kipi-plugins-common (<< 4:3.1.0-2~)
+Replaces: kipi-plugins-common (<< 4:3.1.0-2~)
 Description: image viewer/editor for KDE
  showFoto is the standalone image editor of the digiKam project.
  .
@@ -136,6 +138,8 @@
 Package: digikam-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: kipi-plugins-common (<< 4:3.1.0-2~)
+Replaces: kipi-plugins-common (<< 4:3.1.0-2~)
 Conflicts: libkipi8, libkipi-data, libkipi-dev, libkexiv2-10, libkexiv2-data, libkdcraw20, libkdcraw-data, libksane0, libksane-dev
 Description: digiKam architecture-independant data
  Contains the significant amount of architecture-independent data that is

Modified: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install	2013-04-07 08:55:24 UTC (rev 19439)
+++ kde-extras/digikam/trunk/debian/digikam-data.install	2013-04-07 10:26:52 UTC (rev 19440)
@@ -1,7 +1,15 @@
 usr/share/kde4/apps/[a-j,l-r]*
+usr/share/kde4/apps/kipi/data/
 usr/share/kde4/apps/solid
 usr/share/kde4/services/digikam*
 usr/share/kde4/servicetypes
+# from libksane
+usr/share/icons/hicolor/*/actions/black-white.*
+usr/share/icons/hicolor/*/actions/color.*
+usr/share/icons/hicolor/*/actions/gray-scale.*
+usr/share/icons/hicolor/*/apps/digikam.*
+usr/share/icons/hicolor/*/apps/kdcraw.*
+usr/share/icons/hicolor/*/apps/kipi.*
 usr/share/locale/*/LC_MESSAGES/digikam.mo
 usr/share/locale/*/LC_MESSAGES/libkgeomap.mo
 usr/share/locale/*/LC_MESSAGES/libkipi.mo

Modified: kde-extras/digikam/trunk/debian/kipi-plugins-common.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2013-04-07 08:55:24 UTC (rev 19439)
+++ kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2013-04-07 10:26:52 UTC (rev 19440)
@@ -5,8 +5,43 @@
 usr/share/applications/kde4/photolayoutseditor.desktop
 usr/share/applications/kde4/scangui.desktop
 usr/share/doc/kde/HTML/en/kipi-plugins
-usr/share/icons
-usr/share/kde4/apps/kipi*
+usr/share/icons/hicolor/*/actions/borderimages.*
+usr/share/icons/hicolor/*/actions/colorimages.*
+usr/share/icons/hicolor/*/actions/convertimages.*
+usr/share/icons/hicolor/*/actions/debianscreenshots.*
+usr/share/icons/hicolor/*/actions/dlna.*
+usr/share/icons/hicolor/*/actions/effectimages.*
+usr/share/icons/hicolor/*/actions/expoblending.*
+usr/share/icons/hicolor/*/actions/facebook.*
+usr/share/icons/hicolor/*/actions/filterimages.*
+usr/share/icons/hicolor/*/actions/flash.*
+usr/share/icons/hicolor/*/actions/flickr.*
+usr/share/icons/hicolor/*/actions/flip-horizontal.*
+usr/share/icons/hicolor/*/actions/gallery.*
+usr/share/icons/hicolor/*/actions/gpsimagetag.*
+usr/share/icons/hicolor/*/actions/grayscaleconvert.*
+usr/share/icons/hicolor/*/actions/hq.*
+usr/share/icons/hicolor/*/actions/imageshack.*
+usr/share/icons/hicolor/*/actions/imgur.*
+usr/share/icons/hicolor/*/actions/metadataedit.*
+usr/share/icons/hicolor/*/actions/ogl.*
+usr/share/icons/hicolor/*/actions/panorama.*
+usr/share/icons/hicolor/*/actions/picasa.*
+usr/share/icons/hicolor/*/actions/piwigo.*
+usr/share/icons/hicolor/*/actions/rajce.*
+usr/share/icons/hicolor/*/actions/recompressimages.*
+usr/share/icons/hicolor/*/actions/renameimages.*
+usr/share/icons/hicolor/*/actions/resizeimages.*
+usr/share/icons/hicolor/*/actions/shwup.*
+usr/share/icons/hicolor/*/actions/slideshow.*
+usr/share/icons/hicolor/*/actions/smugmug.*
+usr/share/icons/hicolor/*/actions/timeadjust.*
+usr/share/icons/hicolor/*/actions/wikimedia.*
+usr/share/icons/hicolor/*/actions/zooomr.*
+usr/share/icons/hicolor/*/apps/photolayoutseditor.*
+usr/share/icons/hicolor/*/apps/dngconverter.*
+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*

Modified: kde-extras/digikam/trunk/debian/showfoto.install
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.install	2013-04-07 08:55:24 UTC (rev 19439)
+++ kde-extras/digikam/trunk/debian/showfoto.install	2013-04-07 10:26:52 UTC (rev 19440)
@@ -3,4 +3,5 @@
 usr/bin/showfoto
 usr/share/doc/kde/HTML/en/showfoto
 usr/share/applications/kde4/showfoto.desktop
+usr/share/icons/hicolor/*/apps/showfoto.*
 usr/share/kde4/apps/showfoto