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

[Pino Toscano]

Author: pino
Date: 2013-04-06 23:47:05 +0000 (Sat, 06 Apr 2013)
New Revision: 19426

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/kipi-plugins.install
   kde-extras/digikam/trunk/debian/rules
Log:
move libkipiplugins back to kipi-plugins


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:44:41 UTC (rev 19425)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:47:05 UTC (rev 19426)
@@ -6,7 +6,8 @@
   * 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
+    - split almost all the libraries (excluding libkipiplugins) in an own
+      digikam-private-libs
     - 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

Modified: kde-extras/digikam/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.install	2013-04-06 23:44:41 UTC (rev 19425)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.install	2013-04-06 23:47:05 UTC (rev 19426)
@@ -5,3 +5,4 @@
 usr/bin/photolayoutseditor
 usr/bin/scangui
 usr/lib/kde4/kipi*
+usr/lib/libkipiplugins.so.* usr/lib/digikam/

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-04-06 23:44:41 UTC (rev 19425)
+++ kde-extras/digikam/trunk/debian/rules	2013-04-06 23:47:05 UTC (rev 19426)
@@ -28,9 +28,11 @@
 # conflicts with oxygen-icon-theme package
 override_dh_install:
 	dh_install -Xmultithread -Xoxygen -XREADME.MACOSX --fail-missing
+	# remove duplicate libkipiplugins copied also in digikam-private-libs
+	rm --verbose debian/digikam-private-libs/$(PRIVATE_LIBDIR)/libkipiplugins.so.*
 
 override_dh_shlibdeps:
-	LD_LIBRARY_PATH=$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR) dh_shlibdeps -Xusr/lib/kde4/
+	LD_LIBRARY_PATH=$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR):$(CURDIR)/debian/kipi-plugins/$(PRIVATE_LIBDIR) dh_shlibdeps -Xusr/lib/kde4/
 
 #override_dh_strip:
 #	dh_strip -a --dbg-package=digikam-dbg