Dear mentors,
sorry but wrong debdiff attached - here ist the correct version.
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 2011-03-28 22:38:19.000000000
+0200
+++ amavisd-milter-1.5.0/debian/changelog 2011-08-15 19:15:06.000000000
+0200
@@ -1,3 +1,21 @@
+amavisd-milter (1.5.0-4) unstable; urgency=low
+
+ * debian/control:
+ - Bumped Standards to 3.9.2 (no changes needed).
+ - Changed Vcs-* fields as package is now maintained in a git repository
+ (thanks to Alexander Wirt for the conversion from mercurial).
+ - Changed build depedency on debhelper to >= 8 for easier backporting
+ to Lenny.
+ * debian/changelog:
+ - Fixed small word duplication error.
+ * debian/rules:
+ - Modified inclusion method of HARDENING_CFLAGS and HARDENING_LDFLAGS
+ from hardening-includes package to avoid duplication of these params.
+ - Stopped unnecessary linking of amavisd-milter binary by adding
+ "-Wl,--as-needed" to LDFLAGS.
+
+ -- Harald Jenny <har...@a-little-linux-box.at> Mon, 15 Aug 2011 19:11:03
+0200
+
amavisd-milter (1.5.0-3) unstable; urgency=low
* debian/changelog:
@@ -47,7 +65,7 @@
Dumont for the libconfig-model-perl parser).
- Changed license for debian packaging to match the one used by upstream
simplifying patch exchange (thanks to Paul Wise and Charles Plessy for
- the the valuable help).
+ the valuable help).
-- Harald Jenny <har...@a-little-linux-box.at> Mon, 28 Mar 2011 22:38:07
+0200
diff -Nru amavisd-milter-1.5.0/debian/control
amavisd-milter-1.5.0/debian/control
--- amavisd-milter-1.5.0/debian/control 2011-01-26 07:02:55.000000000 +0100
+++ amavisd-milter-1.5.0/debian/control 2011-08-15 19:15:06.000000000 +0200
@@ -2,11 +2,11 @@
Section: mail
Priority: extra
Maintainer: Harald Jenny <har...@a-little-linux-box.at>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev (>= 20100122.1),
libmilter-dev, hardening-includes
+Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1), libmilter-dev,
hardening-includes
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.1
+Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=amavisd-new/pkg-amavisd-milter.git
+Vcs-Git: git://anonscm.debian.org/amavisd-new/pkg-amavisd-milter.git
+Standards-Version: 3.9.2
Package: amavisd-milter
Architecture: any
diff -Nru amavisd-milter-1.5.0/debian/rules amavisd-milter-1.5.0/debian/rules
--- amavisd-milter-1.5.0/debian/rules 2011-01-26 05:49:05.000000000 +0100
+++ amavisd-milter-1.5.0/debian/rules 2011-08-15 19:15:06.000000000 +0200
@@ -1,8 +1,7 @@
#!/usr/bin/make -f
include /usr/share/hardening-includes/hardening.make
-CFLAGS += $(HARDENING_CFLAGS)
-LDFLAGS += $(HARDENING_LDFLAGS)
+EXTRA_LDFLAGS="-Wl,--as-needed"
%:
dh $@ --with autotools_dev
@@ -11,7 +10,8 @@
dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man \
--sysconfdir=/etc --localstatedir=/var/lib/amavis \
--with-working-dir=/var/lib/amavis/tmp \
- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ CFLAGS="$(CFLAGS) $(HARDENING_CFLAGS)" \
+ LDFLAGS="$(LDFLAGS) $(HARDENING_LDFLAGS) $(EXTRA_LDFLAGS)"
override_dh_auto_install:
dh_auto_install --destdir=debian/amavisd-milter
