[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.1-3-16-g07ac173

[David Paleino]

The following commit has been merged in the master branch:
commit e86f5219aca211fd3c909188025c1f1b6040e67a
Author: David Paleino <dapal at debian.org>
Date:   Fri Jun 11 16:07:14 2010 +0200

    debian/preinst: definitely remove anything in /usr/share/doc/bash/

diff --git a/debian/changelog b/debian/changelog
index 80f03b7..d27a663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ bash-completion (1:1.1-4) UNRELEASED; urgency=low
   * debian/links: remove dangling symlink in /usr/share/doc/bash
     (Closes: #565447)
   * debian/watch: fix regex to avoid old timestamp-based releases
+  * debian/preinst: definitely remove anything in /usr/share/doc/bash/
 
- -- David Paleino <dapal at debian.org>  Fri, 11 Jun 2010 15:02:07 +0200
+ -- David Paleino <dapal at debian.org>  Fri, 11 Jun 2010 16:05:50 +0200
 
 bash-completion (1:1.1-3) unstable; urgency=low
 
diff --git a/debian/preinst b/debian/preinst
index 803b202..9017ada 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
     install|upgrade)
-	if [ -d /usr/share/doc/bash/completion-contrib ] && [ ! -h /usr/share/doc/bash/completion-contrib ]; then
+	if [ -e /usr/share/doc/bash/completion-contrib ]; then
 	    rm -rf /usr/share/doc/bash/completion-contrib
 	fi
     ;;

-- 
debian-package