Imported Debian patch 3.7-7

diff --git a/debian/changelog b/debian/changelog
index 6d6cae7ef83eb9befef391d818e241d942072169..a1b06ff94599b4ba145223ee772957c479f0510e 100644 (file)
--- 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 6269caf9b9bd199cd15b7e398cab8e4fb66d60bf..ef4d7266000a4ad8858cec15a9681dc66ec6be8a 100644 (file)
--- 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 fc564ecd93b189a4656ad82800552dcccfb23baa..f71cf6580cc26e94cb682fff3a86ea8010d2b3ac 100644 (file)
--- 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#