diff -u libspf2-1.2.5/debian/changelog libspf2-1.2.5/debian/changelog
--- libspf2-1.2.5/debian/changelog
+++ libspf2-1.2.5/debian/changelog
@@ -1,3 +1,15 @@
+libspf2 (1.2.5-4ubuntu1) feisty; urgency=low
+
+  * Fix Debian bug#306875.
+  * debian/compat: Added
+  * debian/control: Updated conflicts and added Section
+  * debian/rules: Rename spfquery for update alternatives
+  * debian/spfquery.postinst: Added for update alternatives
+  * debian/spfquery.prerm: Added for update alternatives
+  * debian/copyright: Updated author e-mail address and web site
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 20 Jan 2007 10:57:20 -0500
+
 libspf2 (1.2.5-4) unstable; urgency=low

   * Orphan.
diff -u libspf2-1.2.5/debian/control libspf2-1.2.5/debian/control
--- libspf2-1.2.5/debian/control
+++ libspf2-1.2.5/debian/control
@@ -1,8 +1,9 @@
 Source: libspf2
+Section: libs
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 5), cdbs
+Standards-Version: 3.7.2

 Package: libspf2-dev
 Section: libdevel
@@ -37,3 +38,3 @@
-Conflicts: libmail-spf-query-perl
+Conflicts: libmail-spf-query-perl (<< 1:1.999.1-3)
 Description: Sender Policy Framework library, written in C
- Utilities to test and query SPF records.
\ No newline at end of file
+ Utilities to test and query SPF records.
diff -u libspf2-1.2.5/debian/copyright libspf2-1.2.5/debian/copyright
--- libspf2-1.2.5/debian/copyright
+++ libspf2-1.2.5/debian/copyright
@@ -3,11 +3,11 @@

 It was downloaded from http://www.libspf2.org/

-Upstream Author: Wayne Schlitt <wayne@midwestcs.com>
+Upstream Author: Wayne Schlitt <wayne@schlitt.net>

 Copyright:

-This software is copyright (c) 2004 by Wayne Schlitt <wayne@midwestcs.com>
+This software is copyright (c) 2004 by Wayne Schlitt <wayne@schlitt.net>

 You are free to distribute this software under the terms of
 the GNU General Public License version 2 or the BSD license, at your choice.
diff -u libspf2-1.2.5/debian/rules libspf2-1.2.5/debian/rules
--- libspf2-1.2.5/debian/rules
+++ libspf2-1.2.5/debian/rules
@@ -3,4 +3,10 @@
+SOURCE_PACKAGE = libspf2
+
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+
+binary-install/spfquery::
+       # Rename the `spfquery` tool for the alternatives system:
+       mv debian/spfquery/usr/bin/spfquery debian/spfquery/usr/bin/spfquery.$(SOURCE_PACKAGE)
only in patch2:
unchanged:
--- libspf2-1.2.5.orig/debian/spfquery.prerm
+++ libspf2-1.2.5/debian/spfquery.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+mode=$1
+
+source_package=libspf2
+
+case "$mode" in
+  remove )
+    update-alternatives --remove spfquery /usr/bin/spfquery.$source_package
+    ;;
+esac
+
+#DEBHELPER#
only in patch2:
unchanged:
--- libspf2-1.2.5.orig/debian/compat
+++ libspf2-1.2.5/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- libspf2-1.2.5.orig/debian/spfquery.postinst
+++ libspf2-1.2.5/debian/spfquery.postinst
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+mode=$1
+
+source_package=libspf2
+
+case "$mode" in
+  configure )
+    prev_version=$2
+
+    update-alternatives --install /usr/bin/spfquery spfquery      /usr/bin/spfquery.$source_package 75
+    ;;
+esac
+
+#DEBHELPER#