Dear release team,

I was trying to get a new version of amavisd-milter (1.5.0-3) sponsored and the
issue was raised if the package is suitable for inclusion into Squeeze. As the
upcoming release is already in deep freeze the changeset may not be important
enough to justify an exception. On the other hand the current version "may"
be in violation of Debian policy (7.3/7.4) which I guess is also not really
desirable. In order to allow for some prelimiary judgement I have attached a
debdiff of the dsc files from the versions 1.5.0-2 and 1.5.0-3.
Thanks for your time and I hope you can accept my changes as I see this an
effort to provide the best and cleanest possible package for Squeeze.

Kind regards
Harald Jenny
diff -Nru amavisd-milter-1.5.0/debian/changelog 
amavisd-milter-1.5.0/debian/changelog
--- amavisd-milter-1.5.0/debian/changelog       2010-11-05 10:56:30.000000000 
+0100
+++ amavisd-milter-1.5.0/debian/changelog       2010-11-26 13:08:08.000000000 
+0100
@@ -1,20 +1,51 @@
+amavisd-milter (1.5.0-3) unstable; urgency=low
+
+  * debian/changelog:
+    - Reformatted changelog for better legibility.
+    - Added thanks to initiator of two changes (forgot last time).
+  * debian/control:
+    - Really made package 3.9.0 Standards compliant by changing Conflicts to
+      Breaks (overlooked this fact last time).
+    - Bumped Standards to 3.9.1 (no changes needed).
+    - Made Breaks versioned to satisfy lintian.
+  * debian/rules:
+    - Changed dh_installinit invocation to restart amavisd-milter after upgrade
+      for minimizing daemon downtime.
+    - Removed dh_installchangelogs override as upstream changelog gets picked
+      up automatically.
+  * debian/patches/*-location:
+    - Corrected the mail address in the patches and modified the timestamp
+      accordingly.
+
+ -- Harald Jenny <har...@a-little-linux-box.at>  Fri, 26 Nov 2010 11:46:26 
+0100
+
 amavisd-milter (1.5.0-2) unstable; urgency=low
 
-  * debian/control: Bumped Standards to 3.9.0 (no changes needed). Added Vcs-*
-    fields as package is now hosted in amavisd-new repository. Build-Depend on
-    debhelper changed to >= 7.0.50~. Build-Depend on autotools-dev added. Added
-    an entry for the amavisd-milter-dbg package.
-  * debian/amavisd-milter.default: Added a note about amavisd-new TEMPDIR.
-  * debian/README.Debian: Added a note about AM.PDP section in amavisd-new
-    config.
-  * debian/copyright: Changed to use DEP-5 proposal format.
-  * debian/rules: Converted to dh usage. Added code to symlink to autotools-dev
-    versions of config.{sub,guess} at compile time. Added rules to build a
-    debug package.
-  * debian/stamp-patched, README.source: Removed as they were leftovers of
-    pre-official packages.
-  * debian/source.lintian-overrides: Removed due to use of autotools-dev.
-  * debian/compat: Bumped Version to 7.
+  * debian/control:
+    - Bumped Standards to 3.9.0 (no changes needed).
+    - Added Vcs-* fields as package is now hosted in amavisd-new repository.
+    - Build-Depend on debhelper changed to >= 7.0.50~.
+    - Build-Depend on autotools-dev added.
+    - Added an entry for the amavisd-milter-dbg package.
+  * debian/amavisd-milter.default:
+    - Added a note about amavisd-new TEMPDIR (thanks to Miguel A. Novo for the
+      hint).
+  * debian/README.Debian:
+    - Added a note about AM.PDP section in amavisd-new config (thanks to Miguel
+      A. Novo for the hint).
+  * debian/copyright:
+    - Changed to use DEP-5 proposal format.
+  * debian/rules:
+    - Converted to dh usage.
+    - Added code to symlink to autotools-dev versions of config.{sub,guess} at
+      compile time.
+    - Added rules to build a debug package.
+  * debian/stamp-patched, README.source:
+    - Removed as they were leftovers of pre-official packages.
+  * debian/source.lintian-overrides:
+    - Removed due to use of autotools-dev.
+  * debian/compat:
+    - Bumped Version to 7.
 
  -- Harald Jenny <har...@a-little-linux-box.at>  Mon, 12 Jul 2010 02:24:04 
+0200
 
diff -Nru amavisd-milter-1.5.0/debian/control 
amavisd-milter-1.5.0/debian/control
--- amavisd-milter-1.5.0/debian/control 2010-11-05 10:56:30.000000000 +0100
+++ amavisd-milter-1.5.0/debian/control 2010-11-26 13:06:25.000000000 +0100
@@ -6,13 +6,13 @@
 Homepage: http://amavisd-milter.sourceforge.net/
 Vcs-Browser: http://hg.debian.org/hg/amavisd-new/amavisd-milter
 Vcs-Hg: http://hg.debian.org/hg/amavisd-new/amavisd-milter
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 
 Package: amavisd-milter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, amavisd-new (>= 2.4.3)
 Recommends: sendmail (>= 8.13.8-3) | postfix (>= 2.3.8-2+etch1)
-Conflicts: amavisd-new-milter
+Breaks: amavisd-new-milter (<= 1:2.6.4-2)
 Description: amavisd-new interface for milter-capable MTAs
  This package provides a milter for amavisd-new that works with
  Sendmail or Postfix, using the AM.PDP protocol.
diff -Nru amavisd-milter-1.5.0/debian/patches/manpage-locations 
amavisd-milter-1.5.0/debian/patches/manpage-locations
--- amavisd-milter-1.5.0/debian/patches/manpage-locations       2010-05-12 
23:01:42.000000000 +0200
+++ amavisd-milter-1.5.0/debian/patches/manpage-locations       2010-11-26 
13:08:08.000000000 +0100
@@ -1,7 +1,7 @@
 Description: Adapt paths in manpage for Debian
-Author: Harald Jenny <har...@a-little-linux-box.ag>
+Author: Harald Jenny <har...@a-little-linux-box.at>
 Forwarded: not-needed
-Last-Update: 2010-03-16
+Last-Update: 2010-10-26
 
 Index: b/amavisd-milter/amavisd-milter.8
 ===================================================================
diff -Nru amavisd-milter-1.5.0/debian/patches/pidfile-location 
amavisd-milter-1.5.0/debian/patches/pidfile-location
--- amavisd-milter-1.5.0/debian/patches/pidfile-location        2010-05-12 
23:01:42.000000000 +0200
+++ amavisd-milter-1.5.0/debian/patches/pidfile-location        2010-11-26 
13:08:08.000000000 +0100
@@ -1,7 +1,7 @@
 Description: Adapt location of pidfile for Debian
-Author: Harald Jenny <har...@a-little-linux-box.ag>
+Author: Harald Jenny <har...@a-little-linux-box.at>
 Forwarded: not-needed
-Last-Update: 2010-03-16
+Last-Update: 2010-10-26
 
 Index: b/amavisd-milter/main.c
 ===================================================================
diff -Nru amavisd-milter-1.5.0/debian/rules amavisd-milter-1.5.0/debian/rules
--- amavisd-milter-1.5.0/debian/rules   2010-11-05 10:56:30.000000000 +0100
+++ amavisd-milter-1.5.0/debian/rules   2010-11-26 13:06:36.000000000 +0100
@@ -32,12 +32,12 @@
                mv aclocal/config.guess_ORIG aclocal/config.guess; \
        fi
 
-override_dh_installchangelogs:
-       dh_installchangelogs CHANGES
-
 override_dh_installdocs:
        dh_installdocs -Namavisd-milter-dbg
        dh_installdocs -pamavisd-milter-dbg --link-doc=amavisd-milter
 
+override_dh_installinit:
+       dh_installinit -R
+
 override_dh_strip:
        dh_strip --dbg-package=amavisd-milter-dbg

Reply via email to