[Python-apps-commits] r2132 - in packages/subdownloader/trunk/debian (changelog control)

[piotr at users.alioth.debian.org]

    Date: Monday, December 29, 2008 @ 12:49:48
  Author: piotr
Revision: 2132

Add subdownloader-cli to Conflicts

Modified:
  packages/subdownloader/trunk/debian/changelog
  packages/subdownloader/trunk/debian/control

Modified: packages/subdownloader/trunk/debian/changelog
===================================================================
--- packages/subdownloader/trunk/debian/changelog	2008-12-29 12:27:49 UTC (rev 2131)
+++ packages/subdownloader/trunk/debian/changelog	2008-12-29 12:49:48 UTC (rev 2132)
@@ -4,7 +4,7 @@
   * debian/rules:
     + Generate mo files from po files on build.
   * debian/control:
-    + Add Replaces to avoid problems with the
+    + Add Conflicts/Replaces to avoid problems with the
       non-official -cli package (Closes: #510049).
   * debian/copyright:
     + Add copyright notice for locale (po files).

Modified: packages/subdownloader/trunk/debian/control
===================================================================
--- packages/subdownloader/trunk/debian/control	2008-12-29 12:27:49 UTC (rev 2131)
+++ packages/subdownloader/trunk/debian/control	2008-12-29 12:49:48 UTC (rev 2132)
@@ -14,6 +14,7 @@
 Package: subdownloader
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.3.5-7), python-qt4, python-crypto, python-kaa-metadata
+Conflicts: subdownloader-cli
 Replaces: subdownloader-cli
 XB-Python-Version: ${python:Versions}
 Description: automatically downloads/uploads subtitles for video files