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

Matthijs Mohlmann active2-guest at costa.debian.org
Sun Nov 6 14:34:32 UTC 2005 

Author: active2-guest
Date: Sun Nov  6 14:34:31 2005
New Revision: 47

Added:
   trunk/debian/libdspam7-drv-mysql.override
   trunk/debian/libdspam7-drv-pgsql.override
Modified:
   trunk/debian/control
   trunk/debian/dspam.dirs
   trunk/debian/dspam.install
   trunk/debian/dspam.postrm
   trunk/debian/libdspam7-drv-mysql.dirs
   trunk/debian/libdspam7-drv-pgsql.dirs
   trunk/debian/rules
Log:
 * Added Rudolf Weeber to Uploaders
 * Added libdspam7 dependency to the backends
 * Moved libdspam7-drv from dspam to libdspam7 as this the right choice.
   Packages can depend on libdspam7 and a specific backend and then the dspam
   package isn't needed. (I hope I explained it the right way)
 * Added overrides for the mysql and pgsql backend to fix warning
   no-debconf-template, these templates are in dbconfig-common (wishlist bug
   against lintian?)
 * Added dh_installdebconf to fix the installation of the mysql and pgsql
   backend.
 * Install defaults.prefs and the directory /var/spool/dspam/data to fix the
   dpkg-statoverride warnings about missing files.


Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Sun Nov  6 14:34:31 2005
@@ -2,14 +2,14 @@
 Section: mail
 Priority: optional
 Maintainer: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
-Uploaders: Matthijs Mohlmann <matthijs at cacholong.nl>, Christoph Haas <haas at debian.org>, Kurt B. Kaiser <kbk at shore.net>, Jesus Climent <mooch at debian.org>
+Uploaders: Matthijs Mohlmann <matthijs at cacholong.nl>, Christoph Haas <haas at debian.org>, Kurt B. Kaiser <kbk at shore.net>, Jesus Climent <mooch at debian.org>, Rudolf Weber <rudolf at faveve.uni-stuttgart.de>
 Build-Depends: debhelper (>= 5.0.2), libpq-dev | postgresql-dev, dpatch (>= 2.0.0), automake1.9, autotools-dev, libmysqlclient14-dev, libdb4.2-dev, libsqlite3-dev, libldap2-dev
 Standards-Version: 3.6.2.1
 
 Package: dspam
 Architecture: any
-Depends: procmail, adduser, libdspam7-drv, ${shlibs:Depends}
-Recommends: dspam-doc,clamav
+Depends: procmail, adduser, ${shlibs:Depends}
+Recommends: dspam-doc, clamav
 Description: is a scalable, fast and statistical anti-spam filter
  DSPAM is a dedicated statistical filter with minimal resources. It includes
  many new algorithms to fight against spam including:
@@ -41,7 +41,7 @@
 Package: libdspam7
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, 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:
@@ -69,7 +69,7 @@
 
 Package: libdspam7-drv-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, dbconfig-common
+Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0
 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}, dbconfig-common
+Depends: ${shlibs:Depends}, libdspam7 (= ${Source-Version}), dbconfig-common, debconf (>= 0.5) | debconf-2.0
 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}
+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
@@ -116,7 +116,7 @@
 
 Package: libdspam7-drv-sqlite3
 Architecture: any
-Depends: sqlite3, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, sqlite3, 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
@@ -131,7 +131,7 @@
 
 Package: libdspam7-drv-hash
 Architecture: any
-Depends: ${shlibs:Depends}
+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

Modified: trunk/debian/dspam.dirs
==============================================================================
--- trunk/debian/dspam.dirs	(original)
+++ trunk/debian/dspam.dirs	Sun Nov  6 14:34:31 2005
@@ -1,4 +1,4 @@
 usr/bin
-var/spool/dspam
+var/spool/dspam/data
 etc/dspam
 var/log/dspam

Modified: trunk/debian/dspam.install
==============================================================================
--- trunk/debian/dspam.install	(original)
+++ trunk/debian/dspam.install	Sun Nov  6 14:34:31 2005
@@ -1,4 +1,5 @@
 debian/tmp/etc/dspam/* etc/dspam/
+webui/cgi-bin/default.prefs etc/dspam/
 debian/tmp/usr/bin/dspam_2sql       usr/bin/ 
 debian/tmp/usr/bin/dspamc           usr/bin/
 debian/tmp/usr/bin/dspam_corpus     usr/bin/

Modified: trunk/debian/dspam.postrm
==============================================================================
--- trunk/debian/dspam.postrm	(original)
+++ trunk/debian/dspam.postrm	Sun Nov  6 14:34:31 2005
@@ -3,7 +3,7 @@
 set -e
 
 remove_user() {
-    userdel --system dspam
+    deluser --system dspam
 }
 
 remove_dspam_perms() {

Modified: trunk/debian/libdspam7-drv-mysql.dirs
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.dirs	(original)
+++ trunk/debian/libdspam7-drv-mysql.dirs	Sun Nov  6 14:34:31 2005
@@ -1,2 +1,3 @@
 usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
+usr/share/lintian/overrides/
 usr/lib/dspam

Added: trunk/debian/libdspam7-drv-mysql.override
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-mysql.override	Sun Nov  6 14:34:31 2005
@@ -0,0 +1 @@
+libdspam7-drv-mysql: no-debconf-templates

Modified: trunk/debian/libdspam7-drv-pgsql.dirs
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.dirs	(original)
+++ trunk/debian/libdspam7-drv-pgsql.dirs	Sun Nov  6 14:34:31 2005
@@ -1,2 +1,3 @@
 usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
+usr/share/lintian/overrides/
 usr/lib/dspam

Added: trunk/debian/libdspam7-drv-pgsql.override
==============================================================================
--- (empty file)
+++ trunk/debian/libdspam7-drv-pgsql.override	Sun Nov  6 14:34:31 2005
@@ -0,0 +1 @@
+libdspam7-drv-pgsql: no-debconf-templates

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sun Nov  6 14:34:31 2005
@@ -110,9 +110,12 @@
 	dh_installdirs
 	(cd build--tmp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp)
 	dh_install
+	
 	# Install override for conffiles into /usr/share
-	install -d -g root -m 755 -o root $(CURDIR)/debian/dspam-webfrontend/usr/share/lintian/overrides
 	cp debian/dspam-webfrontend.override $(CURDIR)/debian/dspam-webfrontend/usr/share/lintian/overrides/dspam-webfrontend
+	cp debian/libdspam7-drv-mysql.override $(CURDIR)/debian/libdspam7-drv-mysql/usr/share/lintian/overrides/libdspam7-drv-mysql
+	cp debian/libdspam7-drv-pgsql.override $(CURDIR)/debian/libdspam7-drv-pgsql/usr/share/lintian/overrides/libdspam7-drv-pgsql
+	
 	# Install configure.pl as /etc/dspam/webfrontend.conf
 	install -d -g root -m 755 -o root $(CURDIR)/debian/dspam-webfrontend/etc/dspam
 	cp build--tmp/webui/cgi-bin/configure.pl $(CURDIR)/debian/dspam-webfrontend/etc/dspam/webfrontend.conf
@@ -143,6 +146,7 @@
 	dh_installlogrotate -a
 	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_link -a
 	dh_strip -a

More information about the Pkg-dspam-commits mailing list