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

[Matthijs Mohlmann]

Author: active2-guest
Date: Wed Nov  2 20:39:26 2005
New Revision: 34

Removed:
   trunk/debian/dspam-webfrontend.conffiles
Modified:
   trunk/debian/control
   trunk/debian/libdspam7-drv-hash.cron.daily
   trunk/debian/rules
Log:
 * Better dependency for libdspam7-dev (added libdspam7 (= ${Source-Version})
 * Get rid of the following warnings:
   - warning: unknown substitution variable ${misc:Depends}
   - warning: unknown substitution variable ${shlibs:Depends}
   - warning: unknown substitution variable ${perl:Depends}
 * Don't install purge-3.sql executable
 * Modified the hash cron.daily script a bit so that it bail out properly


Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Wed Nov  2 20:39:26 2005
@@ -8,7 +8,7 @@
 
 Package: dspam
 Architecture: any
-Depends: adduser, libdspam7-drv, ${shlibs:Depends}, ${misc:Depends}
+Depends: adduser, libdspam7-drv, ${shlibs:Depends}
 Recommends: dspam-doc
 Description: is a scalable, fast and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -23,7 +23,7 @@
 
 Package: dspam-webfrontend
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},${perl:Depends}, libgd-gd2-perl
+Depends: libgd-gd2-perl
 Suggests: libapache-mod-perl | libapache-mod-perl2, libapache-mod-auth-curdir | libapache-mod-auth-kerb | libapache-mod-auth-mysql | libapache-mod-auth-pam | libapache-mod-auth-pgsql | libapache-mod-auth-plain | libapache-mod-auth-radius | libapache-mod-auth-shadow | libapache-mod-auth-useragent | libapache2-mod-auth-kerb | libapache2-mod-auth-mysql | libapache2-mod-auth-pam | libapache2-mod-auth-pgsql | libapache2-mod-auth-plain | libapache2-mod-auth-sys-group
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -41,7 +41,7 @@
 Package: libdspam7
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 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:
@@ -55,7 +55,7 @@
 
 Package: libdspam7-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libdspam7 (= ${Source-Version})
 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:
@@ -69,7 +69,7 @@
 
 Package: libdspam7-drv-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common
+Depends: ${shlibs:Depends}, dbconfig-common
 Recommends: postgresql-8.0
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
@@ -85,7 +85,7 @@
 
 Package: libdspam7-drv-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common
+Depends: ${shlibs:Depends}, dbconfig-common
 Recommends: mysql-server-5.0
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
@@ -101,7 +101,7 @@
 
 Package: libdspam7-drv-db4
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -116,7 +116,7 @@
 
 Package: libdspam7-drv-sqlite3
 Architecture: any
-Depends: sqlite3, ${shlibs:Depends}, ${misc:Depends}
+Depends: sqlite3, ${shlibs:Depends}
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -131,7 +131,7 @@
 
 Package: libdspam7-drv-hash
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes

Modified: trunk/debian/libdspam7-drv-hash.cron.daily
==============================================================================
--- trunk/debian/libdspam7-drv-hash.cron.daily	(original)
+++ trunk/debian/libdspam7-drv-hash.cron.daily	Wed Nov  2 20:39:26 2005
@@ -1,4 +1,10 @@
 #!/bin/sh
-set -e
+#
+# Clean up the db4 databases
+
+if [ -x /usr/bin/dspam_clean ]; then
+  /usr/bin/dspam_clean -s -p
+fi
+
+exit 0
 
-/usr/bin/dspam_clean -s -p

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Wed Nov  2 20:39:26 2005
@@ -79,6 +79,7 @@
 	chmod 644 webui/cgi-bin/rgb.txt
 	chmod 644 webui/htdocs/base.css
 	chmod 644 webui/htdocs/dspam-logo-small.gif
+	chmod 644 src/tools.sqlite_drv/purge-3.sql
 	touch build-stamp
 
 clean: clean-patched unpatch