Re: Update the killer package in Squeeze?

[Petter Reinholdtsen <pere@hungry.com>]

[Cyril Brulebois]
> probably not. Please extract the needed changes and apply them to
> the stable's version, and send a debdiff. Changing debhelper compat,
> playing with Standards-Version etc. have nothing to do in a stable
> upload AFAICT.

Thank you for the review.

I'm fine with this reduced approach too.  Here is another proposal
with only the bug fixes.  Just let me know which of these are ok for
Squeeze, and I'll do the upload.
-- 
Happy hacking
Petter Reinholdtsen

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,13 @@
+killer (0.90-7squeeze1) stable-proposed-updates; urgency=low
+
+  * Backport bugfixes from unstable.
+  * 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).
+
+ -- Petter Reinholdtsen <pere@debian.org>  Wed, 18 Jan 2012 13:10:43 +0100
+
 killer (0.90-7) unstable; urgency=low
 
   * Fix linux-ps-longusernames.dpatch to also handle long usernames in
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);