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

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 19, 2011 @ 18:14:52
  Author: jwilk
Revision: 17541

docutils-doc: rather than using preinst hacks, just conflict with old python-docutils.

Added:
  packages/python-docutils/trunk/debian/docutils-doc.lintian-overrides
Modified:
  packages/python-docutils/trunk/debian/control
Deleted:
  packages/python-docutils/trunk/debian/docutils-doc.preinst

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2011-06-19 17:56:34 UTC (rev 17540)
+++ packages/python-docutils/trunk/debian/control	2011-06-19 18:14:52 UTC (rev 17541)
@@ -99,7 +99,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: python-docutils (<< 0.7-3~)
+Conflicts: python-docutils (<< 0.7-3~)
 Replaces: python-docutils (<< 0.7-3~)
 Description: text processing system for reStructuredText - documentation
  reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext

Added: packages/python-docutils/trunk/debian/docutils-doc.lintian-overrides
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.lintian-overrides	                        (rev 0)
+++ packages/python-docutils/trunk/debian/docutils-doc.lintian-overrides	2011-06-19 18:14:52 UTC (rev 17541)
@@ -0,0 +1,4 @@
+# As per policy 6.6, dpkg cannot replace a directory (shipped in
+# python-docutils << 0.7-3) with a symlink to directory (shipped in
+# docutils-doc).
+docutils-doc: conflicts-with-version python-docutils (<< 0.7-3~)

Deleted: packages/python-docutils/trunk/debian/docutils-doc.preinst
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.preinst	2011-06-19 17:56:34 UTC (rev 17540)
+++ packages/python-docutils/trunk/debian/docutils-doc.preinst	2011-06-19 18:14:52 UTC (rev 17541)
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-# TODO: Remove this snippet and wheezy release.
-
-# dpkg cannot replace directory with a symlink to a directory:
-docs=/usr/share/doc/python-docutils/docs
-if ! [ -s $docs ] && [ -d $docs ]
-then
-	rm -rf $docs/
-fi
-unset docs
-
-#DEBHELPER#