[Python-modules-commits] r17542 - in packages/python-docutils/trunk/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 19, 2011 @ 18:15:38
  Author: jwilk
Revision: 17542

Err, undo r17540.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/python3-docutils.lintian-overrides

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-06-19 18:14:52 UTC (rev 17541)
+++ packages/python-docutils/trunk/debian/changelog	2011-06-19 18:15:38 UTC (rev 17542)
@@ -5,27 +5,41 @@
     + Add postinst snippet do deal with a python-support bug (it cannot
       replace directory with a regular file).
   * Bump standards version to 3.9.2, no changes needed.
-  * Strip ‘debian/tmp’ prefix from debian/*.install files.
+  * Strip debian/tmp prefix from debian/*.install files; in compat
+    dh_install will fall back to looking into debian/tmp anyway.
   * Drop preinst scripts to remove python-central leftovers; not needed
     anymore.
   * Fix patch headers to be in line with DEP-3.
   * Remove files created by the test suite in the clean target.
-  * Move all data files to /usr/share/docutils/.
-  * Split new binary packages: docutils-doc (documentation), docutils-common
-    (data files, configuration files and manual pages).
-    + /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.
   * 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.
+  * Move all data files to /usr/share/docutils/.
+    + Add patch not to use __file__ directly.
+    + In debian/rules, check if all uses of __file__ are guarded by our
+      wrapper function, i.e. the patch is still up-to-date.
+  * New binary package: docutils-common, containing data files, configuration
+    files and manual pages.
+    + /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.
+  * New binary package: python3-docutils (closes: #577725).
+    + Build-depend on python3-all.
+    + Both python-docutils and python3-docutils provides rst* scripts, managed
+      by alternatives.
+    + Conflict with other packages shipping /usr/bin/rst2* binaries, so that
+      alternatives can be correctly installed. Add lintian override for
+      conflicts-with-version.
   * New virtual package: docutils, provided by both python-docutils and
     python3-docutils.
+  * 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
 
 python-docutils (0.7-2) unstable; urgency=low

Modified: packages/python-docutils/trunk/debian/python3-docutils.lintian-overrides
===================================================================
--- packages/python-docutils/trunk/debian/python3-docutils.lintian-overrides	2011-06-19 18:14:52 UTC (rev 17541)
+++ packages/python-docutils/trunk/debian/python3-docutils.lintian-overrides	2011-06-19 18:15:38 UTC (rev 17542)
@@ -1,2 +1,2 @@
-# As per Policy 3.9:
+# Even deconfigured python-docutils (<< 0.7-3~) would prevent correct installation of alternatives:
 python3-docutils: conflicts-with-version python-docutils (<< 0.7-3~)