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

[José Manuel Santamaría Lema]

Author: santa-guest
Date: 2011-12-10 00:06:37 +0000 (Sat, 10 Dec 2011)
New Revision: 19021

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/digikam.manpages
   kde-extras/digikam/trunk/debian/kipi-plugins-common.install
   kde-extras/digikam/trunk/debian/kipi-plugins.install
Log:
Fix digikam, kipi-plugins, and kipi-plugins-common installed files.


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2011-12-07 14:19:34 UTC (rev 19020)
+++ kde-extras/digikam/trunk/debian/changelog	2011-12-10 00:06:37 UTC (rev 19021)
@@ -1,3 +1,14 @@
+digikam (4:2.3.0-2) UNRELEASED; urgency=low
+
+  [ José Manuel Santamaría Lema ]
+  * Fix digikam, kipi-plugins, and kipi-plugins-common installed files:
+    - In the previous version we were installing in digikam files which belongs
+      to kipi-plugins. (Closes: #651484)
+    - kipi-plugins and kipi-plugins-common Breaks/Replaces digikam
+      (<< 4:2.3.0-2~).
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 09 Dec 2011 02:47:37 +0100
+
 digikam (4:2.3.0-1) experimental; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2011-12-07 14:19:34 UTC (rev 19020)
+++ kde-extras/digikam/trunk/debian/control	2011-12-10 00:06:37 UTC (rev 19021)
@@ -139,6 +139,8 @@
 Package: kipi-plugins
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kipi-plugins-common (= ${source:Version})
+Breaks: digikam (<< 4:2.3.0-2~)
+Replaces: digikam (<< 4:2.3.0-2~)
 Recommends: graphicsmagick-imagemagick-compat (>= 1.1.7) | imagemagick (>= 5.4.8), konqueror, hugin, enblend, enfuse
 Suggests: gallery, gimp, kmail, vorbis-tools
 Enhances: digikam, gwenview, kphotoalbum, showimg
@@ -196,6 +198,8 @@
 Package: kipi-plugins-common
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: digikam (<< 4:2.3.0-2~)
+Replaces: digikam (<< 4:2.3.0-2~)
 Description: kipi-plugins architecture-independent data
  KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
  common plugin structure for digiKam, KPhotoAlbum (formerly known as

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2011-12-07 14:19:34 UTC (rev 19020)
+++ kde-extras/digikam/trunk/debian/digikam.install	2011-12-10 00:06:37 UTC (rev 19021)
@@ -1,20 +1,22 @@
 debian/xpm.d/digikam-16.xpm usr/share/pixmaps/
 debian/xpm.d/digikam.xpm usr/share/pixmaps/
-usr/bin/[a-r]*
-usr/bin/scangui
+usr/bin/cleanup_digikamdb
+usr/bin/digikam
+usr/bin/digitaglinktree
+usr/bin/libkgeomap_demo
 usr/include
+usr/lib/cmake
+usr/lib/kde4/digikam*
+usr/lib/kde4/kio*
+usr/lib/kde4/libexec
+usr/lib/libPropertyBrowser*
 usr/lib/libdigikam*
 usr/lib/libkface*
 usr/lib/libkgeomap*
 usr/lib/libkvkontakte*
 usr/lib/libmedia*
-usr/lib/libPropertyBrowser*
-usr/lib/kde4/digikam*
-usr/lib/kde4/kio*
-usr/lib/kde4/libexec
 usr/lib/pkgconfig
-usr/share/applications/kde4/[a-r]*
-usr/share/applications/kde4/scangui.desktop
+usr/share/applications/kde4/digikam.desktop
 usr/share/kde4/config.kcfg/PLEConfigSkeleton.kcfgc
-usr/share/man/man1
-usr/lib/cmake
+usr/share/man/man1/cleanup_digikamdb.1
+usr/share/man/man1/digitaglinktree.1

Modified: kde-extras/digikam/trunk/debian/digikam.manpages
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.manpages	2011-12-07 14:19:34 UTC (rev 19020)
+++ kde-extras/digikam/trunk/debian/digikam.manpages	2011-12-10 00:06:37 UTC (rev 19021)
@@ -1,3 +1,2 @@
 debian/digikam.manpage
 debian/digikamthemedesigner.manpage
-debian/tmp/usr/share/man/man1/*

Modified: kde-extras/digikam/trunk/debian/kipi-plugins-common.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2011-12-07 14:19:34 UTC (rev 19020)
+++ kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2011-12-10 00:06:37 UTC (rev 19021)
@@ -1,6 +1,12 @@
+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
-usr/share/doc/kde/HTML/en/kipi-plugins
+usr/share/kde4/apps/kipi*
 usr/share/kde4/apps/kipiplugin_*
 usr/share/kde4/services/kipiplugin_*
 usr/share/locale/*/LC_MESSAGES/kipiplugin*
-usr/share/kde4/apps/kipi*

Modified: kde-extras/digikam/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.install	2011-12-07 14:19:34 UTC (rev 19020)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.install	2011-12-10 00:06:37 UTC (rev 19021)
@@ -1,2 +1,8 @@
+usr/bin/dngconverter
+usr/bin/dnginfo
+usr/bin/expoblending
+usr/bin/panoramagui
+usr/bin/photolayoutseditor
+usr/bin/scangui
+usr/lib/kde4/kipi*
 usr/lib/libkipi*
-usr/lib/kde4/kipi*