[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.6.4-4-15-gd7e2402

[Alexander Wirt]

The following commit has been merged in the master branch:
commit ba782b2a6adb6a376fafdabb12ecd64e429a37ab
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Aug 9 09:13:24 2011 +0200

    Remove missing milter patch
    
    Git-Dch: Ignore

diff --git a/debian/patches/55_helper-progs_build_fixes.dpatch b/debian/patches/55_helper-progs_build_fixes.dpatch
deleted file mode 100755
index 01e2f5d..0000000
--- a/debian/patches/55_helper-progs_build_fixes.dpatch
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_helper-progs_build_fixes.dpatch by  <hmh at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix sendmail detection
-
- at DPATCH@
-diff -urNad unstable~/helper-progs/Makefile.in unstable/helper-progs/Makefile.in
---- unstable~/helper-progs/Makefile.in	2006-11-04 00:55:56.000000000 -0300
-+++ unstable/helper-progs/Makefile.in	2006-11-04 00:56:34.710451077 -0300
-@@ -15,8 +15,8 @@
- 
- all: amavis-milter amavis
- 
--amavis-milter.c:
--	ln -sf amavis-milter-based-on-1.1.2.3.2.40-v2.c amavis-milter.c
-+unstripped: FORCE
-+	$(MAKE) all DONT_STRIP=1
- 
- amavis-milter: amavis-milter.o 
- 	@CC@ @CFLAGS@ @LDFLAGS@ @PTHREAD_FLAG@ -o amavis-milter amavis-milter.o @LIBMILTER@ @LIBS@
-diff -urNad unstable~/helper-progs/configure.in unstable/helper-progs/configure.in
---- unstable~/helper-progs/configure.in	2006-11-04 00:55:56.000000000 -0300
-+++ unstable/helper-progs/configure.in	2006-11-04 00:56:34.710451077 -0300
-@@ -153,6 +153,10 @@
-    AC_PATH_PROG(SENDMAILPROG, sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)
- fi
- 
-+if test "$SENDMAILPROG" = "no" ; then
-+   SENDMAILPROG=/usr/sbin/sendmail
-+fi
-+
- dnl rm
- AC_PATH_PROG(RM, rm, no, $PATH)
- 
-@@ -280,9 +284,9 @@
- 
- 
- 
--if test "$SENDMAILPROG" != "no" ; then
--        sendmailversion=`$SENDMAILPROG -bv -d0.1 | $AWK '/Version/ {print $2}'`
--        echo ""
--        echo "Info: sendmail version $sendmailversion detected"
--        echo ""
--fi
-+#if test "$SENDMAILPROG" != "no" ; then
-+#        sendmailversion=`$SENDMAILPROG -bv -d0.1 | $AWK '/Version/ {print $2}'`
-+#        echo ""
-+#        echo "Info: sendmail version $sendmailversion detected"
-+#        echo ""
-+#fi

-- 
Debian packaging for amavisd-new