[Python-apps-commits] r4775 - in packages/mercurial/trunk/debian (3 files)

[vdanjean at users.alioth.debian.org]

    Date: Tuesday, February 16, 2010 @ 00:53:15
  Author: vdanjean
Revision: 4775

fix /usr/share/doc/mercurial symlink

Added:
  packages/mercurial/trunk/debian/mercurial.links
Modified:
  packages/mercurial/trunk/debian/mercurial.preinst
  packages/mercurial/trunk/debian/rules

Added: packages/mercurial/trunk/debian/mercurial.links
===================================================================
--- packages/mercurial/trunk/debian/mercurial.links	                        (rev 0)
+++ packages/mercurial/trunk/debian/mercurial.links	2010-02-16 00:53:15 UTC (rev 4775)
@@ -0,0 +1 @@
+usr/share/doc/mercurial-common/examples usr/share/doc/mercurial/examples

Modified: packages/mercurial/trunk/debian/mercurial.preinst
===================================================================
--- packages/mercurial/trunk/debian/mercurial.preinst	2010-02-16 00:51:57 UTC (rev 4774)
+++ packages/mercurial/trunk/debian/mercurial.preinst	2010-02-16 00:53:15 UTC (rev 4775)
@@ -41,6 +41,11 @@
 	    echo "Purging old config file '/etc/mercurial/hgrc.d/hgit.rc'"
 	    rm -fv /etc/mercurial/hgrc.d/hgit.rc
 	fi
+	if [ -h /usr/share/doc/mercurial ] && [ "$(readlink /usr/share/doc/mercurial)" = mercurial-common ]; then
+	    # /usr/share/doc/mercurial was a symlink to mercurial-common
+	    # It is problematic in case of binary NMU
+	    rm /usr/share/doc/mercurial
+	fi
     ;;
 
     abort-upgrade)

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2010-02-16 00:51:57 UTC (rev 4774)
+++ packages/mercurial/trunk/debian/rules	2010-02-16 00:53:15 UTC (rev 4775)
@@ -47,9 +47,6 @@
 		contrib/mergetools.hgrc \
 		$(CURDIR)/debian/mercurial/etc/mercurial/hgrc.d/mergetools.rc
 	
-	# Symlink docs
-	rm -rf $(CURDIR)/debian/mercurial/usr/share/doc/mercurial
-	ln -s mercurial-common $(CURDIR)/debian/mercurial/usr/share/doc/mercurial
 	# remove arch-independent python stuff
 	find debian/mercurial/usr/lib \
 		! -name '*.so' ! -type d -delete , \