silence debian lintian warnings

5 files changed, 15 insertions, 6 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 00000000..454cfe09
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+
+The dbmail.conf distributed with the source package is patched 
+for compatibility with debian policy.
+
+Please refer to /usr/share/doc/dpatch/README.source.gz for more
+information.
+
+
diff --git a/debian/control b/debian/control
index 6c8d9f52..45f46477 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: mail
 Priority: optional
 Maintainer: Paul J Stevens <paul@nfg.nl>
 Build-Depends: automake1.9, debhelper (>= 5.0.7), dpatch, libsieve2-dev (>= 2.1.12), libglib2.0-dev, libgmime-2.0-2-dev | libgmime2.1-dev, libldap2-dev, libsqlite3-dev, libpq-dev, libmysqlclient15-dev | libmysqlclient14-dev, pkg-config, libtool, asciidoc, xmlto, chrpath, po-debconf
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 
 Package: dbmail
 Architecture: any
 Pre-Depends: adduser
-Depends: ${shlibs:Depends}, ucf (>= 0.30), debconf (>= 0.5) | debconf-2.0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ucf (>= 0.30), debconf (>= 0.5) | debconf-2.0
 Provides: imap-server, pop3-server
 Suggests: dbmail-pgsql | dbmail-mysql, sqlite3
 Description: base package for the dbmail email solution
@@ -24,7 +24,7 @@ Description: base package for the dbmail email solution
 
 Package: dbmail-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, dbmail (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, dbmail (= ${binary:Version})
 Description: PostgreSQL module for Dbmail
  This package provides a module for adding PostgreSQL database 
  support to DBMAIL.
@@ -34,7 +34,7 @@ Description: PostgreSQL module for Dbmail
 
 Package: dbmail-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, dbmail (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, dbmail (= ${binary:Version})
 Description: MySQL module for Dbmail
  This package provides a module for adding MySQL database 
  support to DBMAIL.
diff --git a/debian/dbmail.dirs b/debian/dbmail.dirs
index 30e121c2..79663faf 100644
--- a/debian/dbmail.dirs
+++ b/debian/dbmail.dirs
@@ -1,4 +1,3 @@
 usr/lib
 usr/share/dbmail
 var/log/dbmail
-var/run/dbmail
diff --git a/debian/dbmail.postrm b/debian/dbmail.postrm
index f63c5e4a..f4c5649c 100644
--- a/debian/dbmail.postrm
+++ b/debian/dbmail.postrm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f /usr/share/debconf/confmodule ]; then
 	. /usr/share/debconf/confmodule
 fi
diff --git a/debian/rules b/debian/rules
index 75880df1..7a410990 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,7 +136,7 @@ binary-common: build
 		sort|uniq>stamps/tmpfile && cat stamps/tmpfile > $(CURDIR)/debian/dbmail-pgsql.examples
 	rm -f stamps/tmpfile
 	dh_installexamples -a
-	dh_installdirs etc/dbmail var/run/dbmail var/log/dbmail usr/share/dbmail
+	dh_installdirs etc/dbmail var/log/dbmail usr/share/dbmail
 	install -m 644 $(CURDIR)/debian/default.dbmail $(CURDIR)/debian/dbmail/usr/share/dbmail/default.dbmail
 	dh_strip -a
 	dh_link -a