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

[jwilk at users.alioth.debian.org]

    Date: Sunday, December 18, 2011 @ 13:21:57
  Author: jwilk
Revision: 19650

Drop postinst snippet to deal with a python-support bug (it cannot replace directory with a regular file).

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

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-12-18 13:15:36 UTC (rev 19649)
+++ packages/python-docutils/trunk/debian/changelog	2011-12-18 13:21:57 UTC (rev 19650)
@@ -7,8 +7,10 @@
   * Backport upstream patch to follow the changes in
     the xml.dom.minidom.Document.toprettyxml method
     (fix-docutilsxmltestcase.diff).
+  * Drop postinst snippet to deal with a python-support bug (it cannot replace
+    directory with a regular file). It was needed only for 0.7 upgrades.
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 01 Dec 2011 22:48:25 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 18 Dec 2011 14:19:58 +0100
 
 python-docutils (0.8.1-4) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/python-docutils.postinst
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.postinst	2011-12-18 13:15:36 UTC (rev 19649)
+++ packages/python-docutils/trunk/debian/python-docutils.postinst	2011-12-18 13:21:57 UTC (rev 19650)
@@ -1,21 +1,8 @@
 #!/bin/sh
 set -e
 
-# python-support prior to 1.0.14 doesn't correctly handle replacing directory
-# with a regular file. The following snippet works around this bug:
 if [ "$1" = configure ]
 then
-	for pydir in /usr/lib/pymodules/python2.*/
-	do
-		if [ -d $pydir/docutils-0.7.egg-info/ ]
-		then
-			rm -rf $pydir/docutils-0.7.egg-info/
-		fi
-	done
-fi
-
-if [ "$1" = configure ]
-then
 	for exe in /usr/share/docutils/scripts/python2/*
 	do
 		update-alternatives --install /usr/bin/${exe##*/} ${exe##*/} $exe 30