Update the killer package in Squeeze?

[Petter Reinholdtsen <pere@hungry.com>]

Hi.  The killer package in squeeze have two important bugs I would
like to fix.  The most important is that it send email using the wrong
domain when killing user processes.  The second is its failure to
handle removed but not purged gracefully.

I've just updated the package in untable with the fixes, and cleaned
up the package a bit in the process.

The debdiff is attached.  Is it OK to upload this new version to
Squeeze?
-- 
Happy hacking
Petter Reinholdtsen

diff -u killer-0.90/debian/control killer-0.90/debian/control
--- killer-0.90/debian/control
+++ killer-0.90/debian/control
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Edu Developers <debian-edu@lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere@debian.org>, José L. Redrejo Rodríguez <jredrejo@debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, perl, dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 8.0.0), cdbs, perl, dpatch
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-edu/trunk/src/killer
 Vcs-Browser: http://svn.debian.org/wsvn/debian-edu/trunk/src/killer
 
diff -u killer-0.90/debian/copyright killer-0.90/debian/copyright
--- killer-0.90/debian/copyright
+++ killer-0.90/debian/copyright
@@ -4,7 +4,8 @@
 It was downloaed from
 <URL:http://homepages.cae.wisc.edu/~gerdts/killer/>.
 
-The killer package is copyright Michael Gerdts <mgerdts at gmail.com>.
+The killer package is copyright (C) 1999, 2000 Michael
+Gerdts <mgerdts at gmail.com>.
 
 These scripts are free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
diff -u killer-0.90/debian/changelog killer-0.90/debian/changelog
--- killer-0.90/debian/changelog
+++ killer-0.90/debian/changelog
@@ -1,3 +1,23 @@
+killer (0.90-8) unstable; urgency=low
+
+  * Change empty-domain.dpatch to fetch mail domain from DNS domain and
+    not NIS domain (Closes: #656297).
+  * Adjust cron job to return exit code 0 also when the package is
+    removed but not purged (Closes: #586199).
+  * Update standards-version from 3.8.0 to 3.9.2.  No changes needed.
+  * Update debhelper compat level from 5 to 8.
+  * Adjust copyright file to get lintian to discover the copyright
+    statement.
+  * Add README.source to keep lintian happy.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Wed, 18 Jan 2012 10:13:58 +0100
+
+killer (0.90-7~lenny1) stable; urgency=low
+
+  * Upload to stable.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Tue, 26 Jan 2010 13:27:36 +0100
+
 killer (0.90-7) unstable; urgency=low
 
   * Fix linux-ps-longusernames.dpatch to also handle long usernames in
@@ -17,7 +37,7 @@
 
   * Rewrite patch x-console to drop code to use uid instead of username
     for console users.  It was based on a misunderstanding regarding the
-    source of the uids (Closes: #467499). 
+    source of the uids (Closes: #467499).
   * New patch linux-ps-longusernames to look up uids returned from ps to
     get the usernames, to work around the misfeature in ps only showing
     uids for users with usernames > 8 characters.
diff -u killer-0.90/debian/cron.hourly killer-0.90/debian/cron.hourly
--- killer-0.90/debian/cron.hourly
+++ killer-0.90/debian/cron.hourly
@@ -3 +3 @@
-[ -x /usr/sbin/killer ] && /usr/sbin/killer
+if [ -x /usr/sbin/killer ] ; then /usr/sbin/killer; fi
diff -u killer-0.90/debian/patches/empty-domain.dpatch killer-0.90/debian/patches/empty-domain.dpatch
--- killer-0.90/debian/patches/empty-domain.dpatch
+++ killer-0.90/debian/patches/empty-domain.dpatch
@@ -1,6 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
-Use 'localhost' as domain if it is currently unset.
+Use 'localhost' as domain if it is currently unset.  Use DNS domain
+and not NIS domain when figuring out what to use after @ in email
+addresses.
 
 @DPATCH@
 diff -u killer-0.90/killer killer-0.90/killer
@@ -10,8 +12,8 @@
  # Configuration options:
  # ########
  
-+my $domainname = `domainname 2>/dev/null || true`;
 -my $domainname = `domainname`;
++my $domainname = `dnsdomainname 2>/dev/null || true`;
  chop $domainname;
 +$domainname = "localhost" unless ($domainname);
  
only in patch2:
unchanged:
--- killer-0.90.orig/debian/README.source
+++ killer-0.90/debian/README.source
@@ -0,0 +1,2 @@
+This package uses dpatch.  See /usr/share/doc/dpatch/README.source.gz
+for more information.