[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-25-g224e07c

[Julien Valroff]

The following commit has been merged in the master branch:
commit 224e07cc1dde86682be931fc240e2ab5af26fb86
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Jul 8 13:25:25 2011 +0200

    Remove useless 001_drivers-in-usr_lib_dspam patch

diff --git a/debian/changelog b/debian/changelog
index ceb1bd0..602d535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,12 @@ dspam (3.9.1~rc1+git20110514.347379b+dfsg-2) unstable; urgency=low
     + Move the hash driver to as dedicated package
     + Clean .install files
   * Move default.prefs to dspam-webfrontend (from dspam core package)
+  * Remove useless 001_drivers-in-usr_lib_dspam patch
 
   [ Thomas Preud'homme ]
   * Set build flags (CPPFLAGS, CFLAGS and LDFLAGS) using dpkg-buildflags.
 
- -- Julien Valroff <julien at debian.org>  Sat, 02 Jul 2011 08:23:09 +0200
+ -- Julien Valroff <julien at debian.org>  Fri, 08 Jul 2011 13:24:41 +0200
 
 dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/001_drivers-in-usr_lib_dspam.diff b/debian/patches/001_drivers-in-usr_lib_dspam.diff
deleted file mode 100644
index 58af3fc..0000000
--- a/debian/patches/001_drivers-in-usr_lib_dspam.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Default hash storage driver is installed in /usr/lib/dspam
-Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
-Forwarded: not-needed
-
---- a/src/dspam.conf.in
-+++ b/src/dspam.conf.in
-@@ -26,7 +26,7 @@
- # this option. If you do not wish to lose all of your data, you will need to
- # migrate it to the new backend before making this change.
- #
--StorageDriver @libdir@/dspam/@storage_driver@
-+StorageDriver /usr/lib/dspam/libhash_drv.so
- 
- #
- # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call
diff --git a/debian/patches/series b/debian/patches/series
index 7b1e09b..cbc8b4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-001_drivers-in-usr_lib_dspam.diff
 002_dspam-webfrontend-config-debian.diff
 003_update-dspam.conf.diff
 004_dspam-default.prefs-in_etc.diff
diff --git a/debian/rules b/debian/rules
index 84a35d2..c0f3bc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-STORAGE = "mysql_drv,pgsql_drv,sqlite3_drv,hash_drv"
+# The first driver stated hear will be used as the 
+# default driver in dspam.conf
+STORAGE = "hash_drv,mysql_drv,pgsql_drv,sqlite3_drv"
 
 CONFIGURE = --sysconfdir=/etc/dspam \
             --disable-dependency-tracking \

-- 
Debian packages for the DSPAM anti-spam filter