Imported Debian patch 8.13.8-3debian/8.13.8-3

3 files changed, 16 insertions, 4 deletions

diff --git a/debian/build/config.sub b/debian/build/config.sub
index 387c18d..fab0aa3 100644
--- a/debian/build/config.sub
+++ b/debian/build/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -367,7 +368,7 @@ case $basic_machine in
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1366,6 +1371,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
         spu-*)
 		os=-elf
 		;;
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index 0cedb8e..0c3a33b 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -40,7 +40,7 @@ Provides: mail-transport-agent
 Conflicts: mail-transport-agent, sendmail (<< 8.13.1-7)
 Depends: sendmail-base, sendmail-cf, ${shlibs:Depends}, ${perl:Depends} @sm_depends@
 Recommends: @sm_recommends@
-Suggests: sendmail-doc, @sm_suggests@
+Suggests: sendmail-doc, @sm_suggests@, cyrus-common
 Description: powerful, efficient, and scalable Mail Transport Agent
  Sendmail is an alternative Mail Transport Agent (MTA) for Debian.
  It is suitable for handling sophisticated mail configurations,
diff --git a/debian/build/debian/sendmail-bin.prerm.in b/debian/build/debian/sendmail-bin.prerm.in
index 05cdbf3..a478620 100644
--- a/debian/build/debian/sendmail-bin.prerm.in
+++ b/debian/build/debian/sendmail-bin.prerm.in
@@ -52,6 +52,10 @@ case "$1" in
 				@sysconfdir@/init.d/sendmail stop;
 				fi;
 			fi;
+		# Prevent cronjob from running during upgrade...
+		if [ -f /etc/cron.d/sendmail ]; then
+			rm -f @sysconfdir@/cron.d/sendmail;
+			fi;
 		;;
 
 	upgrade)