[pkg-dspam-commits] r65 - trunk/debian

[Matthijs Mohlmann]

Author: active2-guest
Date: Thu Jan 12 22:00:29 2006
New Revision: 65

Added:
   trunk/debian/dspam.cron.daily
      - copied, changed from r57, trunk/debian/libdspam7-drv-hash.cron.daily
Removed:
   trunk/debian/libdspam7-drv-hash.cron.daily
   trunk/debian/libdspam7-drv-hash.dirs
   trunk/debian/libdspam7-drv-hash.install
   trunk/debian/libdspam7-drv-hash.manpages
Modified:
   trunk/debian/control
   trunk/debian/dspam.dirs
   trunk/debian/dspam.install
   trunk/debian/dspam.manpages
   trunk/debian/libdspam7-drv-sqlite3.install
   trunk/debian/rules
Log:
 * The dspam package now contains also the hash driver.
 * Suggests libdspam7-drv in the libdspam7 package
 * Removed the libdspam7-drv-hash backend
 * Above fixes install problems of mysql and postgresql.
 * Added a check to cron.daily to see if the hash backend is actually used.


Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Thu Jan 12 22:00:29 2006
@@ -41,7 +41,8 @@
 Package: libdspam7
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libdspam7-drv
+Depends: ${shlibs:Depends}
+Suggests: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
  many new algorithms to fight against spam including:
@@ -129,21 +130,6 @@
  .
  This package contains the sqlite3 backend.
 
-Package: libdspam7-drv-hash
-Architecture: any
-Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version})
-Provides: libdspam7-drv
-Description: DSPAM is a scalable and statistical anti-spam filter
- DSPAM is a dedicated statistical filter with minimal resources. It includes
- many new algorithms to fight against spam including:
-  * Concept Identification
-  * Neural Networking
-  * Message Inoculation
-  * Advanced de-obfuscation techniques
-  * Bayesian Noise Reduction
- .
- This package contains the hash backend.
-
 Package: dspam-doc
 Section: doc
 Architecture: all

Copied: trunk/debian/dspam.cron.daily (from r57, trunk/debian/libdspam7-drv-hash.cron.daily)
==============================================================================
--- trunk/debian/libdspam7-drv-hash.cron.daily	(original)
+++ trunk/debian/dspam.cron.daily	Thu Jan 12 22:00:29 2006
@@ -2,8 +2,13 @@
 #
 # Clean up the db4 databases
 
-if [ -x /usr/bin/dspam_clean ]; then
-  /usr/bin/dspam_clean -s -p
+DSPAMCONF=/etc/dspam/dspam.conf
+DSPAMSTORAGE=`cat $DSPAMCONF | grep "^StorageDriver.*hash_drv.so"`
+
+if [ ! -z $DSPAMSTORAGE ]; then
+  if [ -x /usr/bin/dspam_clean ]; then
+    /usr/bin/dspam_clean -s -p
+  fi
 fi
 
 exit 0

Modified: trunk/debian/dspam.dirs
==============================================================================
--- trunk/debian/dspam.dirs	(original)
+++ trunk/debian/dspam.dirs	Thu Jan 12 22:00:29 2006
@@ -2,3 +2,4 @@
 var/spool/dspam/data
 etc/dspam/dspam.d
 var/log/dspam
+usr/lib/dspam

Modified: trunk/debian/dspam.install
==============================================================================
--- trunk/debian/dspam.install	(original)
+++ trunk/debian/dspam.install	Thu Jan 12 22:00:29 2006
@@ -12,3 +12,7 @@
 debian/tmp/usr/bin/dspam_genaliases usr/bin/
 debian/tmp/usr/bin/dspam_merge      usr/bin/
 debian/tmp/usr/bin/dspam_stats      usr/bin/
+debian/tmp/usr/lib/libhash_drv.so* usr/lib/dspam
+debian/tmp/usr/bin/cssclean usr/bin   
+debian/tmp/usr/bin/cssstat usr/bin
+debian/tmp/usr/bin/csscompress usr/bin

Modified: trunk/debian/dspam.manpages
==============================================================================
--- trunk/debian/dspam.manpages	(original)
+++ trunk/debian/dspam.manpages	Thu Jan 12 22:00:29 2006
@@ -4,6 +4,9 @@
 debian/manpages/dspam_2sql.1
 debian/manpages/dspam_logrotate.1
 debian/manpages/dspamc.1
+debian/manpages/cssclean.1 
+debian/manpages/csscompress.1
+debian/manpages/cssstat.1 
 man/dspam.1
 man/dspam_clean.1  
 man/dspam_corpus.1  

Modified: trunk/debian/libdspam7-drv-sqlite3.install
==============================================================================
--- trunk/debian/libdspam7-drv-sqlite3.install	(original)
+++ trunk/debian/libdspam7-drv-sqlite3.install	Thu Jan 12 22:00:29 2006
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/libsqlite3_drv.so* usr/lib/dspam
-src/tools.sqlite_drv/purge-3.sql usr/share/doc/libdspam7-drv-sqlite3/
+src/tools.sqlite_drv/purge-3.sql usr/share/dspam/clean

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Thu Jan 12 22:00:29 2006
@@ -148,7 +148,7 @@
 	dh_installman -a
 	dh_installinit -a
 	dh_installdebconf -a
-	dh_makeshlibs -a -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-db4 -Nlibdspam7-drv-sqlite3 -Nlibdspam7-drv-hash
+	dh_makeshlibs -a -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-db4 -Nlibdspam7-drv-sqlite3 -Ndspam
 	dh_link -a
 	dh_strip -a
 	dh_compress -a