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

[Pino Toscano]

Author: pino
Date: 2013-04-06 23:44:41 +0000 (Sat, 06 Apr 2013)
New Revision: 19425

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/digikam-private-libs.install
   kde-extras/digikam/trunk/debian/rules
Log:
install the libraries in a private /usr/lib/dikigam directory


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:40:29 UTC (rev 19424)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-06 23:44:41 UTC (rev 19425)
@@ -9,6 +9,7 @@
     - split the libraries 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
 
  -- 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/digikam-private-libs.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-private-libs.install	2013-04-06 23:40:29 UTC (rev 19424)
+++ kde-extras/digikam/trunk/debian/digikam-private-libs.install	2013-04-06 23:44:41 UTC (rev 19425)
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*.so.* usr/lib/digikam/

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-04-06 23:40:29 UTC (rev 19424)
+++ kde-extras/digikam/trunk/debian/rules	2013-04-06 23:44:41 UTC (rev 19425)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+PRIVATE_LIBDIR := /usr/lib/digikam
+
 %:
 	dh $@ --with kde --parallel 
 
@@ -7,7 +9,7 @@
 
 override_dh_auto_configure:
 	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde \
-                -- -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=on
+                -- -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=on
 
 override_dh_auto_install:
 	dh_auto_install
@@ -27,6 +29,9 @@
 override_dh_install:
 	dh_install -Xmultithread -Xoxygen -XREADME.MACOSX --fail-missing
 
+override_dh_shlibdeps:
+	LD_LIBRARY_PATH=$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR) dh_shlibdeps -Xusr/lib/kde4/
+
 #override_dh_strip:
 #	dh_strip -a --dbg-package=digikam-dbg