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

[Pino Toscano]

Author: pino
Date: 2013-04-06 23:36:25 +0000 (Sat, 06 Apr 2013)
New Revision: 19423

Added:
   kde-extras/digikam/trunk/debian/digikam-private-libs.install
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/kipi-plugins.install
Log:
split the libraries in an own digikam-private-libs


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:27:11 UTC (rev 19422)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:36:25 UTC (rev 19423)
@@ -5,6 +5,8 @@
     - drop obsolete: autotools-dev, chrpath, libltdl3-dev
   * Add ${perl:Depends} as digikam dependency.
   * Remove ${shlibs:Depends} from digikam-data's dependencies.
+  * Reduce the conflicts between what digikam ships and the rest of the world:
+    - split the libraries in an own digikam-private-libs
 
  -- 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-06 23:27:11 UTC (rev 19422)
+++ kde-extras/digikam/trunk/debian/control	2013-04-06 23:36:25 UTC (rev 19423)
@@ -39,9 +39,19 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/digikam/trunk/
 Homepage: http://www.digikam.org
 
+Package: digikam-private-libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: private libraries for digiKam and kipi plugins
+ This package contains private libraries to be used by digikam and
+ kipi-plugins.
+ .
+ This has no use for anything else than digikam, since the libraries are
+ installed in a private library path.
+
 Package: digikam
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, libqt4-sql-sqlite, digikam-data (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, digikam-private-libs (= ${binary:Version}), libqt4-sql-sqlite, digikam-data (= ${source:Version})
 Recommends: www-browser, kipi-plugins, mplayerthumbs
 Suggests: digikam-doc
 Conflicts: libkipi8, libkipi-data, libkipi-dev, libkexiv2-10, libkexiv2-data, libkdcraw20, libkdcraw-data, libksane0, libksane-dev
@@ -100,7 +110,7 @@
 
 Package: showfoto
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, digikam (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, digikam-private-libs (= ${binary:Version})
 Recommends: dolphin, kipi-plugins
 Description: image viewer/editor for KDE
  showFoto is the standalone image editor of the digiKam project.
@@ -144,7 +154,7 @@
 
 Package: kipi-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kipi-plugins-common (= ${source:Version})
+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~)
 Recommends: konqueror, imagemagick, hugin, enblend, enfuse, minidnla

Added: kde-extras/digikam/trunk/debian/digikam-private-libs.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-private-libs.install	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/digikam-private-libs.install	2013-04-06 23:36:25 UTC (rev 19423)
@@ -0,0 +1 @@
+usr/lib/*.so.*

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2013-04-06 23:27:11 UTC (rev 19422)
+++ kde-extras/digikam/trunk/debian/digikam.install	2013-04-06 23:36:25 UTC (rev 19423)
@@ -9,20 +9,12 @@
 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/pkgconfig
 usr/share/applications/kde4/digikam.desktop
 usr/share/kde4/config.kcfg/PLEConfigSkeleton.kcfgc
 usr/share/man/man1/cleanup_digikamdb.1
 usr/share/man/man1/digitaglinktree.1
 usr/share/kde4/apps/kconf_update/
-usr/lib/libksane*
-usr/lib/libkexiv2*
-usr/lib/libkdc*
 # plugins not yet building
 #usr/lib/libHUpnp*
 #usr/lib/libQt*

Modified: kde-extras/digikam/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.install	2013-04-06 23:27:11 UTC (rev 19422)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.install	2013-04-06 23:36:25 UTC (rev 19423)
@@ -5,4 +5,3 @@
 usr/bin/photolayoutseditor
 usr/bin/scangui
 usr/lib/kde4/kipi*
-usr/lib/libkipi*