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

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 5, 2011 @ 23:38:44
  Author: jwilk
Revision: 17299

Move the conffile to -common package.

Added:
  packages/python-docutils/trunk/debian/docutils-common.lintian-overrides
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/control
  packages/python-docutils/trunk/debian/docutils-common.install
  packages/python-docutils/trunk/debian/python-docutils.install

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-06-05 23:29:58 UTC (rev 17298)
+++ packages/python-docutils/trunk/debian/changelog	2011-06-05 23:38:44 UTC (rev 17299)
@@ -12,14 +12,14 @@
   * 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).
+    (data and configuration files).
     + /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.
   * Bump standards version to 3.9.2 (no changes needed).
   * Drop obsolete recommendation of python-elementtree.
   * Drop obsolete conflict with zope3.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 06 Jun 2011 01:20:28 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 06 Jun 2011 01:24:38 +0200
 
 python-docutils (0.7-2) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2011-06-05 23:29:58 UTC (rev 17298)
+++ packages/python-docutils/trunk/debian/control	2011-06-05 23:38:44 UTC (rev 17299)
@@ -53,14 +53,14 @@
 Architecture: all
 Depends: ${misc:Depends}, 
 Recommends: python-docutils
-Breaks: python-docutils (<< 0.7-3~)
+Conflicts: python-docutils (<< 0.7-3~)
 Replaces: python-docutils (<< 0.7-3~)
 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,
  XML, and TeX.
  .
- This package includes data files.
+ This package includes data and configuration files.
 
 Package: docutils-doc
 Section: doc

Modified: packages/python-docutils/trunk/debian/docutils-common.install
===================================================================
--- packages/python-docutils/trunk/debian/docutils-common.install	2011-06-05 23:29:58 UTC (rev 17298)
+++ packages/python-docutils/trunk/debian/docutils-common.install	2011-06-05 23:38:44 UTC (rev 17299)
@@ -1,2 +1,3 @@
 /usr/share/docutils/
 tools/editors/emacs/rst.el usr/share/emacs/site-lisp
+debian/50python-docutils.el etc/emacs/site-start.d

Added: packages/python-docutils/trunk/debian/docutils-common.lintian-overrides
===================================================================
--- packages/python-docutils/trunk/debian/docutils-common.lintian-overrides	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-common.lintian-overrides	2011-06-05 23:38:44 UTC (rev 17299)
@@ -0,0 +1,2 @@
+# As per Policy 10.7.4:
+docutils-common: conflicts-with-version python-docutils (<< 0.7-3~)

Modified: packages/python-docutils/trunk/debian/python-docutils.install
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.install	2011-06-05 23:29:58 UTC (rev 17298)
+++ packages/python-docutils/trunk/debian/python-docutils.install	2011-06-05 23:38:44 UTC (rev 17299)
@@ -1,4 +1,3 @@
 /usr/bin/*
 /usr/lib/python*.*/*-packages/docutils*.egg-info
 /usr/lib/python*.*/*-packages/docutils
-debian/50python-docutils.el etc/emacs/site-start.d