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

[Pino Toscano]

Author: pino
Date: 2013-04-07 10:59:26 +0000 (Sun, 07 Apr 2013)
New Revision: 19442

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/rules
Log:
remove almost all the conflicts, except the ones against -data debs


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-04-07 10:54:05 UTC (rev 19441)
+++ kde-extras/digikam/trunk/debian/changelog	2013-04-07 10:59:26 UTC (rev 19442)
@@ -15,6 +15,8 @@
       pkg-config files, .so symlinks, static libs
     - install the libraries in a private /usr/lib/dikigam directory
     - remove the lintian overrides about the shared libraries handling
+    - remove almost all the conflicts, except the ones against the -data
+      packages of the kdegraphics libraries
   * Instead of skipping oxygen icons installed in the global icon theme,
     remove them from the destdir; this way we can spot them easily
   * Upstream ChangeLog installations: install digikam's only in digikam and

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-04-07 10:54:05 UTC (rev 19441)
+++ kde-extras/digikam/trunk/debian/rules	2013-04-07 10:59:26 UTC (rev 19442)
@@ -5,7 +5,7 @@
 
 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
+  CONFLICTS_SUBSTVAR := libkipi-data, libkexiv2-data, libkdcraw-data, libksane-data
 else
   CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
 endif