Imported Debian patch 8.14.2-3debian/8.14.2-3

3 files changed, 11 insertions, 4 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index 03da1e2..24fdeac 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.2 2007-11-30 09:13:59 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.2 2008-02-10 13:47:11 cowboy Exp $
 #
 # Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
@@ -16,7 +16,7 @@
 #		on Debian slink, potato, woody, testing, sid, ...
 #		but the generated file is customized to the version noted above.
 #
-# Richard Nelson <cowboy@debian.org> 2007-11-30 09:13:59 (-0800)
+# Richard Nelson <cowboy@debian.org> 2008-02-10 13:47:11 (-0800)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index f9647df..cf97ab8 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -25,7 +25,7 @@ Maintainer: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.7.2
 ]]dnl # Sigh... build daemons ignore B-D-I, so replicate in B-D :(
 [[Build-Depends-Indep: groff, bsdmainutils
-Build-Depends: make (>> 3.79.1-14), m4, cdbs, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) | linux-kernel-headers, groff, bsdmainutils @sm_badepends@
+Build-Depends: make (>> 3.79.1-14), m4, cdbs, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], groff, bsdmainutils @sm_badepends@
 Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)
 Homepage: http://www.sendmail.org]]dnl
 dnl #
diff --git a/debian/build/debian/sendmail-base.postrm.in b/debian/build/debian/sendmail-base.postrm.in
index a440573..b07118b 100644
--- a/debian/build/debian/sendmail-base.postrm.in
+++ b/debian/build/debian/sendmail-base.postrm.in
@@ -65,6 +65,12 @@ case "$1" in
         rm -f   @libdir@/lib/sasl/Sendmail.conf;
         rm -f   @sysconfdir@/certs/sendmail.pem;
 		rm -f	@datadir@/bug/sendmail*;
+		rmdir   --ignore-fail-on-non-empty @datadir@/bug;
+		rm -f   @sysconfdir@/logrotate.d/sendmail;
+		rmdir   --ignore-fail-on-non-empty @sysconfdir@/logrotate.d;
+		rm -f   @sysconfdir@/logcheck/violations.ignore.d/sendmail;
+		rmdir   --ignore-fail-on-non-empty @sysconfdir@/logcheck/violations.ignore.d;
+		rmdir   --ignore-fail-on-non-empty @sysconfdir@/logcheck;
         # Can't touch these as they may be included in slapd.conf
         #rm -rf @sysconfdir@/ldap/schema/sendmail.schema;
         #rm -rf @sysconfdir@/openldap/sendmail.schema;
@@ -82,7 +88,8 @@ case "$1" in
             @sysconfdir@/mail/default-auth-info \
             ;
         rmdir   @sysconfdir@/mail/peers 2>/dev/null || true;
-        rmdir   @sysconfdir@/mail 2>/dev/null || true;	
+        rmdir   @sysconfdir@/mail 2>/dev/null || true;
+		rmdir   @docdir@/sendmail 2>/dev/null || true;
 
 		;;