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

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 19, 2011 @ 18:17:50
  Author: jwilk
Revision: 17543

Update the changelog.

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

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-06-19 18:15:38 UTC (rev 17542)
+++ packages/python-docutils/trunk/debian/changelog	2011-06-19 18:17:50 UTC (rev 17543)
@@ -22,9 +22,11 @@
       wrapper function, i.e. the patch is still up-to-date.
   * New binary package: docutils-common, containing data files, configuration
     files and manual pages.
+  * New binary package: docutils-doc, containting documentation.
+    + Conflict with previous versions python-docutils
     + /usr/share/doc/python-docutils/docs used to be a directory, but is now a
-      symlink. Add a preinst snippet to deal with this situation.
-  * New binary package: docutils-doc, containting documentation.
+      symlink. Conflict with older versions of python-docutils, so that dpkg
+      can replace one with the other. Add lintian override.
   * New binary package: python3-docutils (closes: #577725).
     + Build-depend on python3-all.
     + Both python-docutils and python3-docutils provides rst* scripts, managed
@@ -37,7 +39,6 @@
   * New binary package: python3-roman.
   * Reword package descriptions of all packages. Thanks to Stefano Rivera for
     proof-reading.
-
   * Simplify debian/rules.
 
  -- Jakub Wilk <jwilk at debian.org>  Sun, 19 Jun 2011 19:04:54 +0200