[Python-modules-commits] r15875 - in packages/python-html2text/trunk/debian (changelog control)

[stefanor at users.alioth.debian.org]

    Date: Saturday, February 26, 2011 @ 11:37:38
  Author: stefanor
Revision: 15875

s/Breaks/Conflicts/

Modified:
  packages/python-html2text/trunk/debian/changelog
  packages/python-html2text/trunk/debian/control

Modified: packages/python-html2text/trunk/debian/changelog
===================================================================
--- packages/python-html2text/trunk/debian/changelog	2011-02-26 11:19:14 UTC (rev 15874)
+++ packages/python-html2text/trunk/debian/changelog	2011-02-26 11:37:38 UTC (rev 15875)
@@ -2,7 +2,7 @@
 
   * Install html2markdown symlink, replacing the html2markdown package.
     (Closes: #614886)
-    - Breaks html2markdown << 3.0.1-2.
+    - Conflicts html2markdown << 3.0.1-2.
     - Add html2markdown transitional package.
     - Add html2markdown.1 manpage.
     - Manage html2markdown and html2markdown.1 via alternatives, allowing both

Modified: packages/python-html2text/trunk/debian/control
===================================================================
--- packages/python-html2text/trunk/debian/control	2011-02-26 11:19:14 UTC (rev 15874)
+++ packages/python-html2text/trunk/debian/control	2011-02-26 11:37:38 UTC (rev 15875)
@@ -20,7 +20,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
 Recommends: python-feedparser
-Breaks: html2markdown (<< 3.0.1-2), ${python:Breaks}
+Conflicts: html2markdown (<< 3.0.1-2), ${python:Breaks}
 Description: Python module for converting HTML to Markdown text
  html2text is a Python module that converts a page of HTML into clean,
  easy-to-read plain ASCII text. Better yet, that ASCII also happens to be
@@ -32,7 +32,7 @@
 Package: python3-html2text
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
-Breaks: html2markdown (<< 3.0.1-2)
+Conflicts: html2markdown (<< 3.0.1-2)
 Description: Python module for converting HTML to Markdown text (Python3 version)
  html2text is a Python module that converts a page of HTML into clean,
  easy-to-read plain ASCII text. Better yet, that ASCII also happens to be