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

[jwilk at users.alioth.debian.org]

    Date: Saturday, June 18, 2011 @ 14:21:28
  Author: jwilk
Revision: 17518

Drop obsolete conflicts with docutils-writer-manpage and rst2man.

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

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-06-18 02:22:56 UTC (rev 17517)
+++ packages/python-docutils/trunk/debian/changelog	2011-06-18 14:21:28 UTC (rev 17518)
@@ -17,13 +17,14 @@
       symlink. Add a preinst snippet to deal with this situation.
   * Drop obsolete recommendation of python-elementtree.
   * Drop obsolete conflict with zope3.
+  * Drop obsolete conflicts with docutils-writer-manpage and rst2man.
   * Drop unused virtual packages: python-odtwriter, rst2odt,
     docutils-writer-odt.
   * Build packages for Python 3 (closes: #577725). Both python-docutils and
     python3-docutils provides rst* scripts, managed by alternatives.
   * Simplify debian/rules.
 
- -- Jakub Wilk <jwilk at debian.org>  Tue, 07 Jun 2011 01:55:03 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 18 Jun 2011 15:37:44 +0200
 
 python-docutils (0.7-2) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2011-06-18 02:22:56 UTC (rev 17517)
+++ packages/python-docutils/trunk/debian/control	2011-06-18 14:21:28 UTC (rev 17518)
@@ -29,14 +29,10 @@
 Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french
 Provides: docutils-writer-manpage,
           rst2man
-Conflicts: docutils-writer-manpage,
-           python-odtwriter,
-           docutils-writer-odt,
-           rst2man
-Replaces: docutils-writer-manpage,
-          python-odtwriter,
-          docutils-writer-odt,
-          rst2man
+Conflicts: python-odtwriter,
+           docutils-writer-odt
+Replaces: python-odtwriter,
+          docutils-writer-odt
 Breaks: python-epydoc (<< 3.0.1-4~)
 Description: utilities for the documentation of Python modules (implemented in Python 2)
  The purpose of the Docutils project is to create a set of tools for
@@ -54,7 +50,11 @@
             python3-pygments,
             libpaper-utils,
             python3-lxml
-Conflicts: python-docutils (<< 0.7-3~)
+Conflicts: python-docutils (<< 0.7-3~),
+           python-odtwriter,
+           docutils-writer-odt
+Replaces: python-odtwriter,
+          docutils-writer-odt
 Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, docutils-doc
 Description: utilities for the documentation of Python modules (implemented in Python 3)
  The purpose of the Docutils project is to create a set of tools for
@@ -68,7 +68,11 @@
 Depends: ${misc:Depends}, 
 Recommends: python-docutils | python3-docutils
 Conflicts: python-docutils (<< 0.7-3~)
-Replaces: python-docutils (<< 0.7-3~)
+Breaks: python-odtwriter,
+        docutils-writer-odt
+Replaces: python-docutils (<< 0.7-3~),
+          python-odtwriter,
+          docutils-writer-odt
 Description: utilities for the documentation of Python modules - data files
  The purpose of the Docutils project is to create a set of tools for
  processing plaintext documentation into useful formats, such as HTML,