Imported Debian patch 3.7-9

diff --git a/cmds.c b/cmds.c
index ad2203444be16a9cfb939d7afdc23585ebccb902..a576269ecc83ddb01126e103199f87ed3e87caca 100644 (file)
--- a/cmds.c
+++ b/cmds.c
@@ -990,14 +990,18 @@ do_sum(int argc, const char ** argv)
 void
 do_exit(int argc, const char ** argv)
 {
+       int r = 0;
        if (getpid() == 1)
        {
                fprintf(stderr, "You are the INIT process!\n");
 
                return;
        }
-
-       exit(0);
+       if (argc == 2)
+       {
+               r = atoi(argv[1]);
+       }
+       exit(r);
 }
 
 

diff --git a/debian/changelog b/debian/changelog
index 8af53759723f4210b2c42f927dfa9013fec14030..8df708bc0d649108bf77e4dfc90de32f91c3d452 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sash (3.7-9) unstable; urgency=low
+
+  * Drop dependency on lockfile-progs, no longer needed.
+  * Drop versioned dependency on passwd, that version is pre-oldstable
+  * Drop versioned conflicts on fileutils, that version is pre-oldstable.
+  * Move to debhelper 7 instead of cdbs.
+  * Add missing set -e to postrm.
+  * Drop full paths to add-shell and remove-shell.
+  * Add lintian override for embedded zlib.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 09 Oct 2009 09:15:48 +0200
+
 sash (3.7-8) unstable; urgency=medium
 
   * Get rid of the sashroot account and all debconfiscation (but don't

diff --git a/debian/compat b/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 898b3cddbe8abd63e17dcae6db18d5807ad26c64..e5be88e609c1e914b8598a4de9829e08cb3f89ea 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,13 @@ Section: shells
 Priority: optional
 Maintainer: Tollef Fog Heen <tfheen@debian.org>
 Standards-Version: 3.8.0
-Build-Depends: zlib1g-dev (>= 1:1.2.2-7), cdbs, debhelper (>= 4.1.0), e2fslibs-dev
+Build-Depends: zlib1g-dev (>= 1:1.2.2-7), debhelper (>= 7), e2fslibs-dev
 
 Package: sash
 Architecture: any
 Section: shells
 Priority: optional
-Depends: lockfile-progs, passwd (>= 1:4.0.3-10), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: fileutils (<<4.0-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: doc-debian
 Description: Stand-alone shell
  sash serves as an interactive substitute for /bin/sh, for use when

diff --git a/debian/dirs b/debian/dirs
index ee06f6fe0aa7d77bb54cf7dfb45bea372f9965d1..add40eefd3159f04e4e01b1ebd48de734c652eb9 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,3 @@
 bin
 usr/share/man/man1
+usr/share/lintian/overrides/

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index bc64908e1a267285da687969e2ea34f5e591a894..0debc8754b6aacfedca96d634838ee15e3675c6f 100644 (file)
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1 +1,2 @@
 sash: statically-linked-binary ./bin/sash
+sash: embedded-zlib ./bin/sash

diff --git a/debian/postinst b/debian/postinst
index 55d70e397a2911052ad083f8c851cbe677d65fb1..e0a68fd7a2c703145be11105e95564177e361f37 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,7 +7,7 @@ set -e
 if [ "$1" = "configure" ] && [ "$2" = "" ] || dpkg --compare-versions "$2" lt "3.7-7.3"; then
     # initial install or upgrade from old version which didn't call
     # add-shell properly.
-    /usr/sbin/add-shell /bin/sash
+    add-shell /bin/sash
 fi
 
 # Make sure we get rid of any stuff in /usr/doc

diff --git a/debian/postrm b/debian/postrm
index 133de8419f0f0d28370ecdeff49a9c668b6ef7fa..b4ae8eb7c16b500bc75dba572c8d21d2fd1f11d0 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,11 +1,13 @@
-#!/bin/sh
+#! /bin/sh
+
+set -e
 
 case "$1" in 
     purge)
        rm -rf /var/lib/sash/
         ;;
     remove)
-        /usr/sbin/remove-shell /bin/sash
+        remove-shell /bin/sash
         ;;
 esac
 

diff --git a/debian/rules b/debian/rules
index 5cb3745834dba3b1ee2c9e275b6865a3892a2cba..c611dacfdc43537c9e834918f62c36c91ed0b84c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,12 @@
 
 pkgdir := `pwd`/debian/sash
 
-DEB_MAKE_INSTALL_TARGET=install BINDIR=$(pkgdir)/bin MANDIR=$(pkgdir)/usr/share/man/man1
-# work around cdbs brain-damage
-LDFLAGS=-static
+%:
+       dh $@
 
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+override_dh_auto_install:
+       make install BINDIR=$(pkgdir)/bin MANDIR=$(pkgdir)/usr/share/man/man1
 
-binary-install/sash::
-       mkdir -p $(pkgdir)/usr/share/lintian/overrides/
+override_dh_install:
+       dh_install
        install -m 0644 debian/lintian-overrides $(pkgdir)/usr/share/lintian/overrides/sash

diff --git a/sash.c b/sash.c
index 2797f07dd4d4ceabaedbce41f902bc4890dd9fdb..6041bed65d07399fdda334e82f1a751b3aa29e84 100644 (file)
--- a/sash.c
+++ b/sash.c
@@ -132,9 +132,9 @@ static const CommandEntry   commandEntryTable[] =
        },
 
        {
-               "exit",         do_exit,        1,      1,
+               "exit",         do_exit,        1,      2,
                "Exit from sash",
-               ""
+               "[exit value]"
        },
 
        {