diff -u spfmilter-1.99+0.95/debian/changelog spfmilter-1.99+0.95/debian/changelog
--- spfmilter-1.99+0.95/debian/changelog
+++ spfmilter-1.99+0.95/debian/changelog
@@ -1,3 +1,11 @@
+spfmilter (1.99+0.95-4.1) unstable; urgency=low
+
+  * NMU
+  * Built against libspf (closes: #306071, #307086, #316239)
+  * Added dependency on adduser (closes: #306202)
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]>  Wed,  7 Jun 2006 00:34:54 +0200
+
 spfmilter (1.99+0.95-4) unstable; urgency=low
 
   * Drop --pidfile argument in init script's stop stanza since the
diff -u spfmilter-1.99+0.95/debian/control spfmilter-1.99+0.95/debian/control
--- spfmilter-1.99+0.95/debian/control
+++ spfmilter-1.99+0.95/debian/control
@@ -2,12 +2,12 @@
 Section: mail
 Priority: extra
 Maintainer: Mike Markley <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libspf2-dev (>= 1.0.4-4), libmilter-dev (>= 8.13.0-2)
+Build-Depends: debhelper (>= 4.0.0), libspf-dev, libmilter-dev (>= 8.13.0-2)
 Standards-Version: 3.6.1
 
 Package: spfmilter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Description: A simple milter for performing SPF checks
  spfmilter implements Sender Policy Framework (SPF) checks using the
  Milter (Mail Filter) interface. This interface is primarily used to plug
only in patch2:
unchanged:
--- spfmilter-1.99+0.95.orig/spfmilter.c
+++ spfmilter-1.99+0.95/spfmilter.c
@@ -1619,9 +1619,7 @@
 
 
 /* Decide which library we can/should use. */
-#ifdef HAVE_LIBSPF_SPF_H
 #define USE_LIBSPF
-#endif
 #ifdef HAVE_SPF2_SPF_H
 #define USE_LIBSPF2
 #endif
@@ -1639,7 +1637,7 @@
 /* Libspf data and routines. */
 
 
-#include <libspf/spf.h>
+#include <spf.h>
 
 
 struct lib_fallback_s {

Reply via email to