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

[Matthijs Mohlmann]

Author: active2-guest
Date: Wed Nov  2 18:41:25 2005
New Revision: 33

Added:
   trunk/debian/libdspam7-drv-hash.cron.daily
      - copied unchanged from r31, trunk/debian/dspam.cron.daily
   trunk/debian/libdspam7-drv-mysql.config
   trunk/debian/libdspam7-drv-mysql.postinst
   trunk/debian/libdspam7-drv-mysql.postrm
   trunk/debian/libdspam7-drv-mysql.prerm
   trunk/debian/libdspam7-drv-pgsql.config
   trunk/debian/libdspam7-drv-pgsql.postinst
   trunk/debian/libdspam7-drv-pgsql.postrm
   trunk/debian/libdspam7-drv-pgsql.prerm
   trunk/debian/libdspam7-drv-sqlite3.cron.daily
Removed:
   trunk/debian/dspam.cron.daily
Modified:
   trunk/debian/control
   trunk/debian/libdspam7-drv-mysql.dirs
   trunk/debian/libdspam7-drv-mysql.install
   trunk/debian/libdspam7-drv-pgsql.dirs
   trunk/debian/libdspam7-drv-pgsql.install
   trunk/debian/libdspam7-drv-sqlite3.dirs
   trunk/debian/libdspam7-drv-sqlite3.install
Log:
 * Add several Depends and Recommends
 * Added dbconfig-common to allow the creation of mysql or pgsql databases
 * Moved the cron.daily script to hash driver
 * Added a cron.daily for the sqlite3 driver


Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Wed Nov  2 18:41:25 2005
@@ -69,7 +69,8 @@
 
 Package: libdspam7-drv-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common
+Recommends: postgresql-8.0
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -84,7 +85,8 @@
 
 Package: libdspam7-drv-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common
+Recommends: mysql-server-5.0
 Provides: libdspam7-drv
 Description: DSPAM is a scalable and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
