Imported Debian patch 8.14.1-7debian/8.14.1-7

4 files changed, 13 insertions, 5 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index a471b0f..d13f34f 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.1 2007-06-23 16:49:51 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.1 2007-06-25 20:59:24 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-06-23 16:49:51 (-0700)
+# Richard Nelson <cowboy@debian.org> 2007-06-25 20:59:24 (-0700)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index ff3b11f..3731d73 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -23,8 +23,9 @@ Priority: extra
 Section:  mail
 Maintainer: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.7.2
-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 @sm_badepends@
+]]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-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)]]dnl
 dnl #
 dnl # The arch=any package: sendmail-bin
diff --git a/debian/changelog b/debian/changelog
index 331cfe4..167affd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sendmail (8.14.1-7) unstable; urgency=low
+
+  * buildd's do not honour Build-Depends-Indep:, so replicate that
+    information on the Build-Depends line to solve FTBFS  Closes: #430405
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 29 May 2007 02:21:00 -0000
+
 sendmail (8.14.1-6) unstable; urgency=low
 
   * The `ironclad or die` release, using newer gcc/binutils
diff --git a/debian/control b/debian/control
index 7803deb..0c49cf6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section:  mail
 Maintainer: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.7.2
 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 , libdb4.5-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev
+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 , libdb4.5-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev
 Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)
 
 Package: sendmail-bin