[Python-apps-commits] r2229 - in packages/mercurial/trunk/debian (2 files)

[vt-guest at users.alioth.debian.org]

    Date: Sunday, January 18, 2009 @ 03:13:57
  Author: vt-guest
Revision: 2229

make it actually work this time

Modified:
  packages/mercurial/trunk/debian/mercurial.postinst
  packages/mercurial/trunk/debian/mercurial.preinst

Modified: packages/mercurial/trunk/debian/mercurial.postinst
===================================================================
--- packages/mercurial/trunk/debian/mercurial.postinst	2009-01-18 02:50:39 UTC (rev 2228)
+++ packages/mercurial/trunk/debian/mercurial.postinst	2009-01-18 03:13:57 UTC (rev 2229)
@@ -19,6 +19,13 @@
 
 case "$1" in
     configure)
+        # Link mercurial doc directory if dpkg didn't do it
+        DOC=/usr/share/doc/mercurial
+        if [ -d "$DOC" -a ! -L "$DOC" ]; then
+            if rmdir "$DOC"; then
+                ln -s mercurial-common "$DOC"
+            fi
+        fi
         # Fix for old packages not managing pyc files
         for d in /usr/lib/python*/site-packages/mercurial /usr/lib/python*/site-packages/hgext ; do
 	    if [ -d "$d" ] ; then

Modified: packages/mercurial/trunk/debian/mercurial.preinst
===================================================================
--- packages/mercurial/trunk/debian/mercurial.preinst	2009-01-18 02:50:39 UTC (rev 2228)
+++ packages/mercurial/trunk/debian/mercurial.preinst	2009-01-18 03:13:57 UTC (rev 2229)
@@ -17,11 +17,6 @@
 
 case "$1" in
     install|upgrade)
-        # Remove a leftover doc directory so dpkg can symlink it
-        DOC=/usr/share/doc/mercurial
-        if [ -d "$DOC" -a ! -L "$DOC" ]; then
-            rmdir "$DOC"
-        fi
         # Fixing a wrong name in a config file (package 6c-1)
 	FILE=/etc/bash_completion.d/bash_completion
         if [ -f $FILE ] && grep -sq hg $FILE ; then