--- spamassassin-3.2.0.orig/debian/65_debian.cf
+++ spamassassin-3.2.0/debian/65_debian.cf
@@ -0,0 +1,27 @@
+# Special SpamAssassin rules for Debian
+# Duncan Findlay
+
+header	 D_SENT_BY_DEBCONF	Subject =~ /^Debconf:/
+score	 D_SENT_BY_DEBCONF	-5.0
+describe D_SENT_BY_DEBCONF	Sent by Debconf
+
+body	 D_SENT_BY_AFBACKUP	/^\[Afbackup\]: Overall exit status:/
+score	 D_SENT_BY_AFBACKUP	-5.0
+describe D_SENT_BY_AFBACKUP	Sent by Afbackup
+
+header	 D_SENT_BY_APTLC	Subject =~ /^apt-listchanges: (changelogs|news) for/
+score	 D_SENT_BY_APTLC	-5.0
+describe D_SENT_BY_APTLC	Sent by apt-listchanges
+
+header	 __ANACRON_SUBJ		Subject =~ /^Anacron job '[a-z0-9_.-]+' on/i
+header   __ANACRON_FROM		From =~ /^Anacron/
+meta	 D_SENT_BY_ANACRON	__ANACRON_SUBJ && __ANACRON_FROM
+score	 D_SENT_BY_ANACRON	-5.0
+describe D_SENT_BY_ANACRON	Sent by Anacron Daemon
+
+
+header	 __CRON_FROM		From =~ /^Cron Daemon/
+header 	 __CRON_HEADER		X-Cron-Env =~ /./
+meta	 D_SENT_BY_CRON		__CRON_FROM && __CRON_HEADER
+score 	 D_SENT_BY_CRON		-5.0
+describe D_SENT_BY_CRON		Sent by Cron Daemon
--- spamassassin-3.2.0.orig/debian/NEWS
+++ spamassassin-3.2.0/debian/NEWS
@@ -0,0 +1,37 @@
+spamassassin (3.1.1-1) unstable; urgency=low
+
+  This is a new upstream release containing mostly bug fixes. The
+  largest change is the inclusion of a (fixed) script called sa-update
+  that can be used to download the latest rules from upstream. To use
+  it run sa-update as root. In the future, this may, by default, run
+  from a cron job automatically, but in the interim it is a manual
+  process.
+
+ -- Duncan Findlay <duncf@debian.org>  Sun,  7 May 2006 17:27:34 -0400
+
+spamassassin (3.1.0a-1) unstable; urgency=low
+
+  This is a new major upstream release with many new
+  features. Detailed information on the upgrade is available in
+  /usr/share/doc/spamassassin/UPGRADE.gz. The most important changes
+  are documented here. If you have made local configuration changes,
+  you will probably want to read that documentation to ensure you
+  configuration is still correct.
+
+  DCC and Razor support have been disabled by default, since they are
+  no longer free for non-personal use. To re-enable them, edit
+  /etc/spamassassin/v310.pre
+
+  More Bayes storage modules have been added. The default, using
+  perl's DB_File module, is the slowest. You may wish to switch to the
+  SDBM storage module (uses perl's SDBM_File module). If you are
+  currently using the SQL module, you may wish to switch to using the
+  MySQL or PgSQL modules. To switch storage modules, follow the steps
+  listed in the "MIGRATION" section of the sa-learn(1) man page.
+
+  Spamd and spamc now support Bayes learning, if the --allow-tell or
+  -l option is given to spamd. Please note that there may be security
+  implications with enabling this option. (Command line options to
+  spamd are changed in /etc/default/spamassassin)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed,  5 Oct 2005 14:40:41 -0400
--- spamassassin-3.2.0.orig/debian/README.postfix
+++ spamassassin-3.2.0/debian/README.postfix
@@ -0,0 +1,53 @@
+Integration SpamAssassin with Postfix
+
+This file contains information on how to integrate SpamAssassin with Postfix
+for incoming mails.
+
+1. Set SpamAssassin to start after booting the system
+
+Edit /etc/defaults/spamassassin and set SpamAssassin to start after a reboot.
+
+2. Start SpamAssassin
+
+/etc/init.d/spamassassin start
+
+3. Create a filter user.
+
+adduser --disabled-password --disabled-login --gecos "Postfix Filter User" filter
+
+4. Create the filter script.
+
+Under ~filter, create filter.sh:
+
+#!/bin/sh
+/bin/cat | /usr/bin/spamc -f | /usr/sbin/sendmail -i "$@"
+exit $?
+
+Be sure to chmod it to 750, at least.
+
+A more complete example can be found under /usr/share/doc/spamassassin/examples
+
+5. Set /etc/postfix/master.cf
+
+It must contain the following lines:
+
+localhost:smtp          inet    n       -       -       -       -       smtpd
+<external.ip>:smtp      inet    n       -       -       -       -       smtpd
+  -o content_filter=filter:
+
+[...]
+
+filter    unix  -       n       n       -       -       pipe
+  flags=Rq user=filter argv=/home/filter/filter.sh -f ${sender} -- ${recipient}
+
+6. Reload postfix
+
+As root, exec:
+
+#> postfix reload
+
+
+
+That should be it.
+
+Aug 2003, Jesus Climent
--- spamassassin-3.2.0.orig/debian/changelog
+++ spamassassin-3.2.0/debian/changelog
@@ -0,0 +1,909 @@
+spamassassin (3.2.0-0ubuntu2~feisty1) feisty-backports; urgency=low
+
+  * Automated backport upload; no source changes.
+
+ -- John Dong <john.dong@gmail.com>  Fri, 18 May 2007 11:28:08 +0100
+
+spamassassin (3.2.0-0ubuntu2) gutsy; urgency=low
+
+  * Move touch spamassassin/BUGS from install indep to configure
+    (LP: #112258) 
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri,  4 May 2007 00:41:24 -0400
+
+spamassassin (3.2.0-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+    - Removed 05_CVE_2007_0451.dpatch - incorporated upstream
+    - Removed 06_SA_BUG_5240.dpatch - incorporated upstream
+    - Removed 08_security_version.dpatch - incorporated upstream
+    - Freshen 10_change_config_paths
+  * Add new build-depends for libnet-dns-perl and removed it as 
+    recommends (libmail-spf-perl depends on it, so it will always
+    be installed)
+  * Update SPF library from libmail-spf-query-perl to libmail-spf-perl
+    - Note for future merges: Ubuntu has the new lib, Debian does not
+  * debian/rules:
+    - Touch spamassassin/BUGS because it's required, but not provided
+
+ -- Scott Kitterman <scott@kitterman.com>  Thu,  3 May 2007 08:39:58 -0400
+
+spamassassin (3.1.7-2ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control:
+      + libmail-spf-query-perl from Recommends to Depends for spamassassin
+        binary
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 16 Feb 2007 21:00:21 +0100
+
+spamassassin (3.1.7-2) unstable; urgency=high
+
+  * Security fixes backported from 3.1.8:
+    - CVE-2007-0451: potential DoS with long URIs found in the message
+    content (Closes: #410843)
+    - Prevents perl code from being loaded via sa-update by default
+    (override with --allowplugins) (SpamAssassin bug 5240)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed, 14 Feb 2007 21:46:52 -0500
+
+spamassassin (3.1.7-1ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. The remaining Ubuntu changes are:
+    - debian/control:
+      + libmail-spf-query-perl from Recommends to Depends for spamassassin 
+        binary (Ubuntu: #28486)
+
+ -- Soren Hansen <sh@linux2go.dk>  Wed,  6 Dec 2006 15:25:33 +0100
+
+spamassassin (3.1.7-1) unstable; urgency=low
+
+  * New upstream release (Closes: #385450, #396600)
+    - Fixes handling of PGP/MIME messages (Closes: #367365)
+    - Fixes URIDNSBL warning of invalid bitwise or (Closes: #373914)
+    - Fix date handling bug (Closes: #362913)
+
+  * Fix README.Debian now that libnet-dns-perl isn't a dependency anymore
+    (Closes: #374377)
+
+ -- Duncan Findlay <duncf@debian.org>  Thu,  2 Nov 2006 01:43:42 -0500
+
+spamassassin (3.1.4-1ubuntu1) edgy; urgency=low
+
+  * Merge from Debian unstable. The remaining Ubuntu changes are:
+    - debian/control:
+      + libmail-spf-query-perl from Recommends to Depends for spamassassin 
+        binary (Ubuntu: #28486)
+
+ -- Matti Lindell <mlind@cs.joensuu.fi>  Wed, 20 Sep 2006 09:01:39 +0300
+
+spamassassin (3.1.4-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixed a bug where sa-update's failure would leave SA without rules
+      (Closes: #370357)
+    - Fix BSMTP with exim (Closes: #375286)
+    - gtube.t test failed with non-english locales.
+    - Fixed memory leak with Bayes and BayesStore.
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu, 10 Aug 2006 22:40:09 +0300
+
+spamassassin (3.1.3-1ubuntu1) edgy; urgency=low
+
+  [ Ubuntu Merge-o-Matic ]
+  * Merge from debian unstable.
+
+  [ Laurent Bigonville ]
+  * fix debian/control.
+  * drop debian/patches/40_fix_dns_issue.
+
+ -- Laurent Bigonville <bigon@bigon.be>  Mon, 31 Jul 2006 15:40:08 +0200
+
+spamassassin (3.1.3-1) unstable; urgency=high
+
+  * New upstream release
+    - Fixes spamd --vpopmail/--paranoid remote command execution bug. This
+    has been assigned CVE-2006-2447.
+  
+ -- Duncan Findlay <duncf@debian.org>  Sun,  4 Jun 2006 18:24:05 -0400
+
+spamassassin (3.1.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Razor2 support re-enabled by default
+    - sa-learn should now return an error code when it can't find the
+      target file (Closes: #261346)
+  * Now really depends on libarchive-tar-perl; depends on libwww-perl,
+    libio-zlib-perl for sa-update (Closes: #348884, #359874, #366700,
+    #368424)
+
+ -- Duncan Findlay <duncf@debian.org>  Sun,  4 Jun 2006 14:56:56 -0400
+
+spamassassin (3.1.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #356995, #360994)
+    - Better error handling when DNS is broken (Closes: #340753)
+    - bayes_storage_module documented better (Closes: #333792)
+    - Fix typo in UPGRADE (Closes: #335794)
+    - Better exception handling (Closes: #333330, #333131)
+    - Fix sa-learn --restore with SDBM (Closes: #333793)
+  * Document broken identd servers (Closes: #355475)
+  * Now depends on libarchive-tar-perl (Closes: #348884)
+  * Add reference on how to force bayes expiry using a cronjob (Closes: #334829, #300490)
+  * Drop logcheck files -- these should/will be in the logcheck-database package. (See bug #)
+  * Move libnet-dns-perl back to a Recommends:. The loud warnings should
+    have been silenced upstream.
+  
+ -- Duncan Findlay <duncf@debian.org>  Wed,  9 Nov 2005 16:55:03 -0500
+
+spamassassin (3.1.0a-2ubuntu1) dapper; urgency=low
+
+  * debian/patches/40_fix_dns_issue
+    -- backported fix from 3.1.0 (Ubuntu: #39843)
+  * debian/control
+    -- move libmail-spf-query-perl from Recomends to Depends for
+       spamassassin binary (Ubuntu: #28486)
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Mon, 17 Apr 2006 11:16:16 +0200
+
+spamassassin (3.1.0a-2) unstable; urgency=low
+
+  * Greatly improved the usefulness of spamassassin's README.Debian
+  * Moved libnet-dns-perl to a dependency and added libsocket6-perl as a
+    dependency to avoid an obscure IPv6 related bug, and loud warnings
+    (Closes: #332906, #335279, #335671, #327832)
+  * Fixed the logcheck filters (Closes: #333430, #304363)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed,  9 Nov 2005 16:52:41 -0500
+
+spamassassin (3.1.0a-1) unstable; urgency=low
+
+  * Upload to unstable
+  * Clean up NEWS.Debian, so it isn't so verbose for people upgrading from
+    3.0.x
+
+ -- Duncan Findlay <duncf@debian.org>  Wed,  5 Oct 2005 17:03:50 -0400
+
+spamassassin (3.1.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add libdigest-sha1-perl to Build-Depends.
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sun, 25 Sep 2005 17:19:15 +0300
+
+spamassassin (3.0.99pre3.1.0+rc2-1) experimental; urgency=low
+
+  * New upstream release
+  * Upstream bug fixes:
+    - MIME boundary regexp improved (Closes: #288617)
+
+ -- Duncan Findlay <duncf@debian.org>  Tue, 30 Aug 2005 00:01:11 -0400
+
+spamassassin (3.0.99pre3.1.0+rc1-1) experimental; urgency=low
+
+  * New major upstream release:
+    - More Bayes storage options -- SDBM, MySQL, PostgreSQL
+    - Apache preforking algorithm; number of children scaled according to
+    demand
+    - New plugins: DomainKeys (off by default), MIMEHeader, ReplaceTags,
+    WhiteListSubject
+    - Razor2, DCC disabled by deafult because they are no longer free for
+    non-personal use
+    - AWL is now a plugin (Closes: #292610)
+    - Includes sa-update which can be used to update rules between
+    releases (currently must be manually invoked)
+
+  * Bugs in BTS fixed upstream:
+    - Stop checking for long descriptions (Closes: #274194)
+    - No longer uses Storable (Closes: #293485)
+    - Minor doc fixes (Closes: #276621, #290660)
+    - Avoid unitialized value error in Reporter.pm (Closes: #290615)
+    - Logging and error messages improved throughout (Closes: #318349)
+    - SIGHUP now works when running with -u on a privileged port (Closes:
+    #296682)
+    - Avoid ALL_TRUSTED misfire when Received: parsing fails (Closes:
+    #300809)
+    - Fix __FROM_PHONE to be more permissive (Closes: #238613)
+    - Avoid MSN Groups FPs (Closes: #290978)
+    - Better handling of UTF-8 (Closes: #291093, #297899, #306496,
+    #319014)
+    - BAYES_* scores manually set (Closes: #292327)
+    - local.cf has more comments (Closes: #271869)
+    - sa-learn is quieter (Closes: #268035)
+    - spamassassin --debug more verbose, displays files read (Closes:
+    #276778)
+
+  * No longer support the upgrade path for versions prior to
+    sarge. Including:
+    - Debconf questions about upgrading from 2.20-1woody and 2.4x
+    - Explanation of the libdb problems caused by upgrades from perl 5.6
+    to 5.8 recent versions of spamassassin (not an issue with
+    woody->testing) (Closes: #318360, #298372)
+    - Downgrade spamassassin's Depends: on spamc to Recommends: (Closes:
+    #316368)
+    - Remove the woody build hack with debconf
+
+  * Correct Suggest: on libnet-smtp-perl to libnet-perl (Closes: #317355)
+  * Upgrade to Standards Version 3.6.2.0 (by incrementing the number in
+    debian/control)
+  * Updated the way debian/rules uses dpatch to be the "new
+    way". (i.e. calls dpatch directly)
+  * No longer use debconf *at all*. As soon as I find questions worth
+    asking, we'll go back.
+
+ -- Duncan Findlay <duncf@debian.org>  Fri, 19 Aug 2005 02:22:22 -0400
+
+spamassassin (3.0.4-2) unstable; urgency=high
+
+   * Added Russian debconf translation from Yuriy Talakan
+     <yt@amur.elektra.ru> (Closes: #311920)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed,  8 Jun 2005 00:53:18 -0400
+
+spamassassin (3.0.4-1) unstable; urgency=high
+
+  * New upstream release
+    - Fixed parsing to not rely on MIME boundary (Closes: #307526, #281756)
+    - Improfed FORGED_YAHOO_RCVD to not FP (Closes: #310958)
+
+ -- Duncan Findlay <duncf@debian.org>  Tue,  7 Jun 2005 00:30:18 -0400
+
+spamassassin (3.0.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #307904)
+    - Fixed possible memory bloat from large AutoWhitelist db files
+    - Fixed where user defined rules scores became ignored (Closes: #291561)
+    - Updated parsing code for several Received: header formats
+    - Document plugin API for set/get tags (Closes: #299118)
+    - More bug fixes
+  * Added note about needing libnet-dns-perl to README.Debian (Closes: #293502)
+  * Would like this to get to sarge, if all goes well.
+
+ -- Duncan Findlay <duncf@debian.org>  Fri, 29 Apr 2005 14:09:56 -0400
+
+spamassassin (3.0.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #284663, #286595)
+    - Number of URLs now limited for URIDNSBL plugin (Closes: #279180)
+    - Handles obscure exim Recieved: header format (Closes: #279504)
+  * Updated logcheck messages (Closes: #281560)
+  * Updated README.Debian to explain a bit more about configuring
+    spamd as non-root and for sitewide bayes. (Closes: #271870, #273187)
+  * Updated README.Debian to explain issues with performance and spamd
+    (Closes: #279981)
+  * Updated watch file to handle the apache.org layout better. (Closes: #281468)
+	
+ -- Duncan Findlay <duncf@debian.org>  Sat,  1 Jan 2005 15:29:19 -0500
+
+spamassassin (3.0.1-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix problems with broken configs with spamd (Closes: #276366)
+    - Fixes some memory consuming bugs (Closes: #275232, #222783)
+    - Fixes file descriptior issue with pyzor or dccifd and amavis (Closes: #273290)
+  * Conflict with packages broken with SpamAssassin 3.0.0 (Closes:
+    #274993)
+  * Create PIDFILE option in /etc/default/spamassassin so that init
+    script works with spamd -u (Closes: #275370)
+  * Note in /etc/default/spamassassin to use --max-children with no
+    more than 5 due to preforking. (Closes: #275308)
+  * Rewrote package dependencies in control, added Suggests: on
+    dcc-client (Closes: #276729), versioned recommends on
+    libnet-dns-perl (Closes: #274825)
+  * Include procmailrc.example again (Closes: #276152)
+  * Fix muttrc example to use --no-sync instead of --no-rebuild (Closes:
+    #273670)
+  * Fixed typo in README.Debian for spamassassin -- if
+    /usr/share/spamassassin is edited you will NOT be prompted about it.
+    (Closes: #275675)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed, 27 Oct 2004 00:28:33 -0400
+
+spamassassin (3.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Features since 2.6x:
+    - New license (Now Apache Software License 2.0)
+    - Support for Sender Policy Framework (SPF)
+    - Web links checked against SURBL and SBL (Closes: #265604)
+    - Third party plug-in support
+    - Optional SQL storage for Bayes and automatic-whitelist
+    - More accurate MIME + HTML handling
+
+  * Bugfixes (not yet documented here)
+    - Document --home-helper-dir option in SYNOPSIS (Closes: #265887)
+    - More documentation fixes: --user-config is on by default (Closes: #263845, #263846)
+    - Doc: Typo "on" -> "or" (Closes: #271865)
+	
+  * Changed /etc/default/spamassassin to be more verbose (Closes: #265518)
+  * Got rid of spamassassin-tools since it was more pain than it was worth.
+
+ -- Duncan Findlay <duncf@debian.org>  Sun,  5 Sep 2004 22:05:47 -0400
+
+spamassassin (2.99pre3.0.0+rc2-2) experimental; urgency=low
+
+  * sysv-rc has a bug in the man page: use "defaults XX YY" instead of
+    "defaults NN-start NN-stop" as stated in the man. Filling bug...
+    Well, is more complicated than that. See #268713
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sat, 28 Aug 2004 17:28:44 +0000
+
+spamassassin (2.99pre3.0.0+rc2-1) experimental; urgency=low
+
+  * New upstream release candidate.
+  * Upstream closed the following bugs:
+    - sa-learn should have a long option for -f (Closes: #265888)
+    - ignore X-Bogosity (Closes: #265899)
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sat, 28 Aug 2004 07:53:33 +0000
+
+spamassassin (2.99pre3.0.0+rc1-1) experimental; urgency=low
+
+  * New upstream release candidate.
+  * init.d script starts at S19 and now stops at K21 (Closes: #267540).
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Mon, 23 Aug 2004 09:47:47 +0000
+
+spamassassin (2.99pre3.0.0+pre4-2) experimental; urgency=low
+
+  * libdigest-sha1-perl is also a requirement for building the package.
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu,  5 Aug 2004 22:28:55 +0300
+
+spamassassin (2.99pre3.0.0+pre4-1) experimental; urgency=low
+
+  * New upstream pre-release.
+  * Man pages reorganized (Closes: #263481)
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu,  5 Aug 2004 12:22:55 +0300
+
+spamassassin (2.99pre3.0.0+pre2-1) experimental; urgency=low
+
+  * New upstream pre-release.
+  * debian/control
+    - Added dependency on libdigest-sha1-perl
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sat, 10 Jul 2004 21:03:28 -0300
+
+spamassassin (2.99pre3.0.0+pre1-2) experimental; urgency=low
+
+  * Fix bad upload (bad changelog, stupid svn-buildpackage...)
+
+ -- Duncan Findlay <duncf@debian.org>  Sun, 20 Jun 2004 23:17:45 -0400
+
+spamassassin (2.99pre3.0.0+pre1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Duncan Findlay <duncf@debian.org>  Thu, 17 Jun 2004 00:50:06 -0400
+
+spamassassin (2.99pre3.0.0svn20040616-1) experimental; urgency=low
+
+  * New upstream release
+  * Includes preliminary scores (not great, but better)
+  * Created spamassassin-tools package, containing stuff to make your own rules.
+  * Added logcheck violations.ignore.d file for "result:" lines (Closes:
+    #252375)
+  * Changed logcheck for processing messages to allow unknown message
+    ids (Closes: #252406)
+  * Added german debconf translation from Helge Kreutzmann
+    <kreutzm@itp.uni-hannover.de> (Closes: #253589)
+
+ -- Duncan Findlay <duncf@debian.org>  Thu, 17 Jun 2004 00:20:08 -0400
+
+spamassassin (2.99pre3.0.0svn20040529-2) experimental; urgency=low
+
+  * Added logcheck entry for lines like:
+      spamd[19233]: result Y 997 GTUBE.....
+
+ -- Duncan Findlay <duncf@debian.org>  Sat, 29 May 2004 21:50:44 -0400
+
+spamassassin (2.99pre3.0.0svn20040529-1) experimental; urgency=low
+
+  * New upstream release
+  * Added italian debconf translation from Luca Monducci <luca.mo@tiscali.it>
+      (Closes: #251279)
+  * Fix /etc/init.d/spamassassin to actually exit when ENABLED=0.
+      (Closes: #251481, #251598)
+
+ -- Duncan Findlay <duncf@debian.org>  Sat, 29 May 2004 21:18:01 -0400
+
+spamassassin (2.99pre3.0.0svn20040525-1) experimental; urgency=low
+
+  * New upstream release
+    Many many changes...
+      API changed drastically, new plugin interface and plugins (Like
+      SURBL (Closes: #243546)), LDAP + SQL config
+      (Closes: #242121, #177012), ident authentication for spamd
+      (Closes: #242148), New license (ASL 2.0), ...
+    Bug Fixes:
+      Fix handling of empty User: line (Closes: #225139)
+      Handle out of diskspace in Bayes (Closes: #202422)
+      Fix how spamc handles bad hostnames (Closes: #214008)
+      Fix sa-learn on filenames with spaces (Closes: #218004)
+      Fixed which IPs to lookup in DNSBLs (Closes: #227828)
+      _STARS_ works in Subject line (Closes: #239979)
+      Make --lint catch misspeld scores (Closes: #214880)
+      Allow combining of spamassassin -d and -t (Closes: #192779)
+      Removed -w option from spamassassin (Closes: #216255)
+      Remove -P from spamassassin manpage (Closes: #234584)
+      FAKED_HOTMAIL_DAV removed (Closes: #233600)
+      Fix BUGGY_CGI to allow NMS FormMail (Closes: #209377)
+      Split ok_languages zh into zh.gb2312, zh.big5 (Closes: #224116)
+      Put all error output on one fd for spamc (Closes: #197879)
+      man Mail::SpamAssassin::Conf clearer about raw headers (Closes: #236431)
+	
+  * Converted packaging to use dpatch in order to allow for easier
+    creation of SVN packages (Because Daniel Quinlan has been bugging
+    me to do figure out a better system!)
+	
+  * Improved debian specific rules in 65_debian.cf (Closes: #237995, #240983)
+  * Changed dependencies for 3.0.0. Now suggest pyzor (Closes: #242456)
+  * Fixed logcheck files for whitespace (Closes: #243820)
+  * Changed /etc/init.d/spamassassin to warn when disabled (Closes: #247058)
+  * Changed /etc/default/spamassassin to not say "/etc/default/spamd.conf"
+    (Closes: #243431)
+  * Include Danish debconf translation from Claus Hindsgaul <claus_h@image.dk>
+    (Closes: #233072)
+  * Added courier integration example (from Charles Fry + Jeronimo Pellegrini)
+    (Closes: #229393)
+
+ -- Duncan Findlay <duncf@debian.org>  Sun, 23 May 2004 23:51:34 -0400
+
+spamassassin (2.63-1) unstable; urgency=low
+
+  * New upstream release (Closes: #228366)
+  * Fixed logcheck file for users with hyphens (Closes: #226316)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed, 21 Jan 2004 00:03:16 -0500
+
+spamassassin (2.61-2) unstable; urgency=low
+
+  * Improve copyright file in response to mail from Peter Palfrader
+    <weasel@debian.org> to debian-devel-announce
+  * Drop versioned libhtml-parser-perl -- it was incorrect. (Closes: #224933)
+	
+  * Added patch from Colin Watson / Marc Haber to ease backports. (Closes: #224237)
+  * Added patch from Francesco Potorti <pot@gnu.org> to allow setting of spamd's nice level (Closes: #224369)
+	
+ -- Duncan Findlay <duncf@debian.org>  Sun, 28 Dec 2003 16:46:53 -0500
+
+spamassassin (2.61-1) unstable; urgency=low
+
+  * The "We really don't need lame release names" release
+  * New upstream release (Closes: #224088)
+      Messages that hit BAYES_99 will not be autolearned as ham (Closes: #217528)
+      Microsoft related forgery issues should be fixed (Closes: #198106, #188480)
+      Remove gnus notation in Bayes.pm (Closes: #211741)
+  * New/updated translations:
+      nl    Luk Claes <luk.claes@ugent.be>            (Closes: #217248)
+      pt_BR Andre Luis Lopes <andrelop@debian.org>    (Closes: #220904)
+      es    Carlos Valdivia <valyag@dat.etsit.upm.es> (Closes: #220927)
+  * Move sample-spam.txt and sample-nonspam.txt to examples/ (Closes: #223032)
+
+ -- Duncan Findlay <duncf@debian.org>  Mon, 15 Dec 2003 20:49:35 -0500
+
+spamassassin (2.60-2) unstable; urgency=low
+
+  * The "Where is Duncan?" release ;)
+  * Small FRIEND_AT_PUBLIC change (Closes: #212722)
+  * README modified to reflect the actual status of Razor2 (Closes: #212799)
+  * Versioned dependency on libhtml-parser-perl (Closes: #214019)
+  * Modified postinst to avoid critical session (Closes: #213023)
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu, 23 Oct 2003 13:10:29 +0000
+
+spamassassin (2.60-1) unstable; urgency=low
+
+  * New upstream release
+      Fixes blacklist problems caused by verisign (Closes: #211233, #211157)
+  * Many fixes since previous testing/unstable release, see below.
+
+ -- Duncan Findlay <duncf@debian.org>  Tue, 23 Sep 2003 14:57:02 -0400
+
+spamassassin (2.59pre2.60rc5-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Duncan Findlay <duncf@debian.org>  Tue, 16 Sep 2003 10:48:16 -0400
+
+spamassassin (2.59pre2.60rc4-1) experimental; urgency=low
+
+  * New upstream release
+  * Enabled SSL in spamc (Closes: #194701)
+  * Kenshi Muto's Japanese debconf translations installed. (Closes: #210722)
+
+ -- Duncan Findlay <duncf@debian.org>  Sat, 13 Sep 2003 15:07:22 -0400
+
+spamassassin (2.59pre2.60rc3-1) experimental; urgency=low
+
+  * New upstream release (candidate) includes:
+      Numerous rule improvements and bug fixes.
+      GA-assigned scores (previous cvs packages did not).
+      New Bayes backend with different DB format (automatic upgrade).
+      dccifd support added.
+      Better support for personal installation (Closes: #199217)
+      Dropped support for database formats other than DB_File (which most
+      should already be using). (See README.Upgrade)
+  * Works around symlinks being left behind in /etc/logcheck on upgrade.
+    (Closes: #201324)
+  * Added symlink from /etc/mail/spamassassin to /etc/spamassassin
+    (Closes: #207233, #207234)
+
+ -- Duncan Findlay <duncf@debian.org>  Thu, 28 Aug 2003 20:59:24 -0400
+
+spamassassin (2.59pre2.60pre3-1) experimental; urgency=low
+
+  * New upstream pre-release, before mass-check verification. Use at your own
+    risk.
+  * This version solves:
+    + French typo (Closes: #200468)
+  * Added README.postfix which explains how to integrate spamassassin with
+    postfix for incoming tagging.
+  * Spamd supports unix sockets (Closes: #204853)
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu,  7 Aug 2003 22:39:30 +0000
+
+spamassassin (2.59pre2.60cvs20030619-1) experimental; urgency=low
+
+  * Pre-release 2.60 packages. Use at own risk! :-) (Hence, experimental)
+  * Also experimental since the scores in this release are very
+    sub-optimal. You will probably want to use a higher threshold, as
+    all the negative scoring tests have been removed.
+  * This upload is to facilitate the transition of maintenance (temporarily)
+    to Jesus Climent <jesus.climent@hispalinux.es> (Added to the
+    Uploaders: field)
+  * New upstream version includes:
+      Better rules to thwart new spam tactics (Closes: #192953)
+      Fix some bugs relating to autolearning (Closes: #191371)
+      Fix problem with reloading and syslog-ng (Closes: #191837)
+      More verbose error from spamassassin -r (Closes: #192133, #197881)
+      Improved configurability of headers (Closes: #178648, #193872)
+      Able to add charset to safe reports (Closes: #183810)
+  * Added a few more "default" options to spamd in /etc/default/spamassassin
+  * Fixed spamc's manpage to refer to spamd(8) not spamd(1) (Closes: #197880)
+  * Added doc on integrating spamassassin sitewide with Exim3 from
+    John Girash <girash@skyron.harvard.edu> (Closes: #196706)
+  * Added example configuration for gnus from Andreas Kneib 
+    <Andreas.Kneib@t-online.de> (Closes: #196557)
+  * Noted the perl5.6->perl5.8 upgrade bug in README.Debian
+
+ -- Duncan Findlay <duncf@debian.org>  Thu, 19 Jun 2003 21:02:34 -0400
+
+spamassassin (2.55-2) unstable; urgency=medium
+
+  * Really fix warnings in spamassassin.config (D'oh!)
+    (Closes: #194989, #195076, #195076, #195335)
+  * Set TMPDIR in init script (Closes: #195290)
+  * urgency=medium because 2.55-1 is 9 days old, and testing deserves 2.55
+    soon, and these changes are fairly simple
+  * Updated french debconf templates (Closes: #195011)
+
+ -- Duncan Findlay <duncf@debian.org>  Fri, 30 May 2003 23:57:06 -0400
+
+spamassassin (2.55-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix warning in spamassassin.config (Closes: #193770)
+
+ -- Duncan Findlay <duncf@debian.org>  Tue, 20 May 2003 17:53:18 -0400
+
+spamassassin (2.54-3) unstable; urgency=low
+
+  * Handle the possibility of debconf not being installed when
+    spamassassin.preinst is run. (Why didn't lintian catch this?)
+
+ -- Duncan Findlay <duncf@debian.org>  Sat, 17 May 2003 18:38:58 -0400
+
+spamassassin (2.54-2) unstable; urgency=low
+
+  * Improves debconf handling of upgrade from previous versions (like
+      woody). (Closes: #191872, #192721)
+  * Rewritten spamassassin.config in perl
+  * This no longer bends over backwards to fix stuff I broke in 2.11
+    (which was never in a stable release, and is over a year old)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed, 14 May 2003 18:39:53 -0400
+
+spamassassin (2.54-1) unstable; urgency=low
+
+  * New upstream release
+      Include improved Bayes documentation (Closes: #185221)
+      Updates documentation in USAGE.gz (Closes: #185763)
+      Better scores (Closes: #191280)
+      Added rule TOO_MANY_MUA (Closes: #190380)
+      Fixed pyzor reporting (Closes: #184574)
+  * Tightened up logcheck messages, for use in
+    /etc/logcheck/ignore.d.paranoid (Closes: #187742)
+  * Applied patch from Andre Luis Lopes to fix pt_BR tranlations.
+      (Closes: #187745)
+  * Added french debconf translation (From Christian Perrier
+      <bubulle@debian.org>) (Closes: #190113)
+  * Added automatic call to debconf-updatepo in debian/rules
+  * Added example .muttrc snippet (Closes: #192713)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed, 14 May 2003 00:24:42 -0400
+
+spamassassin (2.53-1) unstable; urgency=low
+
+  * New upstream release (Closes: #185887)
+      Fixes false positives in SUBJ_ALL_CAPS from KOI8 mail (Closes:
+       #168682)
+      Fixes problems with --syslog-socket=none (Closes: #179925)
+      Fixes --nouser-config (Closes: #164284)
+      base64 and utf-8 no longer penalized (Closes: #165393)
+      spamd now does setgid in addition to setuid (Closes: #182869)
+      sa-learn docs explain ham as non-spam (Closes: #183286)
+      Fixes some Bayes corruption
+  * Fixes logcheck format. (Closes: #182838)
+  * Added -m option by default. (Closes: #183323)
+  * Added po-debconf support (Patch from Andre Luis Lopes
+    <andrelop@ig.com.br>) (Closes: #184126)
+  * Added a debian/watch file for uscan
+
+ -- Duncan Findlay <duncf@debian.org>  Thu,  3 Apr 2003 19:23:43 -0500
+
+spamassassin (2.50-1) unstable; urgency=low
+
+  * New upstream release: (Closes: #181836)
+      Bayesian learner component
+      Better scores (Closes: #177317)
+      New (and improved!) report format
+      Bugfixes!
+      Closes: #179641, #166567, #180115, #180117, #164367, #161067,
+      #165428, #165731, #170881, #154812, #163179, #164960, #161696,
+      #163297, #163328
+	
+  * Added rules/STATISTICS.txt to /usr/share/doc/spamassassin (Closes: #179799)
+
+ -- Duncan Findlay <duncf@debian.org>  Wed, 26 Feb 2003 22:58:58 -0500
+
+spamassassin (2.44-1) unstable; urgency=low
+
+  * New upstream release (mainly bugfixes) (Closes: #160206)
+  * Acknowledge NMU (Closes: #178936)
+  * Bumped priority of debconf question to high
+    (Closes: #167451, #167452, #169751
+  * Removed dependency on libnet-smtp-server-perl (Closes: #175129)
+  * Fixed debian/rules CFLAGS with patch from <tino.keitel@web.de>
+    (Closes: #176659)
+  * Fix lintian warning:
+    "W: spamassassin: init-script-suggests-versioned-depends postinst"
+
+ -- Duncan Findlay <duncf@debian.org>  Fri, 31 Jan 2003 19:19:25 -0500
+
+spamassassin (2.43-1.1) unstable; urgency=high
+
+  * Non-maintainer upload at maintainer request
+  * Apply patch for overflow as reported to BUGTRAQ
+    "SpamAssassin / spamc+BSMTP remote buffer overflow"
+    (spamd/libspamc.c)
+  * Depending on how spamc is built, this may or may not be
+    exploitable
+
+ -- Matt Zimmerman <mdz@debian.org>  Wed, 29 Jan 2003 11:08:12 -0500
+
+spamassassin (2.43-1) unstable; urgency=low
+
+  * New upstream release
+  * The -m option is no longer recommended. It is buggy.
+
+ -- Duncan Findlay <duncf@debian.org>  Tue, 15 Oct 2002 23:18:01 -0400
+
+spamassassin (2.42-1) unstable; urgency=low
+
+  * New upstream release
+    (Closes: #160309, #160901, #162013, #159704, #163143, #156263)
+      Various AWL fixes
+      -m fixed (better)
+      Various misc bug fixes.
+  * Added SENT_BY_AFBACKUP and SENT_BY_APTLC to 65_debian.cf
+    (Closes: #155527, #155634)
+  * Added --oknodo's in /etc/init.d/spamassassin (Closes: #161981)
+
+ -- Duncan Findlay <duncf@debian.org>  Fri,  4 Oct 2002 18:18:10 -0400
+
+spamassassin (2.41-2) unstable; urgency=low
+
+  * Applies perl-5.8 / -m patch for spamd.
+    (Closes: #159826, #159038, #159984)
+  * Adds debconf note for removal of spamproxyd (Closes: #159930)
+
+ -- Duncan Findlay <duncf@debian.org>  Sat,  7 Sep 2002 11:23:40 -0400
+
+spamassassin (2.41-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Duncan Findlay <duncf@debian.org>  Thu,  5 Sep 2002 18:07:13 -0400
+
+spamassassin (2.40-1) unstable; urgency=low
+
+  * New upstream release:
+    Spamproxyd removed -- WILL BREAK CONFIGS -- sorry! (Closes: #156938)
+    Spamassassin will no longer deliver mail, only filter (-P flag by
+     default/can't negate)
+    all_spam_to improved to be smarter (Closes: #151320)
+    config option to avoid checking dns before use (Closes: #153245)
+
+  * Init script will not fail on stop if spamd not running
+    (Closes: #158913)
+  * Logcheck files fixed (symlinks removed, messages updated)
+    (Closes: #146221, #155295)
+  * "N16" fix applied. (Will be in upstream 2.41)
+  * Added link to dman's exim integration stuff in README.Debian
+    (Closes: #151526)
+
+ -- Duncan Findlay <duncf@debian.org>  Tue,  3 Sep 2002 01:47:17 -0400
+
+spamassassin (2.31-2) unstable; urgency=low
+
+  * Changed Recommends: spamc to Depends: spamc
+
+ -- Duncan Findlay <duncf@debian.org>  Tue, 25 Jun 2002 13:38:15 -0400
+
+spamassassin (2.31-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Duncan Findlay <duncf@debian.org>  Thu, 20 Jun 2002 23:09:42 -0400
+
+spamassassin (2.30-2) unstable; urgency=low
+
+  * Changed init script to use /var/run/spamd.pid
+  * Fixed logcheck file to match setuid succeeded messages
+  * Split spamc into a separate package. Let the bug reports begin!
+    (Closes: #137140)
+
+ -- Duncan Findlay <duncf@debian.org>  Mon, 17 Jun 2002 14:49:38 -0400
+
+spamassassin (2.30-1) unstable; urgency=low
+
+  * New upstream release (Closes: #140300, #147625, #144482, #143316,
+    #146588, #13977)
+  * Added debconf e-mails to whitelist (Closes: #147465)
+  * Added depends on libtime-hires-perl
+  * Moved to section mail (interpreters doesn't make sense - spamassassin
+    isn't just a perl module)
+  * Removed README.Upgrade. I doubt anyone still uses 1.15
+
+ -- Duncan Findlay <duncf@debian.org>  Sat, 15 Jun 2002 01:24:15 -0400
+
+spamassassin (2.20-2) unstable; urgency=low
+
+  * Added depends on libnet-smtp-server-perl (Closes: #145297). Depending on
+    the outcome of bug 119517, this may be downgraded to a Recommends:.
+  * Removed extra empty dir /usr/share/spamassassin (Closes: #145323)
+  * Added recommends: for libmailtools-perl (Closes: #143935)
+
+ -- Duncan Findlay <duncf@rogers.com>  Fri, 10 May 2002 20:37:08 -0400
+
+spamassassin (2.20-1) unstable; urgency=medium
+
+  * New upstream release. (Closess: #140300, #140910, #143324, #134669,
+    #136329, #140422, #140910)
+  * This fixes the "razor 1.20-1 bug" (143324)
+  * New features. Yay! (including the -S (short-ciruit) flag for spamd)
+  * Urgency=medium to beat razor 1.20-1 to woody.
+
+ -- Duncan Findlay <duncf@rogers.com>  Sat, 20 Apr 2002 00:05:40 -0400
+
+spamassassin (2.11-4) unstable; urgency=medium
+
+  * "Fixes" configuration files "problem"/"bug." I'm really not happy with
+    putting upstream rules and scores in /etc/spamassassin. But I guess I
+    don't have a choice. Do I? (Closes: #141484)
+  * Fixes pathes in Mail::SpamAssassin::Conf docs. (Closes: #141172)
+  * Fixes "spelling" mistake in description. (Closes #141512)
+
+ -- Duncan Findlay <duncf@rogers.com>  Sun,  7 Apr 2002 22:02:29 -0400
+
+spamassassin (2.11-3) unstable; urgency=low
+
+  * Fixes, and undoes previous damage relating to the logcheck bug (Closes:
+    #140773)
+
+ -- Duncan Findlay <duncf@rogers.com>  Tue,  2 Apr 2002 17:57:17 -0500
+
+spamassassin (2.11-2) unstable; urgency=low
+
+  * Fixes the logcheck bug (Closes: #139201)
+  * Set SUBJ_FULL_OF_8BITS to 0 (Closes: #140344)
+  * Set RCVD_IN_ORBZ to 0 (Closes: #139204)
+
+ -- Duncan Findlay <duncf@rogers.com>  Sat, 30 Mar 2002 14:48:22 -0500
+
+spamassassin (2.11-1) unstable; urgency=medium
+
+  * New upstream release (mainly saner scores)
+  * Fixed description in user_prefs file to be less confusing (Closes:
+    #136648)
+  * urgency=medium since the last upload never quite got to testing
+
+ -- Duncan Findlay <duncf@rogers.com>  Mon,  4 Mar 2002 19:23:08 -0500
+
+spamassassin (2.10-1) unstable; urgency=medium
+
+  * New upstream release
+    Closes: #131442, #131317, #133026, #131438, #131193, #136047, #134660,
+    #134557
+  * New features: _HITS_ and _REQD_ in subject_tag display number
+    of hits/required hits, more tests, etc.
+  * Fixed minor dependency thing (Closes: #131797)
+  * Included logcheck files (Closes: #131161)
+  * Actually added README.Upgrade (Closes: #131188)
+  * Fixed some postrm to purge old files (from 1.5)
+  * Added a line to /etc/init.d/spamassassin to clarify (stupid)
+    misconceptions (Closes: #134566)
+  * Moved manpages to their proper place (ie. .3perl and .8)
+  * Included (fixed) check_whitelist in examples dir (Closes: #135383)
+  * Put daemons in /usr/sbin (Closes: #135703)
+
+ -- Duncan Findlay <duncf@rogers.com>  Sun, 17 Feb 2002 19:49:28 -0500
+
+spamassassin (2.01-1) unstable; urgency=low
+
+  * New upstream release (lots of new features!)
+    Closes: #129738, #130260, #126461, #123630, #123886, #123889, #128415
+  * Added Debian specific config.  (Closes: #126073)
+  * Moved spamd to boot up earlier than exim (i.e. 19)  (Closes #131028)
+
+ -- Duncan Findlay <duncf@rogers.com>  Sat, 26 Jan 2002 17:24:05 -0500
+
+spamassassin (1.5-5) unstable; urgency=low
+
+  * Fixed postinst (Closes: #123954)
+  * Fixed typo in init. (I really need to learn to spel!) (Closes: #124077)
+  * Fixed the dpkg dependency to 1.8.1 (Closes: #123320 again!)
+  * Disables foreign character set tests by default (bug 126073, but
+    still have to deal with other half)
+
+ -- Duncan Findlay <duncf@rogers.com>  Sat, 22 Dec 2001 16:28:56 -0500
+
+spamassassin (1.5-4) unstable; urgency=low
+
+  * Fixed my (ahem...) little typo (that caused spamassassin to not work at
+    all) (Closes: #123721)
+  * Moved /etc/default/spamd.conf to /etc/default/spamassassin (Closes:
+    #123722)
+  * Fixed hang bug in spamassassin.cf (VERY_SUSP_RECIPS and
+    VERY_SUSP_CC_RECIPS)
+
+ -- Duncan Findlay <duncf@rogers.com>  Wed, 12 Dec 2001 21:09:21 -0500
+
+spamassassin (1.5-3) unstable; urgency=low
+
+  * Changed the regexp for SUBJ_HAS_UNIQ_ID so it doesn't get triggered on
+    stuff like "Subject: Broken: tar -zxvf" (Closes: #123196)
+  * Moved /usr/share/perl5/spamassassin.cf and .prefs to
+    /usr/share/spamassassin/ (Closes: #123475)
+  * Fixed "name" in init script to spamd (not spamassassin) like it was in
+    1.5-1 (Closes: #123545)
+  * Fixed -e option.  (Closes: #123551)
+  * Added Depends on dpkg >= 1.9.0  (I still don't know what version it
+    should be. (Closes: #123320 (again!)
+  * Got rid of the Conflicts and Replaces on libmail-spamassassin-perl.  I
+    figure everyone has upgraded by now, or can figure it out!
+  * Got rid of explicit razor depends, now just librazor-perl
+
+ -- Duncan Findlay <duncf@rogers.com>  Tue, 11 Dec 2001 20:14:07 -0500
+
+spamassassin (1.5-2) unstable; urgency=low
+
+  * Added Build-Depends for ia64 (bind-dev)  (Closes some bug yet to be
+    filed)
+  * Clarfied README.Debian (Closes: #123194, #123240)
+  * Fixed word_in_dictionary bug
+  * Added warning to spamd users using an old version of dpkg
+    (Closes: #123320)
+  * Added mass-check to examples (for bug 123290)
+
+ -- Duncan Findlay <duncf@rogers.com>  Mon, 10 Dec 2001 11:37:57 -0500
+
+spamassassin (1.5-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #120975)
+
+ -- Duncan Findlay <duncf@rogers.com>  Fri,  7 Dec 2001 20:54:03 -0500
+
--- spamassassin-3.2.0.orig/debian/compat
+++ spamassassin-3.2.0/debian/compat
@@ -0,0 +1 @@
+4
--- spamassassin-3.2.0.orig/debian/control
+++ spamassassin-3.2.0/debian/control
@@ -0,0 +1,53 @@
+Source: spamassassin
+Section: mail
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Duncan Findlay <duncf@debian.org>
+Uploaders: Jesus Climent <jesus.climent@hispalinux.es>
+Build-Depends: debhelper (>= 4.1.16), perl (>= 5.6.0-16), libssl-dev,
+ dpatch, libhtml-parser-perl (>= 3.24), libdigest-sha1-perl, 
+ libnet-dns-perl (>= 0.58)
+Standards-Version: 3.7.2
+
+Package: spamassassin
+Architecture: all
+Conflicts: spamass-milter (<< 0.2.0-7), gotmail (<= 0.8.1-1)
+Depends: ${perl:Depends}, libhtml-parser-perl (>= 3.31),
+ libdigest-sha1-perl, ${misc:Depends}, libsocket6-perl,
+ libarchive-tar-perl, libwww-perl, libmail-spf-perl
+Recommends: perl (>= 5.8.0) | libmime-base64-perl, spamc (>= 2.30)
+Suggests: libnet-perl | perl-modules (>= 5.8.0), razor (>= 2.361-2),
+ libnet-ident-perl, libio-socket-ssl-perl, perl (>= 5.8.0) |
+ libtime-hires-perl, libdbi-perl, dcc-client, pyzor
+Provides: libmail-spamassassin-perl
+Description: Perl-based spam filter using text analysis
+ SpamAssassin is a very powerful and fully configurable spam filter
+ with numerous features including automatic white-listing, RBL
+ testing, Bayesian analysis, header and body text analysis. It is
+ designed to be called from a user's .procmail or .forward file, but
+ can also be integrated into a Mail Transport Agent (MTA).
+ .
+ Included in this package is a daemonized form of spamassassin (spamd)
+ which communicates with its client (spamc) via TCP, to reduce the
+ overhead of loading perl with each message. To take advantage of
+ this, you must install the spamc package.
+ .
+ Homepage: http://www.spamassassin.org
+
+Package: spamc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: spamassassin
+Conflicts: spamassassin (<< 2.30-2)
+Description: Client for SpamAssassin spam filtering daemon
+ spamc is the client to communicate with spamd, the daemonized form of
+ SpamAssassin (see the spamassassin package). It is written in C for
+ maximum speed and minimum loading overhead.
+ .
+ spamc is quite useful for integrating spamassassin into an MTA or
+ into a .procmailrc file because of its speed.
+ .
+ This package is useless unless you have spamassassin installed,
+ either on this machine or another local machine (i.e. a mail server).
+ .
+ Homepage: http://www.spamassassin.org
--- spamassassin-3.2.0.orig/debian/copyright
+++ spamassassin-3.2.0/debian/copyright
@@ -0,0 +1,228 @@
+This package was debianized by Duncan Findlay <duncf@debian.org> on
+Sat, 24 Nov 2001 18:37:39 -0500.
+
+It was downloaded from http://www.spamassassin.org/
+
+Upstream Authors: Justin Mason <jm@jmason.org>,
+		  Craig Hughes <craig@hughes-family.org>
+                  Daniel Quinlan <quinlan@pathname.com>
+                  Theo van Dinter <felicity@kluge.net>
+                  and others
+
+Copyright 2000-2004 Justin Mason and others
+Copyright 2004 Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- spamassassin-3.2.0.orig/debian/examples/courier
+++ spamassassin-3.2.0/debian/examples/courier
@@ -0,0 +1,32 @@
+Some notes on how to integrate spamassassin with courier
+--------------------------------------------------------
+
+Contributed by:
+Charles Fry <debian@frogcircus.org>
+Jeronimo Pellegrini <pellegrini@mpcnet.com.br>
+
+1) In /etc/courier/courierd set:
+
+DEFAULTDELIVERY="| /usr/bin/maildrop"
+
+2) In /etc/courier/maildroprc add the line:
+
+xfilter "/usr/bin/spamassassin"
+or
+xfilter "/usr/bin/spamc"
+
+OR, for a more detailed setup add the following lines. Note that this
+only checks mails less than 250k in size and sends spam to a .spam/
+folder. (spamc by default only scans messages that are 250k in size,
+so you can get away without using the size check.)
+
+if ($SIZE lt 250000)
+{
+	xfilter "/usr/bin/spamc -f"
+}
+
+if (/^X-Spam-Flag: YES/:h || /^X-Spam-Status: Yes/:h)
+{
+	to .spam/
+}
+
--- spamassassin-3.2.0.orig/debian/examples/filter.sh
+++ spamassassin-3.2.0/debian/examples/filter.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# filter.sh
+#
+# Simple filter to plug Anomy Sanitizer and SpamAssassin
+# into the Postfix MTA
+#
+# From http://advosys.ca/papers/postfix-filtering.html
+# Advosys Consulting Inc., Ottawa
+# Modified by Jesus Climent
+#
+# For use with:
+#    Postfix 20010228 or later
+#    SpamAssassin 2.42 or later
+#
+# Note: Modify the file locations to match your particular 
+#       server and installation of SpamAssassin.
+
+# File locations: 
+# (CHANGE AS REQUIRED TO MATCH YOUR SERVER)
+
+SENDMAIL=/usr/sbin/sendmail
+SPAMASSASSIN=/usr/bin/spamc
+
+/bin/cat | ${SPAMASSASSIN} -f | ${SENDMAIL} -i "$@"
+
+exit $?
--- spamassassin-3.2.0.orig/debian/examples/gnus
+++ spamassassin-3.2.0/debian/examples/gnus
@@ -0,0 +1,7 @@
+;; F10 pipe the message as spam
+(global-set-key [(f10)]
+  '(lambda () (interactive) (shell-command "sa-learn --spam --single ")))
+
+;; F9 pipe the message as ham
+(global-set-key [(f9)]
+  '(lambda () (interactive) (shell-command "sa-learn --ham --single ")))
--- spamassassin-3.2.0.orig/debian/examples/muttrc
+++ spamassassin-3.2.0/debian/examples/muttrc
@@ -0,0 +1,7 @@
+# Add this to your ~/.muttrc to integrate spamassassin and mutt
+# spamassassin report and classify as spam
+macro index S "|/usr/bin/spamassassin -r"
+# spamassassin classify as ham
+macro index H "|/usr/bin/sa-learn --ham  --no-sync"
+# rebuild the spamassassin bayes filter db
+macro index R "!/usr/bin/sa-learn --sync"
--- spamassassin-3.2.0.orig/debian/patches/00list
+++ spamassassin-3.2.0/debian/patches/00list
@@ -0,0 +1,3 @@
+10_change_config_paths
+20_edit_spamc_pod
+30_edit_README
--- spamassassin-3.2.0.orig/debian/patches/10_change_config_paths.dpatch
+++ spamassassin-3.2.0/debian/patches/10_change_config_paths.dpatch
@@ -0,0 +1,401 @@
+#! /bin/sh -e
+## 10_edit_config_paths.dpatch by Duncan Findlay <duncf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change all instances of /etc/mail/spamassassin in the documentation
+## DP: to /etc/spamassassin, since thats where the configuration is going.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad spamassassin-3.2.0~/INSTALL spamassassin-3.2.0/INSTALL
+--- spamassassin-3.2.0~/INSTALL	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/INSTALL	2007-05-03 10:10:12.000000000 -0400
+@@ -390,7 +390,7 @@
+     http://issues.apache.org/SpamAssassin/show_bug.cgi?id=5312
+ 
+     If you do not plan to use this plugin, be sure to comment out
+-    its loadplugin line in "/etc/mail/spamassassin/v310.pre".  This
++    its loadplugin line in "/etc/spamassassin/v310.pre".  This
+     will ensure that the slowdown will not affect you.
+ 
+ 
+diff -urNad spamassassin-3.2.0~/README spamassassin-3.2.0/README
+--- spamassassin-3.2.0~/README	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/README	2007-05-03 10:02:01.000000000 -0400
+@@ -104,13 +104,13 @@
+ 	Distributed configuration files, with all defaults.  Do not modify
+ 	these, as they are overwritten when you upgrade.
+ 
+-  - /etc/mail/spamassassin/*.cf:
++  - /etc/spamassassin/*.cf:
+ 
+   	Site config files, for system admins to create, modify, and
+ 	add local rules and scores to.  Modifications here will be
+ 	appended to the config loaded from the above directory.
+ 
+-  - /etc/mail/spamassassin/*.pre:
++  - /etc/spamassassin/*.pre:
+ 
+         Plugin control files, installed from the distribution. These are
+         used to control what plugins are loaded.  Modifications here will
+@@ -119,7 +119,7 @@
+         
+         You want to modify these files if you want to load additional
+         plugins, or inhibit loading a plugin that is enabled by default.
+-        If the files exist in /etc/mail/spamassassin, they will not
++        If the files exist in /etc/spamassassin, they will not
+         be overwritten during future installs.
+ 
+   - /usr/share/spamassassin/user_prefs.template:
+@@ -127,14 +127,14 @@
+ 	Distributed default user preferences. Do not modify this, as it is
+ 	overwritten when you upgrade.
+ 
+-  - /etc/mail/spamassassin/user_prefs.template:
++  - /etc/spamassassin/user_prefs.template:
+ 
+ 	Default user preferences, for system admins to create, modify, and
+ 	set defaults for users' preferences files.  Takes precedence over
+ 	the above prefs file, if it exists.
+ 
+         Do not put system-wide settings in here; put them in a file in the
+-        "/etc/mail/spamassassin" directory ending in ".cf". This file is
++        "/etc/spamassassin" directory ending in ".cf". This file is
+         just a template, which will be copied to a user's home directory
+         for them to change.
+ 
+@@ -183,8 +183,8 @@
+ 
+   __prefix__    __def_rules_dir__              __local_rules_dir__
+   -------------------------------------------------------------------------
+-  /usr          /usr/share/spamassassin        /etc/mail/spamassassin
+-  /usr/local    /usr/local/share/spamassassin  /etc/mail/spamassassin
++  /usr          /usr/share/spamassassin        /etc/spamassassin
++  /usr/local    /usr/local/share/spamassassin  /etc/spamassassin
+   /opt/$DIR     /opt/$DIR/share/spamassassin   /etc/opt/mail/spamassassin
+   $DIR          $DIR/share/spamassassin        $DIR/etc/mail/spamassassin
+ 
+@@ -198,20 +198,20 @@
+ 
+   - Site Configuration Files
+         '__local_rules_dir__'
+-        '__prefix__/etc/mail/spamassassin'
++        '__prefix__/etc/spamassassin'
+         '__prefix__/etc/spamassassin'
+         '/usr/local/etc/spamassassin'
+         '/usr/pkg/etc/spamassassin'
+         '/usr/etc/spamassassin'
+-        '/etc/mail/spamassassin'
++        '/etc/spamassassin'
+         '/etc/spamassassin'
+ 
+   - Default User Preferences File
+         '__local_rules_dir__/user_prefs.template'
+-        '__prefix__/etc/mail/spamassassin/user_prefs.template'
++        '__prefix__/etc/spamassassin/user_prefs.template'
+         '__prefix__/share/spamassassin/user_prefs.template'
+         '/etc/spamassassin/user_prefs.template'
+-        '/etc/mail/spamassassin/user_prefs.template'
++        '/etc/spamassassin/user_prefs.template'
+         '/usr/local/share/spamassassin/user_prefs.template'
+         '/usr/share/spamassassin/user_prefs.template'
+ 
+diff -urNad spamassassin-3.2.0~/UPGRADE spamassassin-3.2.0/UPGRADE
+--- spamassassin-3.2.0~/UPGRADE	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/UPGRADE	2007-05-03 09:55:39.000000000 -0400
+@@ -24,7 +24,7 @@
+   perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)
+ 
+ - There are now multiple files read to enable plugins in the
+-  /etc/mail/spamassassin directory; previously only one, "init.pre" was
++  /etc/spamassassin directory; previously only one, "init.pre" was
+   read.  Now both "init.pre", "v310.pre", and any other files ending
+   in ".pre" will be read.  As future releases are made, new plugins
+   will be added to new files named according to the release they're
+@@ -181,7 +181,7 @@
+ - If you are using a UNIX machine with all database files on local disks,
+   and no sharing of those databases across NFS filesystems, you can use a
+   more efficient, but non-NFS-safe, locking mechanism.   Do this by adding
+-  the line "lock_method flock" to the /etc/mail/spamassassin/local.cf
++  the line "lock_method flock" to the /etc/spamassassin/local.cf
+   file. This is strongly recommended if you're not using NFS, as it is
+   much faster than the NFS-safe locker.
+ 
+diff -urNad spamassassin-3.2.0~/USAGE spamassassin-3.2.0/USAGE
+--- spamassassin-3.2.0~/USAGE	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/USAGE	2007-05-03 09:55:39.000000000 -0400
+@@ -117,7 +117,7 @@
+     CPU-intensive task before they can send mail to you, so we give that
+     some bonus points.  However, it requires that you list what addresses
+     you expect to receive mail for, by adding 'hashcash_accept' lines to
+-    your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf
++    your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf
+     files.  See the Mail::SpamAssassin::Plugin::Hashcash manual page for
+     details on how to specify these.
+ 
+@@ -129,14 +129,14 @@
+ 
+ 
+   - You can create your own system-wide rules files in
+-    /etc/mail/spamassassin; their filenames should end in ".cf".  Multiple
++    /etc/spamassassin; their filenames should end in ".cf".  Multiple
+     files will be read, and SpamAssassin will not overwrite these files
+     when installing a new version.
+ 
+ 
+   - You should not modify the files in /usr/share/spamassassin; these
+     will be overwritten when you upgrade.  Any changes you make in
+-    files in the /etc/mail/spamassassin directory,  however, will
++    files in the /etc/spamassassin directory,  however, will
+     override these files.
+ 
+ 
+diff -urNad spamassassin-3.2.0~/ldap/README spamassassin-3.2.0/ldap/README
+--- spamassassin-3.2.0~/ldap/README	2007-05-01 09:54:04.000000000 -0400
++++ spamassassin-3.2.0/ldap/README	2007-05-03 09:55:39.000000000 -0400
+@@ -13,7 +13,7 @@
+ database or LDAP server.
+ 
+ SpamAssassin will check the global configuration file (ie. any file matching
+-/etc/mail/spamassassin/*.cf) for the following settings:
++/etc/spamassassin/*.cf) for the following settings:
+ 
+   user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
+   user_scores_ldap_username	bind dn
+diff -urNad spamassassin-3.2.0~/lib/Mail/SpamAssassin/Conf.pm spamassassin-3.2.0/lib/Mail/SpamAssassin/Conf.pm
+--- spamassassin-3.2.0~/lib/Mail/SpamAssassin/Conf.pm	2007-05-01 09:54:10.000000000 -0400
++++ spamassassin-3.2.0/lib/Mail/SpamAssassin/Conf.pm	2007-05-03 09:55:39.000000000 -0400
+@@ -40,7 +40,7 @@
+ =head1 DESCRIPTION
+ 
+ SpamAssassin is configured using traditional UNIX-style configuration files,
+-loaded from the C</usr/share/spamassassin> and C</etc/mail/spamassassin>
++loaded from the C</usr/share/spamassassin> and C</etc/spamassassin>
+ directories.
+ 
+ The following web page lists the most important configuration settings
+@@ -1759,7 +1759,7 @@
+ 
+ These settings differ from the ones above, in that they are considered
+ 'privileged'.  Only users running C<spamassassin> from their procmailrc's or
+-forward files, or sysadmins editing a file in C</etc/mail/spamassassin>, can
++forward files, or sysadmins editing a file in C</etc/spamassassin>, can
+ use them.   C<spamd> users cannot use them in their C<user_prefs> files, for
+ security and efficiency reasons, unless C<allow_user_rules> is enabled (and
+ then, they may only add rules from below).
+diff -urNad spamassassin-3.2.0~/lib/Mail/SpamAssassin/Plugin/Test.pm spamassassin-3.2.0/lib/Mail/SpamAssassin/Plugin/Test.pm
+--- spamassassin-3.2.0~/lib/Mail/SpamAssassin/Plugin/Test.pm	2007-05-01 09:54:09.000000000 -0400
++++ spamassassin-3.2.0/lib/Mail/SpamAssassin/Plugin/Test.pm	2007-05-03 09:55:39.000000000 -0400
+@@ -27,7 +27,7 @@
+ =head1 DESCRIPTION
+ 
+ To try this plugin, write the above two lines in the synopsis to
+-C</etc/mail/spamassassin/plugintest.cf>.
++C</etc/spamassassin/plugintest.cf>.
+ 
+ =cut
+ 
+diff -urNad spamassassin-3.2.0~/lib/spamassassin-run.pod spamassassin-3.2.0/lib/spamassassin-run.pod
+--- spamassassin-3.2.0~/lib/spamassassin-run.pod	2007-05-01 09:54:10.000000000 -0400
++++ spamassassin-3.2.0/lib/spamassassin-run.pod	2007-05-03 09:55:39.000000000 -0400
+@@ -237,7 +237,7 @@
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C</etc/spamassassin> or similar).
+ 
+ =item B<--cf='config line'>
+ 
+diff -urNad spamassassin-3.2.0~/lib/spamassassin-run.pod.rej spamassassin-3.2.0/lib/spamassassin-run.pod.rej
+--- spamassassin-3.2.0~/lib/spamassassin-run.pod.rej	1969-12-31 19:00:00.000000000 -0500
++++ spamassassin-3.2.0/lib/spamassassin-run.pod.rej	2007-05-03 09:55:39.000000000 -0400
+@@ -0,0 +1,17 @@
++***************
++*** 43,49 ****
++   -p prefs, --prefspath=file, --prefs-file=file
++                                     Set user preferences file
++   --siteconfigpath=path             Path for site configs
++-                                    (def: /etc/mail/spamassassin)
++   -x, --nocreate-prefs              Don't create user preferences file
++   -e, --exit-code                   Exit with a non-zero exit code if the
++                                     tested message was spam
++--- 43,49 ----
++   -p prefs, --prefspath=file, --prefs-file=file
++                                     Set user preferences file
++   --siteconfigpath=path             Path for site configs
+++                                    (def: /etc/spamassassin)
++   -x, --nocreate-prefs              Don't create user preferences file
++   -e, --exit-code                   Exit with a non-zero exit code if the
++                                     tested message was spam
+diff -urNad spamassassin-3.2.0~/rules/30_text_fr.cf spamassassin-3.2.0/rules/30_text_fr.cf
+--- spamassassin-3.2.0~/rules/30_text_fr.cf	2007-05-01 09:54:14.000000000 -0400
++++ spamassassin-3.2.0/rules/30_text_fr.cf	2007-05-03 09:55:39.000000000 -0400
+@@ -4,7 +4,7 @@
+ # Latest revision: 2003/11/14
+ #
+ # Please don't modify this file as your changes will be overwritten with
+-# the next update. Use /etc/mail/spamassassin/local.cf instead.
++# the next update. Use /etc/spamassassin/local.cf instead.
+ # See 'perldoc Mail::SpamAssassin::Conf' for details.
+ #
+ # <@LICENSE>
+diff -urNad spamassassin-3.2.0~/rules/30_text_pt_br.cf spamassassin-3.2.0/rules/30_text_pt_br.cf
+--- spamassassin-3.2.0~/rules/30_text_pt_br.cf	2007-05-01 09:54:14.000000000 -0400
++++ spamassassin-3.2.0/rules/30_text_pt_br.cf	2007-05-03 09:55:39.000000000 -0400
+@@ -4,7 +4,7 @@
+ # Feita por Marcelo Cruzeta ZOE Informática
+ #
+ # Por Favor, não modifique este arquivo, pois suas mudanças serão sobrescritas com
+-# o próximo update. Use /etc/mail/spamassassin/local.cf para isso.
++# o próximo update. Use /etc/spamassassin/local.cf para isso.
+ # Veja 'perldoc Mail::SpamAssassin::Conf' para detalhes.
+ #
+ # Este programa é um software gratuito; você pode distribuí-lo e/ou modificá-lo
+diff -urNad spamassassin-3.2.0~/rules/user_prefs.template spamassassin-3.2.0/rules/user_prefs.template
+--- spamassassin-3.2.0~/rules/user_prefs.template	2007-05-01 09:54:14.000000000 -0400
++++ spamassassin-3.2.0/rules/user_prefs.template	2007-05-03 09:55:39.000000000 -0400
+@@ -5,7 +5,7 @@
+ #* directory. At runtime, if a user has no preferences in their home directory
+ #* already, it will be copied for them, allowing them to perform personalised
+ #* customisation.  If you want to make changes to the site-wide defaults,
+-#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.
++#* create a file in /etc/spamassassin instead.
+ ###########################################################################
+ 
+ # How many points before a mail is considered spam.
+diff -urNad spamassassin-3.2.0~/sa-learn.raw spamassassin-3.2.0/sa-learn.raw
+--- spamassassin-3.2.0~/sa-learn.raw	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/sa-learn.raw	2007-05-03 09:55:39.000000000 -0400
+@@ -755,7 +755,7 @@
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C</etc/spamassassin> or similar).
+ 
+ =item B<--cf='config line'>
+ 
+diff -urNad spamassassin-3.2.0~/sa-learn.raw.rej spamassassin-3.2.0/sa-learn.raw.rej
+--- spamassassin-3.2.0~/sa-learn.raw.rej	1969-12-31 19:00:00.000000000 -0500
++++ spamassassin-3.2.0/sa-learn.raw.rej	2007-05-03 09:55:39.000000000 -0400
+@@ -0,0 +1,17 @@
++***************
++*** 570,576 ****
++   -u username, --username=username  Override username taken from the runtime environment
++   -C path, --configpath=path, --config-file=path   Path to standard configuration dir
++   -p prefs, --prefspath=file, --prefs-file=file    Set user preferences file
++-  --siteconfigpath=path             Path for site configs (def: /etc/mail/spamassassin)
++   -D, --debug-level                 Print debugging messages
++   -V, --version                     Print version
++   -h, --help                        Print usage message
++--- 570,576 ----
++   -u username, --username=username  Override username taken from the runtime environment
++   -C path, --configpath=path, --config-file=path   Path to standard configuration dir
++   -p prefs, --prefspath=file, --prefs-file=file    Set user preferences file
+++  --siteconfigpath=path             Path for site configs (def: /etc/spamassassin)
++   -D, --debug-level                 Print debugging messages
++   -V, --version                     Print version
++   -h, --help                        Print usage message
+diff -urNad spamassassin-3.2.0~/spamc/spamc.pod spamassassin-3.2.0/spamc/spamc.pod
+--- spamassassin-3.2.0~/spamc/spamc.pod	2007-05-01 09:54:26.000000000 -0400
++++ spamassassin-3.2.0/spamc/spamc.pod	2007-05-03 09:55:39.000000000 -0400
+@@ -255,8 +255,8 @@
+ 
+ If the B<-F> switch is specified, that file will be used.  Otherwise,
+ C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
+-/etc/mail/spamassassin). If that file doesn't exist, and the B<-F>
+-switch is not specified, no configuration file will be read.
++/etc/spamassassin). If that file doesn't exist, and the B<-F> switch
++is not specified, no configuration file will be read.
+ 
+ Example:
+ 
+diff -urNad spamassassin-3.2.0~/spamd/README spamassassin-3.2.0/spamd/README
+--- spamassassin-3.2.0~/spamd/README	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/spamd/README	2007-05-03 09:55:39.000000000 -0400
+@@ -105,7 +105,7 @@
+ If you plan to use Bayesian classification (the BAYES rules) with spamd,
+ you will need to either
+ 
+-  1. modify /etc/mail/spamassassin/local.cf to use a shared database of
++  1. modify /etc/spamassassin/local.cf to use a shared database of
+   tokens, by setting the 'bayes_path' setting to a path all users can read
+   and write to.  You will also need to set the 'bayes_file_mode' setting
+   to 0666 so that created files are shared, too.
+diff -urNad spamassassin-3.2.0~/spamd/README.vpopmail spamassassin-3.2.0/spamd/README.vpopmail
+--- spamassassin-3.2.0~/spamd/README.vpopmail	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/spamd/README.vpopmail	2007-05-03 09:55:39.000000000 -0400
+@@ -43,7 +43,7 @@
+ 	/home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
+ 
+ 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.
+-This is specified in your /etc/mail/spamassassin/local.cf file.  Perhaps a
++This is specified in your /etc/spamassassin/local.cf file.  Perhaps a
+ future enhancement would be to add the capability to have personal AWL db.
+ 
+ 6. Of course vpopmail must have the seekable patch installed (see 
+diff -urNad spamassassin-3.2.0~/spamd/spamd.raw spamassassin-3.2.0/spamd/spamd.raw
+--- spamassassin-3.2.0~/spamd/spamd.raw	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/spamd/spamd.raw	2007-05-03 09:55:39.000000000 -0400
+@@ -2670,7 +2670,7 @@
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C</etc/spamassassin> or similar).
+ 
+ =item B<--cf='config line'>
+ 
+diff -urNad spamassassin-3.2.0~/sql/README spamassassin-3.2.0/sql/README
+--- spamassassin-3.2.0~/sql/README	2007-05-01 09:54:24.000000000 -0400
++++ spamassassin-3.2.0/sql/README	2007-05-03 09:55:39.000000000 -0400
+@@ -18,7 +18,7 @@
+ SQL preferences.
+ 
+ SpamAssassin will check the global configuration file (ie. any file matching
+-/etc/mail/spamassassin/*.cf) for the following settings:
++/etc/spamassassin/*.cf) for the following settings:
+ 
+   user_scores_dsn		DBI:driver:connection
+   user_scores_sql_username	dbusername
+diff -urNad spamassassin-3.2.0~/sql/README.awl spamassassin-3.2.0/sql/README.awl
+--- spamassassin-3.2.0~/sql/README.awl	2007-05-01 09:54:24.000000000 -0400
++++ spamassassin-3.2.0/sql/README.awl	2007-05-03 09:55:39.000000000 -0400
+@@ -15,7 +15,7 @@
+ auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList
+ 
+ SpamAssassin will check the global configuration file (ie. any file
+-matching /etc/mail/spamassassin/*.cf) for the following settings:
++matching /etc/spamassassin/*.cf) for the following settings:
+ 
+ user_awl_dsn                 DBI:driver:database:hostname[:port]
+ user_awl_sql_username        dbusername
+diff -urNad spamassassin-3.2.0~/t/data/testplugin.pm spamassassin-3.2.0/t/data/testplugin.pm
+--- spamassassin-3.2.0~/t/data/testplugin.pm	2007-05-01 09:54:33.000000000 -0400
++++ spamassassin-3.2.0/t/data/testplugin.pm	2007-05-03 09:55:39.000000000 -0400
+@@ -1,6 +1,6 @@
+ =head1 
+ 
+-To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
++To try this out, write these lines to /etc/spamassassin/plugintest.cf:
+ 
+   loadplugin     myTestPlugin
+   header         MY_TEST_PLUGIN eval:check_test_plugin()
--- spamassassin-3.2.0.orig/debian/patches/20_edit_spamc_pod.dpatch
+++ spamassassin-3.2.0/debian/patches/20_edit_spamc_pod.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 20_move_spamd.dpatch by Duncan Findlay <duncf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make spamc's pod refer to spamd(8) not spamd(1)
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/duncf/debian/spamassassin-old2/spamassassin-2.99pre3.0.0svn20040523duncf1/spamc/spamc.pod spamassassin-2.99pre3.0.0svn20040523duncf1/spamc/spamc.pod
+--- /home/duncf/debian/spamassassin-old2/spamassassin-2.99pre3.0.0svn20040523duncf1/spamc/spamc.pod	2004-05-16 23:40:54.000000000 -0400
++++ spamassassin-2.99pre3.0.0svn20040523duncf1/spamc/spamc.pod	2004-05-24 00:11:48.000000000 -0400
+@@ -169,7 +169,7 @@
+ 
+ =head1 SEE ALSO
+ 
+-spamd(1)
++spamd(8)
+ spamassassin(1)
+ Mail::SpamAssassin(3)
+ 
--- spamassassin-3.2.0.orig/debian/patches/30_edit_README.dpatch
+++ spamassassin-3.2.0/debian/patches/30_edit_README.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+## 30_edit_README.dpatch by Duncan Findlay <duncf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/duncf/debian/spamassassin-old2/spamassassin-2.99pre3.0.0svn20040523duncf1/README spamassassin-2.99pre3.0.0svn20040523duncf1/README
+--- /home/duncf/debian/spamassassin-old2/spamassassin-2.99pre3.0.0svn20040523duncf1/README	2004-05-24 00:15:42.000000000 -0400
++++ spamassassin-2.99pre3.0.0svn20040523duncf1/README	2004-05-24 00:16:11.000000000 -0400
+@@ -91,11 +91,6 @@
+ 	add local rules and scores to.  Modifications here will be
+ 	appended to the config loaded from the above directory.
+ 
+-  - /usr/share/spamassassin/user_prefs.template:
+-
+-	Distributed default user preferences. Do not modify this, as it is
+-	overwritten when you upgrade.
+-
+   - /etc/spamassassin/user_prefs.template:
+ 
+ 	Default user preferences, for system admins to create, modify, and
--- spamassassin-3.2.0.orig/debian/rules
+++ spamassassin-3.2.0/debian/rules
@@ -0,0 +1,195 @@
+#!/usr/bin/make -f
+
+# SpamAssassin debian/rules
+# Duncan Findlay
+
+# Uses debhelper and dpatch
+
+# Based on sample debian/rules by Joey Hess
+# And patches from various people (see changelog)
+
+#export DH_VERBOSE=1
+
+# The architecture-dependent portion of this package can be built separately
+# (i.e. without building the rest).
+
+# Bad things could probably happen if we run this in parallel
+.NOTPARALLEL:
+
+CFLAGS=-O2 -Wall
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# For building both spamc and spamassassin
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
+configure: configure-stamp
+#	Next line should be removed when spamassassin has a BUGS file again:
+	touch BUGS
+
+configure-stamp: patch
+
+	dh_testdir
+
+	perl Makefile.PL INSTALLDIRS=vendor \
+	 DESTDIR=$(CURDIR)/debian/spamassassin \
+	 CONFDIR=/etc/spamassassin \
+	 ENABLE_SSL=yes < /dev/null
+
+	touch configure-stamp
+
+build: build-indep build-arch
+
+install: install-indep install-arch
+
+binary: binary-indep binary-arch
+
+clean: clean1 unpatch
+clean1:
+	dh_testdir
+	dh_testroot
+	rm -f build-indep-stamp build-arch-stamp configure-stamp
+
+	-$(MAKE) veryclean
+
+	rm -f spamd/spamc.1p
+	rm -Rf t/log/*
+	rm -f debian/semantic.cache
+
+	dh_clean
+
+#debian/po/templates.pot: debian/spamassassin.templates
+#	-debconf-updatepo
+
+# Spamassassin (and spamassassin-tools) ONLY
+
+build-indep: build-indep-stamp
+#build-indep-stamp: configure debian/po/templates.pot
+build-indep-stamp: configure
+
+	dh_testdir
+
+	$(MAKE) CFOPTIMIZE="$(CFLAGS)" CFCCFLAGS="" CFLIBS="" CFLDFLAGS=""
+
+	touch build-arch-stamp
+
+	touch build-indep-stamp
+
+
+#install-indep: install-spamassassin install-spamassassin-tools
+install-indep: install-spamassassin
+
+# SpamAssassin
+
+install-spamassassin: build-indep
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -i
+
+	$(MAKE) install
+
+
+#	Get rid of SPAMC stuff.
+	rm debian/spamassassin/usr/bin/spamc debian/spamassassin/usr/share/man/man1/spamc.1p
+
+
+#	Move spamd to /usr/sbin + fix the man file
+	sed 's#SPAMD 1#SPAMD 8#' \
+	 debian/spamassassin/usr/share/man/man1/spamd.1p \
+	 > debian/spamassassin/usr/share/man/man8/spamd.8p
+	rm debian/spamassassin/usr/share/man/man1/spamd.1p
+
+	mv debian/spamassassin/usr/bin/spamd debian/spamassassin/usr/sbin/
+
+#	Install Debian specific files
+	cp debian/65_debian.cf debian/spamassassin/usr/share/spamassassin/65_debian.cf
+
+	-rmdir -p debian/spamassassin/usr/lib/perl5
+
+#	dh_installdocs isn't flexible enough to install all the docs to the right place
+#	Do it here!
+	cp debian/copyright 				debian/spamassassin/usr/share/doc/spamassassin/
+	cp debian/spamassassin.README.Debian		debian/spamassassin/usr/share/doc/spamassassin/README.Debian
+	cp BUGS CREDITS README TRADEMARK UPGRADE USAGE NOTICE 	debian/spamassassin/usr/share/doc/spamassassin/
+	cp ldap/README 					debian/spamassassin/usr/share/doc/spamassassin/README.ldap
+	cp rules/STATISTICS*.txt 			debian/spamassassin/usr/share/doc/spamassassin/rules/
+	cp spamd/README 				debian/spamassassin/usr/share/doc/spamassassin/README.spamd
+	cp spamd/README.vpopmail 			debian/spamassassin/usr/share/doc/spamassassin/README.spamd-vpopmail
+	cp -r sql/ 					debian/spamassassin/usr/share/doc/spamassassin/
+
+#	Clean up any .svn stuff creeping in (only applicable for building
+#	from svn)
+	-find debian/spamassassin/ -path '*/.svn' -print0 | xargs -0 rm -Rf
+
+binary-indep: build-indep install-indep
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installlogcheck -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installinit -i -- defaults 19 21
+	dh_installchangelogs Changes -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_perl -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# spamc ONLY
+
+build-arch: build-arch-stamp
+#build-arch-stamp: configure debian/po/templates.pot
+build-arch-stamp: configure
+
+	dh_testdir
+
+	-mkdir -p blib/man1
+
+	$(MAKE) CFOPTIMIZE="$(CFLAGS)" CFCCFLAGS="" CFLIBS="" CFLDFLAGS="" spamc/spamc
+
+	pod2man spamc/spamc.pod blib/man1/spamc.1p
+
+	touch build-arch-stamp
+
+install-arch: DH_OPTIONS=
+install-arch: build-arch
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -a
+
+	cp spamc/spamc debian/spamc/usr/bin/spamc
+
+binary-arch: build-arch install-arch
+	dh_testdir -a
+	dh_testroot -a
+	dh_installlogcheck -a
+	dh_installdocs -a
+	dh_installman -a
+	dh_installchangelogs Changes -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+.PHONY: build build-indep build-arch clean clean1 binary-indep binary-arch binary install configure install-indep install-indep-docs install-arch unpatch
--- spamassassin-3.2.0.orig/debian/spamassassin.README.Debian
+++ spamassassin-3.2.0/debian/spamassassin.README.Debian
@@ -0,0 +1,138 @@
+
+READ "UPGRADE" IF YOU ARE UPGRADING FROM A PREVIOUS VERSION
+
+sa-update
+---------
+
+This package includes a script called "sa-update" that will download
+the latest set of rules distributed by upstream. This is currently a
+manual process, as it is still quite new. To update your rules, run
+the following as root:
+
+# sa-update
+
+This will download the latest set of rules to a directory under
+/var/lib/spamassassin/
+
+Trusted Networks
+----------------
+
+SpamAssassin has a built in guessing algorithm to determine which
+Received headers in a message are trustworthy and which are not. You
+should ensure that the configuration option trusted_networks and
+internal_networks are set correctly, especially if you are
+experiencing false positives from tests referring to Received headers.
+
+Please read man Mail::SpamAssassin::Conf for more information on this.
+
+Other modules
+-------------
+
+It is recommended that you install libnet-dns-perl and
+libmail-spf-query-perl to take full advantage of SpamAssassin's
+heuristic rules. Other modules can also be useful, see "Plugins"
+below.
+
+Specifically, network tests, which tend to be very good, require
+libnet-dns-perl.
+
+Plugins
+-------
+
+As of version 3.1.0, much of the functionality in SpamAssassin
+relating to external programs and perl modules has been removed and
+placed in plugins. For example, Razor, DCC and Pyzor have been
+"pluginized".
+
+Plugins can be enabled and disabled in /etc/spamassassin/init.pre and
+/etc/spamassassin/v310.pre. You may wish to read through those files
+to see which plugins you might want to install. In general, plugins
+may have dependencies that you may need to install for them to
+function. For example, the Razor2 plugin requires that you install
+razor. You should read the manpage before enabling a plugin.
+
+Please note that Razor and DCC have been disabled by default as they
+are no longer free for patent reasons.
+
+Configuring spamd
+-----------------
+
+spamd, the daemonized form of spamassassin, is generally the preferred
+way of running spamassassin. Please read man spamd and README.spamd
+for more information. Init scripts are provided with this package in
+/etc/init.d/spamassassin. To change the command line options, please
+edit /etc/default/spamassassin.
+
+If you intend to use Bayes sitewide, it is recommended that you set up
+an SQL-based Bayes storage module. (You may also want to store scores
+and other prefences in SQL too.) Please read the documentation in
+/usr/share/doc/spamassassin/sql/ for more information.
+
+Please note that SQL storage is not very private -- anyone that has
+access to the database can read and write it freely, meaning users
+could corrupt other users' Bayes databases.
+
+Please note that the --auth-ident option does not work with pidentd or
+gidentd. See http://bugs.debian.org/278030 for more information.
+
+Poor Performance
+----------------
+
+If you experience poor performance with spamd, please ensure that you
+have not set the --max-children option too high. spamd now uses a
+"Apache httpd style scaling" algorithm to prefork children, so these
+child will always be present. Please note also that there seems to be
+a bug with respect to how memory usage is reported by the kernel to
+programs such as top. Multiple spamd children share much more memory
+than is indicated.
+
+One common problem with spamd is that load spikes whenever the Bayes
+database needs to be sync'd. This is especially true right after an
+upgrade. It's often a good idea to do this manually right after you
+upgrade with the command: sa-learn --sync for each user/Bayes DB. (You
+can use the --dbpath option to specify the database path)
+
+You can also disable automatic expiry by setting the
+"bayes_auto_expire 0" option in your configuration and running
+sa-learn --force-expire from a cronjob. See
+http://wiki.spamassassin.org/BayesForceExpire
+
+Mail stream integration
+-----------------------
+
+Please read README for instructions on setting up SpamAssassin into
+your mail stream. There is also a very incomplete set of examples in
+the examples/ directory. More examples are welcome! Please file a bug
+against spamassassin with the minor or wishlist severity and attach a
+file or patch.
+
+There is a large amount of information on setting spamassassin up with
+your mail system at
+http://wiki.apache.org/spamassassin/UsingSpamAssassin.
+
+Configuration Files
+-------------------
+
+To add rules, change scores or edit the report template, edit
+/etc/spamassassin/local.cf. Please don't touch the files in
+/usr/share/spamassassin, as you will NOT be prompted to overwrite them
+on upgrade. Configuration file details are available in the
+Mail::SpamAssassin::Conf(3) man page.
+
+User-specific configuration is the automatically created
+~/.spamassassin/user_prefs, which is copied from
+/etc/spamassassin/user_prefs.template. It is automatically created
+whenever spamassassin is called, or when spamc is used with 'spamd
+-c'.
+
+Non-free RBLs
+-------------
+
+By default, spamassassin checks certain free RBLs. Other, commercial
+RBLs can easily be enabled. See the README for more
+information. Furthermore, SpamAssassin supports using third-party
+programs Razor, DCC and Pyzor, but Razor and DCC are disabled by
+default since they are not free for non-personal use. Feel free to
+enable them in /etc/spamassassin/init.pre
+
+ -- Duncan Findlay <duncf@debian.org>, Mon, 19 Jun 2006 01:01:44 -0400
--- spamassassin-3.2.0.orig/debian/spamassassin.default
+++ spamassassin-3.2.0/debian/spamassassin.default
@@ -0,0 +1,26 @@
+# /etc/default/spamassassin
+# Duncan Findlay
+
+# WARNING: please read README.spamd before using.
+# There may be security risks.
+
+# Change to one to enable spamd
+ENABLED=0
+
+# Options
+# See man spamd for possible options. The -d option is automatically added.
+
+# SpamAssassin uses a preforking model, so be careful! You need to
+# make sure --max-children is not set to anything higher than 5,
+# unless you know what you're doing.
+
+OPTIONS="--create-prefs --max-children 5 --helper-home-dir"
+
+# Pid file
+# Where should spamd write its PID to file? If you use the -u or
+# --username option above, this needs to be writable by that user.
+# Otherwise, the init script will not be able to shut spamd down.
+PIDFILE="/var/run/spamd.pid"
+
+# Set nice level of spamd
+#NICE="--nicelevel 15"
--- spamassassin-3.2.0.orig/debian/spamassassin.dirs
+++ spamassassin-3.2.0/debian/spamassassin.dirs
@@ -0,0 +1,10 @@
+etc
+etc/init.d
+etc/default
+usr/share/doc/spamassassin
+usr/share/doc/spamassassin/rules
+usr/share/spamassassin
+etc/logcheck/ignore.d.paranoid
+etc/logcheck/violations.ignore.d
+usr/share/man/man8
+usr/sbin
--- spamassassin-3.2.0.orig/debian/spamassassin.examples
+++ spamassassin-3.2.0/debian/spamassassin.examples
@@ -0,0 +1,4 @@
+sample-spam.txt
+sample-nonspam.txt
+debian/examples/*
+procmailrc.example
--- spamassassin-3.2.0.orig/debian/spamassassin.init
+++ spamassassin-3.2.0/debian/spamassassin.init
@@ -0,0 +1,75 @@
+#! /bin/sh
+
+# Spamd init script
+# June 2002
+# Duncan Findlay
+
+# Based on skeleton by Miquel van Smoorenburg and Ian Murdock
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/spamd
+NAME=spamd
+SNAME=spamassassin
+DESC="SpamAssassin Mail Filter Daemon"
+PIDFILE="/var/run/$NAME.pid"
+PNAME="spamd"
+
+export TMPDIR=/tmp
+# Apparently people have trouble if this isn't explicitly set...
+
+# Defaults - don't touch, edit /etc/default/spamassassin
+ENABLED=0
+OPTIONS=""
+NICE=
+
+test -f /etc/default/spamassassin && . /etc/default/spamassassin
+
+DOPTIONS="-d --pidfile=$PIDFILE"
+
+if [ "$ENABLED" = "0" ]; then
+    echo "$DESC: disabled, see /etc/default/spamassassin"
+    exit 0
+fi
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --pidfile $PIDFILE --name $PNAME \
+	    $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
+	echo "$NAME."
+	;;
+
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --pidfile $PIDFILE --name $PNAME --oknodo
+	echo "$NAME."
+	;;
+
+  reload|force-reload)
+	echo -n "Reloading $DESC: "
+	start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $PNAME
+	echo "$NAME."
+	;;
+
+  restart)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --pidfile $PIDFILE --name $PNAME \
+	    --retry 5 --oknodo
+	start-stop-daemon --start --pidfile $PIDFILE --name $PNAME \
+	    $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
+
+	echo "$NAME."
+	;;
+
+  *)
+	N=/etc/init.d/$SNAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- spamassassin-3.2.0.orig/debian/spamassassin.links
+++ spamassassin-3.2.0/debian/spamassassin.links
@@ -0,0 +1 @@
+etc/spamassassin etc/mail/spamassassin
--- spamassassin-3.2.0.orig/debian/spamassassin.logcheck.ignore.paranoid
+++ spamassassin-3.2.0/debian/spamassassin.logcheck.ignore.paranoid
@@ -0,0 +1,10 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)?( info:)? setuid to [._[:alnum:]-]+ succeeded *$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? processing message .+ for [._[:alnum:]-]+:[0-9]+\.? *$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? connection from [._[:alnum:]-]+ \[[.0-9]+\] at port [0-9]+ *$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? got connection over 
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? (clean message|identified spam) \([-0-9.]+/[-0-9.]+\) for [._[:alnum:]-]+:[0-9]+ in [0-9.]+ seconds, [0-9]+ bytes\. *$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? result:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? server hit by SIGCHLD$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? handled cleanup of child pid [0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? server successfully spawned child process, pid [0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]: prefork: child states:
--- spamassassin-3.2.0.orig/debian/spamassassin.logcheck.violations.ignore
+++ spamassassin-3.2.0/debian/spamassassin.logcheck.violations.ignore
@@ -0,0 +1 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ spamd\[[0-9]+\]:( spamd:)? result:
--- spamassassin-3.2.0.orig/debian/spamc.README.Debian
+++ spamassassin-3.2.0/debian/spamc.README.Debian
@@ -0,0 +1,9 @@
+spamc has been separated from the spamassassin package to accommodate
+people who wish to install spamd on a server, and just run spamc from
+other computers.
+
+Unless you are using spamc to connect to a spamd server on the local
+network, it is strongly recommended that you install spamassassin.
+
+Duncan Findlay
+duncf@debian.org
--- spamassassin-3.2.0.orig/debian/spamc.dirs
+++ spamassassin-3.2.0/debian/spamc.dirs
@@ -0,0 +1 @@
+usr/bin
--- spamassassin-3.2.0.orig/debian/spamc.docs
+++ spamassassin-3.2.0/debian/spamc.docs
@@ -0,0 +1,8 @@
+BUGS
+CREDITS
+README
+TRADEMARK
+USAGE
+sample-nonspam.txt
+sample-spam.txt
+procmailrc.example
--- spamassassin-3.2.0.orig/debian/spamc.manpages
+++ spamassassin-3.2.0/debian/spamc.manpages
@@ -0,0 +1 @@
+blib/man1/spamc.1p
--- spamassassin-3.2.0.orig/debian/watch
+++ spamassassin-3.2.0/debian/watch
@@ -0,0 +1,4 @@
+version=2
+
+http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-(.*)\.tar\.gz \
+    debian uupdate