@@ -114,7 +116,7 @@
 
 Package: libdspam7-drv-sqlite3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: sqlite3, ${shlibs:Depends}, ${misc: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

Added: trunk/debian/libdspam7-drv-mysql.config
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-mysql.config	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# Configure mysql database.
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig
+. /usr/share/dbconfig-common/dpkg/config.mysql
+
+# Run dbconfig
+dbc_go libdspam7-drv-mysql $@
+
+exit 0
+

Modified: trunk/debian/libdspam7-drv-mysql.dirs
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.dirs	(original)
+++ trunk/debian/libdspam7-drv-mysql.dirs	Wed Nov  2 18:41:25 2005
@@ -1 +1,2 @@
+usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
 usr/lib/dspam

Modified: trunk/debian/libdspam7-drv-mysql.install
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.install	(original)
+++ trunk/debian/libdspam7-drv-mysql.install	Wed Nov  2 18:41:25 2005
@@ -1,5 +1,7 @@
 debian/tmp/usr/lib/libmysql_drv.so* usr/lib/dspam
 debian/tmp/usr/lib/libmysql_drv.a usr/lib/dspam
+src/tools.mysql_drv/mysql_objects-4.1.sql usr/share/dbconfig-common/data/libdspam7-drv-mysql/install/mysql
+src/tools.mysql_drv/virtual_users.sql usr/share/dbconfig-common/data/libdspam7-drv-mysql/install/mysql
 src/tools.mysql_drv/mysql_objects-4.1.sql usr/share/doc/libdspam7-drv-mysql/
 src/tools.mysql_drv/mysql_objects-space.sql usr/share/doc/libdspam7-drv-mysql/
 src/tools.mysql_drv/mysql_objects-speed.sql usr/share/doc/libdspam7-drv-mysql/

Added: trunk/debian/libdspam7-drv-mysql.postinst
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-mysql.postinst	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Post installation for the mysql backend.
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig (mysql part)
+. /usr/share/dbconfig-common/dpkg/postinst.mysql
+
+# Run dbconfig
+dbc_go libdspam7-drv-mysql $@
+
+#DEBHELPER#
+
+exit 0
+

Added: trunk/debian/libdspam7-drv-mysql.postrm
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-mysql.postrm	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Post removal
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig
+. /usr/share/dbconfig-common/dpkg/postrm.mysql
+
+# Run dbconfig
+dbc_go libdspam7-drv-mysql $@
+
+#DEBHELPER#
+
+exit 0
+

Added: trunk/debian/libdspam7-drv-mysql.prerm
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-mysql.prerm	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Pre removal
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig
+. /usr/share/dbconfig-common/dpkg/prerm.mysql
+
+# Run dbconfig
+dbc_go libdspam7-drv-mysql $@
+
+#DEBHELPER#
+
+exit 0
+

Added: trunk/debian/libdspam7-drv-pgsql.config
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-pgsql.config	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# Configure mysql database.
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig
+. /usr/share/dbconfig-common/dpkg/config.pgsql
+
+# Run dbconfig
+dbc_go libdspam7-drv-pgsql $@
+
+exit 0
+

Modified: trunk/debian/libdspam7-drv-pgsql.dirs
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.dirs	(original)
+++ trunk/debian/libdspam7-drv-pgsql.dirs	Wed Nov  2 18:41:25 2005
@@ -1 +1,2 @@
+usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
 usr/lib/dspam

Modified: trunk/debian/libdspam7-drv-pgsql.install
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.install	(original)
+++ trunk/debian/libdspam7-drv-pgsql.install	Wed Nov  2 18:41:25 2005
@@ -1,5 +1,7 @@
 debian/tmp/usr/lib/libpgsql_drv.so* usr/lib/dspam
 debian/tmp/usr/lib/libpgsql_drv.a usr/lib/dspam
+src/tools.pgsql_drv/pgsql_objects.sql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install/mysql
+src/tools.mysql_drv/virtual_users.sql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install/mysql
 src/tools.pgsql_drv/pgsql_objects.sql usr/share/doc/libdspam7-drv-pgsql/
 src/tools.pgsql_drv/virtual_users.sql usr/share/doc/libdspam7-drv-pgsql/
 src/tools.pgsql_drv/purge.sql usr/share/doc/libdspam7-drv-pgsql/

Added: trunk/debian/libdspam7-drv-pgsql.postinst
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-pgsql.postinst	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Post installation for the mysql backend.
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig (pgsql part)
+. /usr/share/dbconfig-common/dpkg/postinst.pgsql
+
+# Run dbconfig
+dbc_go libdspam7-drv-pgsql $@
+
+#DEBHELPER#
+
+exit 0
+

Added: trunk/debian/libdspam7-drv-pgsql.postrm
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-pgsql.postrm	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Post removal
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig
+. /usr/share/dbconfig-common/dpkg/postrm.mysql
+
+# Run dbconfig
+dbc_go libdspam7-drv-pgsql $@
+
+#DEBHELPER#
+
+exit 0
+

Added: trunk/debian/libdspam7-drv-pgsql.prerm
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-pgsql.prerm	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Pre removal
+
+set -e
+
+# Load debconf
+. /usr/share/debconf/confmodule
+
+# Load dbconfig
+. /usr/share/dbconfig-common/dpkg/prerm.pgsql
+
+# Run dbconfig
+dbc_go libdspam7-drv-pgsql $@
+
+#DEBHELPER#
+
+exit 0
+

Added: trunk/debian/libdspam7-drv-sqlite3.cron.daily
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-sqlite3.cron.daily	Wed Nov  2 18:41:25 2005
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Clean the sqlite3 databases
+
+DSPAMCONF=/etc/dspam/dspam.conf
+DSPAMHOME=`cat $DSPAMCONF | grep ^Home | awk '{print $2}'`
+
+if [ -d "$DSPAMHOME/data" ]; then
+  find $DSPAMHOME/data -name "*.sdb" -exec sqlite {} < /usr/share/dspam/clean/purge-3.sql \;
+fi
+
+exit 0
+

Modified: trunk/debian/libdspam7-drv-sqlite3.dirs
==============================================================================
--- trunk/debian/libdspam7-drv-sqlite3.dirs	(original)
+++ trunk/debian/libdspam7-drv-sqlite3.dirs	Wed Nov  2 18:41:25 2005
@@ -1 +1,2 @@
 usr/lib/dspam
+usr/share/dspam/clean

Modified: trunk/debian/libdspam7-drv-sqlite3.install
==============================================================================
--- trunk/debian/libdspam7-drv-sqlite3.install	(original)
+++ trunk/debian/libdspam7-drv-sqlite3.install	Wed Nov  2 18:41:25 2005
@@ -1,4 +1,3 @@
 debian/tmp/usr/lib/libsqlite3_drv.so* usr/lib/dspam
 debian/tmp/usr/lib/libsqlite3_drv.a usr/lib/dspam
-src/tools.sqlite_drv/purge-2.sql usr/share/doc/libdspam7-drv-sqlite3
-src/tools.sqlite_drv/purge-3.sql usr/share/doc/libdspam7-drv-sqlite3
+src/tools.sqlite_drv/purge-3.sql usr/share/dspam/clean