rev 18957 - kde-extras/strigi/trunk/debian

[Fathi Boudra]

Author: fabo
Date: 2011-09-20 12:54:57 +0000 (Tue, 20 Sep 2011)
New Revision: 18957

Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/control
Log:
Use Breaks instead of Conflicts.

Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2011-09-20 12:54:06 UTC (rev 18956)
+++ kde-extras/strigi/trunk/debian/changelog	2011-09-20 12:54:57 UTC (rev 18957)
@@ -10,7 +10,7 @@
       libswscale-dev build dependencies.
     - drop pkg-kde-tools build dependency - not used.
     - drop python and python-support build dependencies.
-    - bump Standard-Version to 3.9.2 (no changes needed).
+    - bump Standard-Version to 3.9.2, use Breaks instead of Conflicts.
     - drop deskbar-plugins-strigi package.
   * Drop debian/libstreams0.docs file - not used anymore.
   * Update debian/*-dev.install files.

Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2011-09-20 12:54:06 UTC (rev 18956)
+++ kde-extras/strigi/trunk/debian/control	2011-09-20 12:54:57 UTC (rev 18957)
@@ -110,11 +110,11 @@
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libcluceneindex0 (<< 0.5.6-1), libstreamindexer0 (<< 0.5.1-1)
 Replaces: kdegraphics-strigi-plugins (<< 4:4.0.0-2),
           libcluceneindex0 (<< 0.5.6-1),
           libstreamindexer0 (<< 0.5.1-1),
           strigi-daemon (<< 0.3.11-1)
+Breaks: libcluceneindex0 (<< 0.5.6-1), libstreamindexer0 (<< 0.5.1-1)
 Description: streamanalyzer library for Strigi Desktop Search
  This package is part of Strigi Desktop Search, it contains a library for
  writing clients using libstreamanalyzer.
@@ -127,8 +127,8 @@
 Depends: libstreamanalyzer0 (= ${binary:Version}),
          libstreams-dev (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: libcluceneindex-dev (<< 0.5.6-1), libstreamindexer-dev (<< 0.5.1-1)
 Replaces: libcluceneindex-dev (<< 0.5.6-1), libstreamindexer-dev (<< 0.5.1-1)
+Breaks: libcluceneindex-dev (<< 0.5.6-1), libstreamindexer-dev (<< 0.5.1-1)
 Description: development files for libstreamanalyzer
  This package is part of Strigi Desktop Search, it contains the Strigi
  development files for libstreamanalyzer.