From: Tollef Fog Heen <tfheen@debian.org>
Date: Thu, 1 Sep 2005 05:52:20 +0000 (+0200)
Subject: Imported Debian patch 3.7-7
X-Git-Tag: debian/3.7-7^0
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d930d407dbff6c525bd58a535c23f55445d6371;p=sash

Imported Debian patch 3.7-7
---

diff --git a/debian/changelog b/debian/changelog
index 6d6cae7..a1b06ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sash (3.7-7) unstable; urgency=low
+
+  * Remove /usr/doc/sash symlink if it exists.  (closes: #322797)
+  * Fix up debconf dependency, we want debconf | debconf-2.0
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Thu,  1 Sep 2005 07:52:20 +0200
+
 sash (3.7-6) unstable; urgency=high
 
   * Tighten zlib build-deps to fix security issue (closes: #318069)
diff --git a/debian/control b/debian/control
index 6269caf..ef4d726 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Package: sash
 Architecture: any
 Section: shells
 Priority: optional
-Depends: lockfile-progs, passwd (>= 1:4.0.3-10), debconf
+Depends: lockfile-progs, passwd (>= 1:4.0.3-10), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: fileutils (<<4.0-1)
-Suggests: doc-debian, debconf
+Suggests: doc-debian
 Description: Stand-alone shell
  sash serves as an interactive substitute for /bin/sh, for use when
  /bin/sh is unusable.  It's statically linked, and includes many standard
diff --git a/debian/postinst b/debian/postinst
index fc564ec..f71cf65 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -137,4 +137,10 @@ if [ "$1" = "configure" -a "$2" = "" ]; then
     /usr/sbin/add-shell /bin/sash
 fi
 
+# Make sure we get rid of any stuff in /usr/doc
+if [ -L "/usr/doc/sash" ]; then
+    rm -f "/usr/doc/sash"
+fi
+
+
 #DEBHELPER#