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

[Pino Toscano]

Author: pino
Date: 2013-04-07 10:54:05 +0000 (Sun, 07 Apr 2013)
New Revision: 19441

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/rules
Log:
centralise the toggling of private libs + conflicts


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-07 10:26:52 UTC (rev 19440)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-07 10:54:05 UTC (rev 19441)
@@ -31,6 +31,8 @@
   * 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.
+  * Centralise the enabling of the private kdegraphics libs, and proper set the
+    conflicts according to it.
 
  -- 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 10:26:52 UTC (rev 19440)
+++ kde-extras/digikam/trunk/debian/control	2013-04-07 10:54:05 UTC (rev 19441)
@@ -57,7 +57,7 @@
 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
+Conflicts: ${digikam:Conflicts}
 Description: digital photo management application for KDE
  Digital photo management program designed to import, organize, enhance, search
  and export your digital images to and from your computer.
@@ -140,7 +140,7 @@
 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
+Conflicts: ${digikam:Conflicts}
 Description: digiKam architecture-independant data
  Contains the significant amount of architecture-independent data that is
  shipped with digiKam.
@@ -226,7 +226,7 @@
 Depends: ${misc:Depends}
 Breaks: digikam (<< 4:2.3.0-2~)
 Replaces: digikam (<< 4:2.3.0-2~)
-Conflicts: libkipi8, libkipi-data, libkipi-dev, libkexiv2-10, libkexiv2-data, libkdcraw20, libkdcraw-data, libksane0, libksane-dev, libksane-data
+Conflicts: ${digikam:Conflicts}
 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/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-04-07 10:26:52 UTC (rev 19440)
+++ kde-extras/digikam/trunk/debian/rules	2013-04-07 10:54:05 UTC (rev 19441)
@@ -1,7 +1,15 @@
 #!/usr/bin/make -f
 
+USE_PRIVATE_KDEGRAPHICS := y
 PRIVATE_LIBDIR := /usr/lib/digikam
 
+ifeq ($(USE_PRIVATE_KDEGRAPHICS),y)
+  CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=ON
+  CONFLICTS_SUBSTVAR := libkipi8, libkipi-data, libkipi-dev, libkexiv2-10, libkexiv2-data, libkdcraw20, libkdcraw-data, libksane0, libksane-dev, libksane-data
+else
+  CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
+endif
+
 %:
 	dh $@ --with kde --parallel 
 
@@ -9,7 +17,7 @@
 
 override_dh_auto_configure:
 	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde \
-                -- -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" -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 $(CMAKE_ARGS)
 
 override_dh_auto_install:
 	dh_auto_install
@@ -36,6 +44,9 @@
 override_dh_shlibdeps:
 	LD_LIBRARY_PATH=$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR):$(CURDIR)/debian/kipi-plugins/$(PRIVATE_LIBDIR) dh_shlibdeps -Xusr/lib/kde4/
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vdigikam:Conflicts='$(CONFLICTS_SUBSTVAR)'
+
 #override_dh_strip:
 #	dh_strip -a --dbg-package=digikam-dbg