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

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

    Date: Sunday, January 18, 2009 @ 02:50:39
  Author: vt-guest
Revision: 2228

mercurial 1.1.2-2

* debian/mercurial.preinst: remove a leftover /usr/share/doc/mercurial
  directory so dpkg can symlink it (closes: #512155)
* debian/control: mercurial-common replaces all earlier versions of
  mercurial

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/mercurial.preinst

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2009-01-17 22:35:14 UTC (rev 2227)
+++ packages/mercurial/trunk/debian/changelog	2009-01-18 02:50:39 UTC (rev 2228)
@@ -1,3 +1,12 @@
+mercurial (1.1.2-2) unstable; urgency=low
+
+  * debian/mercurial.preinst: remove a leftover /usr/share/doc/mercurial
+    directory so dpkg can symlink it (closes: #512155)
+  * debian/control: mercurial-common replaces all earlier versions of
+    mercurial
+
+ -- Vernon Tang <vt at foilhead.net>  Sun, 18 Jan 2009 10:39:58 +0800
+
 mercurial (1.1.2-1) unstable; urgency=low
 
   [ Vernon Tang ]

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2009-01-17 22:35:14 UTC (rev 2227)
+++ packages/mercurial/trunk/debian/control	2009-01-18 02:50:39 UTC (rev 2228)
@@ -45,7 +45,7 @@
  python-pygments,
  python-openssl
 Conflicts: mercurial (<< ${binary:Version})
-Replaces: mercurial (<< 1.0)
+Replaces: mercurial (<< ${binary:Version})
 Description: scalable distributed version control system (common files)
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.

Modified: packages/mercurial/trunk/debian/mercurial.preinst
===================================================================
--- packages/mercurial/trunk/debian/mercurial.preinst	2009-01-17 22:35:14 UTC (rev 2227)
+++ packages/mercurial/trunk/debian/mercurial.preinst	2009-01-18 02:50:39 UTC (rev 2228)
@@ -17,6 +17,11 @@
 
 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