update debian packaging

28 files changed, 52 insertions, 621 deletions

diff --git a/debian/changelog b/debian/changelog
index c076a719..cdf64ea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,7 @@
-dbmail (2.2.16-1) unstable; urgency=low
+dbmail (2.2.17-1) unstable; urgency=low
 
-  * upstream release
-
- -- Paul J Stevens <paul@nfg.nl>  Mon, 21 Jun 2010 11:13:25 +0200
-
-dbmail (2.2.15-1) unstable; urgency=low
-
-  * upstream release
-
- -- Paul J Stevens <paul@nfg.nl>  Sat, 13 Feb 2010 10:16:52 +0100
-
-dbmail (2.2.14-1) unstable; urgency=low
-
-  * upstream release
-
- -- Paul J Stevens <paul@nfg.nl>  Fri, 22 Jan 2010 10:38:06 +0100
-
-dbmail (2.2.13-1) unstable; urgency=low
-
-  * upstream release
+  * upstream release 
+  * add Danish debconf translation (Closes: #596465)
   * update autoconf files (Closes: #542080)
   * fix misc debian issues (Closes: #482282):
      - fix cron output due to missing files when in state "config-files"
@@ -27,7 +10,7 @@ dbmail (2.2.13-1) unstable; urgency=low
      - remove empty prerm
   * fix typo (Closes: #550259)
 
- -- Paul J Stevens <paul@nfg.nl>  Fri, 09 Oct 2009 14:41:47 +0200
+ -- Paul J Stevens <paul@nfg.nl>  Sat, 18 Sep 2010 17:51:36 +0000
 
 dbmail (2.2.11-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 05dbc10b..671696d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: dbmail
 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.4
+Build-Depends: automake1.9, debhelper (>= 5.0.7), 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.9.1
 
 Package: dbmail
 Architecture: any
diff --git a/debian/patches/00-etch.dpatch b/debian/patches/00-etch.dpatch
deleted file mode 100755
index a5f9c9ca..00000000
--- a/debian/patches/00-etch.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00-etch.dpatch by  <paul@nfg.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad dbmail-2.2.6~/debian/changelog dbmail-2.2.6/debian/changelog
---- dbmail-2.2.6~/debian/changelog	2007-09-15 09:29:23.000000000 +0200
-+++ dbmail-2.2.6/debian/changelog	2007-09-15 10:38:29.000000000 +0200
-@@ -1,4 +1,4 @@
--dbmail (2.2.6-1) unstable; urgency=low
-+dbmail (2.2.6-1) stable; urgency=low
- 
-   * new upstream release
- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d257431f..00000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# 
-# paths and effective user/group
-00-dbmail_conf
-
-# etch
-#00-etch
-
-# garbage collection
-#01_gc
diff --git a/debian/patches/01-sa-siginfo-undeclared.dpatch b/debian/patches/01-sa-siginfo-undeclared.dpatch
deleted file mode 100755
index a762cd57..00000000
--- a/debian/patches/01-sa-siginfo-undeclared.dpatch
+++ /dev/null
@@ -1,128 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-sa-siginfo-undeclared.dpatch by  <paul@nfg.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix FTBFS on Hurd due to missing SA_SIGINFO
-
-@DPATCH@
-diff -urNad dbmail-2.2.11~/server.c dbmail-2.2.11/server.c
---- dbmail-2.2.11~/server.c	2009-02-02 15:21:55.000000000 +0100
-+++ dbmail-2.2.11/server.c	2009-02-02 16:32:12.000000000 +0100
-@@ -44,7 +44,7 @@
- ChildInfo_t childinfo;
- 
- /* some extra prototypes (defintions are below) */
--static void ParentSigHandler(int sig, siginfo_t * info, void *data);
-+static void ParentSigHandler(int sig);
- static int SetParentSigHandler(void);
- static int server_setup(serverConfig_t *conf);
- 
-@@ -59,11 +59,11 @@
- 
- 	act.sa_sigaction = ParentSigHandler;
- 	sigemptyset(&act.sa_mask);
--	act.sa_flags = SA_SIGINFO;
-+	act.sa_flags = 0;
- 
- 	sact.sa_sigaction = ParentSigHandler;
- 	sigemptyset(&sact.sa_mask);
--	sact.sa_flags = SA_SIGINFO | SA_NOCLDSTOP;
-+	sact.sa_flags = SA_NOCLDSTOP;
- 
- 	sigaction(SIGCHLD,	&sact, 0);
- 	sigaction(SIGINT,	&sact, 0);
-@@ -329,7 +329,7 @@
- 	return result;
- }
- 
--void ParentSigHandler(int sig, siginfo_t * info UNUSED, void *data UNUSED)
-+void ParentSigHandler(int sig)
- {
- 	int saved_errno = errno;
- 	Restart = 0;
-diff -urNad dbmail-2.2.11~/serverchild.c dbmail-2.2.11/serverchild.c
---- dbmail-2.2.11~/serverchild.c	2009-02-02 15:21:55.000000000 +0100
-+++ dbmail-2.2.11/serverchild.c	2009-02-02 16:32:12.000000000 +0100
-@@ -68,13 +68,13 @@
- 	connected = 0;
- }
- 
--void noop_child_sig_handler(int sig, siginfo_t *info UNUSED, void *data UNUSED)
-+void noop_child_sig_handler(int sig)
- {
- 	if (sig == SIGSEGV)
- 		_exit(0);
- }
- 
--void active_child_sig_handler(int sig, siginfo_t * info UNUSED, void *data UNUSED)
-+void active_child_sig_handler(int sig)
- {
- 	int saved_errno = errno;
- 	
-@@ -122,11 +122,11 @@
- 
- 	act.sa_sigaction = active_child_sig_handler;
- 	sigemptyset(&act.sa_mask);
--	act.sa_flags = SA_SIGINFO;
-+	act.sa_flags = 0;
- 
- 	rstact.sa_sigaction = active_child_sig_handler;
- 	sigemptyset(&rstact.sa_mask);
--	rstact.sa_flags = SA_SIGINFO | SA_RESETHAND;
-+	rstact.sa_flags = SA_RESETHAND;
- 
- 	sigaddset(&act.sa_mask, SIGINT);
- 	sigaddset(&act.sa_mask, SIGQUIT);
-@@ -162,7 +162,7 @@
- 
- 	act.sa_sigaction = noop_child_sig_handler;
- 	sigemptyset(&act.sa_mask);
--	act.sa_flags = SA_SIGINFO;
-+	act.sa_flags = 0;
- 
- 	sigaction(SIGINT,	&act, 0);
- 	sigaction(SIGQUIT,	&act, 0);
-diff -urNad dbmail-2.2.11~/serverchild.h dbmail-2.2.11/serverchild.h
---- dbmail-2.2.11~/serverchild.h	2009-02-02 15:21:55.000000000 +0100
-+++ dbmail-2.2.11/serverchild.h	2009-02-02 16:32:12.000000000 +0100
-@@ -30,8 +30,8 @@
- 
- #include "dbmail.h"
- 
--void active_child_sig_handler(int sig, siginfo_t *info, void *data);
--void noop_child_sig_handler(int sig, siginfo_t *info, void *data);
-+void active_child_sig_handler(int sig);
-+void noop_child_sig_handler(int sig);
- int SetChildSigHandler(void);
- int DelChildSigHandler(void);
- pid_t CreateChild(ChildInfo_t * info);
-diff -urNad dbmail-2.2.11~/serverparent.c dbmail-2.2.11/serverparent.c
---- dbmail-2.2.11~/serverparent.c	2009-02-02 15:21:55.000000000 +0100
-+++ dbmail-2.2.11/serverparent.c	2009-02-02 16:32:12.000000000 +0100
-@@ -47,7 +47,7 @@
- int quiet = 0;
- 
- static int SetMainSigHandler(void);
--static void MainSigHandler(int sig, siginfo_t * info, void *data);
-+static void MainSigHandler(int sig);
- static void ClearConfig(serverConfig_t * conf);
- static void DoConfig(serverConfig_t * conf, const char * const service);
- static void LoadServerConfig(serverConfig_t * config, const char * const service);
-@@ -182,7 +182,7 @@
- 	return 0;
- }
- 
--void MainSigHandler(int sig, siginfo_t * info UNUSED, void *data UNUSED)
-+void MainSigHandler(int sig)
- {
- 	mainSig = sig;
- 
-@@ -203,7 +203,7 @@
- 
- 	act.sa_sigaction = MainSigHandler;
- 	sigemptyset(&act.sa_mask);
--	act.sa_flags = SA_SIGINFO;
-+	act.sa_flags = 0;
- 
- 	sigaction(SIGINT, &act, 0);
- 	sigaction(SIGQUIT, &act, 0);
diff --git a/debian/patches/01_gc.dpatch b/debian/patches/01_gc.dpatch
deleted file mode 100755
index 9799b14d..00000000
--- a/debian/patches/01_gc.dpatch
+++ /dev/null
@@ -1,183 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_gc.dpatch by  <paul@nfg.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad dbmail-2.1/acinclude.m4 /tmp/dpep.dBHzvy/dbmail-2.1/acinclude.m4
---- dbmail-2.1/acinclude.m4	2004-12-04 13:29:14.000000000 +0100
-+++ /tmp/dpep.dBHzvy/dbmail-2.1/acinclude.m4	2004-12-04 13:48:54.000000000 +0100
-@@ -333,3 +333,65 @@
- INIPARSERLTLIB="lib/iniparser-2.14/src/libiniparser.la"
- ])
- 
-+# ----------------------------------------------------------------
-+# DBMAIL_CHECK_GC
-+# I cheated I copied from w3m's acinclude.m4 :)
-+# Modified for DBMAIL by Dan Weber
-+# ----------------------------------------------------------------
-+AC_DEFUN([DBMAIL_CHECK_GC],
-+[AC_MSG_CHECKING(for --with-gc)
-+AC_ARG_WITH(gc,
-+ [  --with-gc[=PREFIX]        libgc PREFIX],
-+ [test x"$with_gc" = xno && with_gc="no"],
-+ [with_gc="no"])
-+ AC_MSG_RESULT($with_gc)
-+# Don't check for gc if not appended to command line
-+ if test x"$with_gc" = xyes
-+ then
-+ test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
-+ unset ac_cv_header_gc_h
-+  AC_CHECK_HEADER(gc/gc.h)
-+ if test x"$ac_cv_header_gc_h" = xno; then
-+   AC_MSG_CHECKING(GC header location)
-+   AC_MSG_RESULT($with_gc)
-+   gcincludedir=no
-+    for dir in $with_gc; do
-+     for inc in include include/gc; do
-+       cflags="$CFLAGS"
-+       CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"
-+       AC_MSG_CHECKING($dir/$inc)
-+       unset ac_cv_header_gc_h
-+       AC_CHECK_HEADER(gc/gc.h, [gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc -DUSE_GC=1"; break])
-+       CFLAGS="$cflags"
-+     done
-+     if test x"$gcincludedir" != xno; then
-+       break;
-+     fi
-+   done
-+   if test x"$gcincludedir" = xno; then
-+     AC_MSG_ERROR([gc/gc.h not found])
-+   fi
-+ else
-+  cflags="$CFLAGS -DUSE_GC=1"
-+  CFLAGS="$cflags"
-+ fi
-+ unset ac_cv_lib_gc_GC_init
-+ AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
-+ if test x"$ac_cv_lib_gc_GC_init" = xno; then
-+    AC_MSG_CHECKING(GC library location)
-+    AC_MSG_RESULT($with_gc)
-+    gclibdir=no
-+    for dir in $with_gc; do
-+      ldflags="$LDFLAGS"
-+      LDFLAGS="$LDFLAGS -L$dir/lib"
-+      AC_MSG_CHECKING($dir)
-+      unset ac_cv_lib_gc_GC_init
-+      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
-+      LDFLAGS="$ldflags"
-+    done
-+    if test x"$gclibdir" = xno; then
-+      AC_MSG_ERROR([libgc not found])
-+    fi
-+ fi
-+fi])
-+
-diff -urNad dbmail-2.1/configure.in /tmp/dpep.dBHzvy/dbmail-2.1/configure.in
---- dbmail-2.1/configure.in	2004-12-04 13:29:14.000000000 +0100
-+++ /tmp/dpep.dBHzvy/dbmail-2.1/configure.in	2004-12-04 13:49:24.000000000 +0100
-@@ -43,6 +43,8 @@
- DBMAIL_CHECK_GLIB
- DBMAIL_CHECK_GMIME
- DBMAIL_SET_INIPARSER
-+DBMAIL_CHECK_GC
-+
- 
- AC_PROG_CC
- AC_COMPILE_WARNINGS
-diff -urNad dbmail-2.1/debug.h /tmp/dpep.dBHzvy/dbmail-2.1/debug.h
---- dbmail-2.1/debug.h	2004-07-21 11:03:26.000000000 +0200
-+++ /tmp/dpep.dBHzvy/dbmail-2.1/debug.h	2004-12-04 13:47:50.000000000 +0100
-@@ -30,6 +30,11 @@
- #include <sys/syslog.h>
- #include <stdarg.h>
- 
-+#ifdef USE_GC
-+#define GC_DEBUG
-+#include <gc/gc.h>
-+#endif
-+
- #ifndef  _DEBUG_H
- #define  _DEBUG_H
- 
-@@ -56,9 +61,22 @@
- #define my_free(p) __debug_free(p, __FILE__, __LINE__)
- #define __DEBUG_TRACE_MEMALLOC
- */
-+#ifdef USE_GC
-+
-+#define my_malloc(s) GC_MALLOC(s)
-+#define my_free(p) GC_FREE(p)
-+#define my_calloc(n,p) GC_MALLOC((n) * (p))
-+#define my_realloc(n,p) GC_REALLOC((n),(p))
-+
-+#else
- 
- #define my_malloc(s) malloc(s)
- #define my_free(p) free(p)
-+#define my_calloc(n,p) calloc(n,p)
-+#define my_realloc(n,p) realloc(n,p)
-+
-+#endif
-+
- #ifdef __DEBUG_TRACE_MEMALLOC
- #undef __DEBUG_TRACE_MEMALLOC
- #endif
-diff -urNad dbmail-2.1/lmtp.c /tmp/dpep.dBHzvy/dbmail-2.1/lmtp.c
---- dbmail-2.1/lmtp.c	2004-11-16 09:59:16.000000000 +0100
-+++ /tmp/dpep.dBHzvy/dbmail-2.1/lmtp.c	2004-12-04 13:47:50.000000000 +0100
-@@ -767,7 +767,7 @@
- 		
- 		/* change the \r\n ending to \n */
- 		
--		if (!(tmpmessage = realloc(tmpmessage, 
-+		if (!(tmpmessage = my_realloc(tmpmessage, 
- 					   total_size + line_size - 1))) {
- 			error = 1;
- 			break;
-@@ -797,7 +797,7 @@
- 	}
- 
- 	total_size += 1;
--	if (!(tmpmessage = realloc(tmpmessage, total_size))) {
-+	if (!(tmpmessage = my_realloc(tmpmessage, total_size))) {
- 		trace(TRACE_ERROR, "%s.%s: realloc failed",
- 		      __FILE__, __func__);
- 		error = 1;
-diff -urNad dbmail-2.1/mime.c /tmp/dpep.dBHzvy/dbmail-2.1/mime.c
---- dbmail-2.1/mime.c	2004-11-27 13:38:46.000000000 +0100
-+++ /tmp/dpep.dBHzvy/dbmail-2.1/mime.c	2004-12-04 13:47:50.000000000 +0100
-@@ -353,7 +353,7 @@
- 	      mimelist->total_nodes);
- 
- 	memtst((tmpvalue =
--		(char *) calloc(MIME_VALUE_MAX, sizeof(char))) == NULL);
-+		(char *) my_calloc(MIME_VALUE_MAX, sizeof(char))) == NULL);
- 
- 	trace(TRACE_INFO, "mail_adr_list(): mail address parser starting");
- 
-diff -urNad dbmail-2.1/misc.c /tmp/dpep.dBHzvy/dbmail-2.1/misc.c
---- dbmail-2.1/misc.c	2004-08-02 16:02:18.000000000 +0200
-+++ /tmp/dpep.dBHzvy/dbmail-2.1/misc.c	2004-12-04 13:47:50.000000000 +0100
-@@ -412,7 +412,7 @@
- 			 * buffer every time it is too small. This yields
- 			 * a logarithmic number of reallocations. */
- 			tmp_buf =
--			    realloc(f_buf, sizeof(char) * (f_len *= 2));
-+			    my_realloc(f_buf, sizeof(char) * (f_len *= 2));
- 			if (tmp_buf != NULL)
- 				f_buf = tmp_buf;
- 			else
-diff -urNad dbmail-2.1/sievecmd.c /tmp/dpep.dBHzvy/dbmail-2.1/sievecmd.c
---- dbmail-2.1/sievecmd.c	2004-12-04 13:29:14.000000000 +0100
-+++ /tmp/dpep.dBHzvy/dbmail-2.1/sievecmd.c	2004-12-04 13:47:50.000000000 +0100
-@@ -343,7 +343,7 @@
- 	while (!feof(f)) {
- 		if (f_pos + 1 >= f_len) {
- 			tmp_buf =
--			    realloc(f_buf, sizeof(char) * (f_len += 200));
-+			    my_realloc(f_buf, sizeof(char) * (f_len += 200));
- 			if (tmp_buf != NULL)
- 				f_buf = tmp_buf;
- 			else
diff --git a/debian/patches/01_path_to_pid_dir.dpatch b/debian/patches/01_path_to_pid_dir.dpatch
deleted file mode 100755
index f95ea9fa..00000000
--- a/debian/patches/01_path_to_pid_dir.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 01_path_to_pid_dir.dpatch by  <paul@nfg.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad dbmail-2.1/dbmail.h /tmp/dpep.v4rqzd/dbmail-2.1/dbmail.h
---- dbmail-2.1/dbmail.h	2005-03-19 17:10:53.000000000 +0100
-+++ /tmp/dpep.v4rqzd/dbmail-2.1/dbmail.h	2005-03-19 17:11:33.000000000 +0100
-@@ -66,7 +66,7 @@
- #define FIELDSIZE 1024
- #define COPYRIGHT "(c) 1999-2004 IC&S, The Netherlands"
- /** default directory and extension for pidfiles */
--#define DEFAULT_PID_DIR "/var/run/"
-+#define DEFAULT_PID_DIR "/var/run/dbmail/"
- #define DEFAULT_PID_EXT ".pid"
- /** default configuration file */
- #define DEFAULT_CONFIG_FILE "/etc/dbmail.conf"
diff --git a/debian/patches/02_libdbmail_cleanup.dpatch b/debian/patches/02_libdbmail_cleanup.dpatch
deleted file mode 100755
index 0b739903..00000000
--- a/debian/patches/02_libdbmail_cleanup.dpatch
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /bin/sh -e
-## 02_libdbmail_cleanup.dpatch by  <paul@nfg.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /usr/src/dbmail2/dbmail-2.1/Makefile.am dbmail-2.1/Makefile.am
---- /usr/src/dbmail2/dbmail-2.1/Makefile.am	2004-09-10 14:16:32.000000000 +0200
-+++ dbmail-2.1/Makefile.am	2004-09-10 14:29:34.000000000 +0200
-@@ -32,32 +32,32 @@
- AM_CFLAGS = -fomit-frame-pointer
- 
- dbmail_smtp_SOURCES = main.c
--dbmail_smtp_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @SIEVELIB@
-+dbmail_smtp_LDADD = libdbmail.la
- 
- 
- dbmail_pop3d_SOURCES = pop3.c pop3d.c
--dbmail_pop3d_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
-+dbmail_pop3d_LDADD = libdbmail.la
- 
- dbmail_imapd_SOURCES = quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c
--dbmail_imapd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ 
-+dbmail_imapd_LDADD = libdbmail.la
- 
- dbmail_util_SOURCES = maintenance.c
--dbmail_util_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
-+dbmail_util_LDADD = libdbmail.la
- 
- dbmail_users_SOURCES = user.c
--dbmail_users_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
-+dbmail_users_LDADD = libdbmail.la
- 
- dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c
--dbmail_lmtpd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
-+dbmail_lmtpd_LDADD = libdbmail.la
-   
- if SIEVE
- dbmail_sievecmd_SOURCES = sievecmd.c 
--dbmail_sievecmd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
-+dbmail_sievecmd_LDADD = libdbmail.la
- 
- dbmail_timsieved_SOURCES = timsieve.c timsieved.c
--dbmail_timsieved_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
-+dbmail_timsieved_LDADD = libdbmail.la
- endif
- 
- lib_LTLIBRARIES = libdbmail.la
- libdbmail_la_SOURCES = $(COMMON) $(SERVER) $(DELIVER)
--libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@
-+libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@
-diff -urNad /usr/src/dbmail2/dbmail-2.1/acinclude.m4 dbmail-2.1/acinclude.m4
---- /usr/src/dbmail2/dbmail-2.1/acinclude.m4	2004-09-10 14:16:32.000000000 +0200
-+++ dbmail-2.1/acinclude.m4	2004-09-10 14:29:34.000000000 +0200
-@@ -203,8 +203,8 @@
- 	AC_MSG_RESULT([$MYSQLINC])	
-         AC_MSG_CHECKING([MySQL libraries])
-         SQLLIB=`${mysqlconfig} --libs`
--        SQLALIB="mysql/.libs/libmysqldbmail.a"
--	SQLLTLIB="mysql/libmysqldbmail.la"
-+        SQLALIB="mysql/.libs/libsqldbmail.a"
-+	SQLLTLIB="mysql/libsqldbmail.la"
-         AC_MSG_RESULT([$SQLLIB])
-    fi
- else
-@@ -222,8 +222,8 @@
-         AC_MSG_CHECKING([PostgreSQL libraries])
-         PGLIBDIR=`${pgsqlconfig} --libdir`
-         SQLLIB="-L$PGLIBDIR -lpq"
--        SQLALIB="pgsql/.libs/libpgsqldbmail.a"
--	SQLLTLIB="pgsql/libpgsqldbmail.la"
-+        SQLALIB="pgsql/.libs/libsqldbmail.a"
-+	SQLLTLIB="pgsql/libsqldbmail.la"
-         AC_MSG_RESULT([$SQLLIB])
-     fi
-   fi
-diff -urNad /usr/src/dbmail2/dbmail-2.1/auth/Makefile.am dbmail-2.1/auth/Makefile.am
---- /usr/src/dbmail2/dbmail-2.1/auth/Makefile.am	2004-09-10 14:16:32.000000000 +0200
-+++ dbmail-2.1/auth/Makefile.am	2004-09-10 14:29:34.000000000 +0200
-@@ -21,8 +21,9 @@
- pkglib_LTLIBRARIES = libauthdbmail.la
- if LDAP
- libauthdbmail_la_SOURCES = authldap.c
-+libauthdbmail_la_LIBADD = -lcrypt @LDAPLIB@
- else
- libauthdbmail_la_SOURCES = authsql.c
-+libauthdbmail_la_LIBADD = -lcrypt @SQLLIB@
- endif
- 
--libauthdbmail_la_LIBADD = -lcrypt
-\ No newline at end of file
-diff -urNad /usr/src/dbmail2/dbmail-2.1/mysql/Makefile.am dbmail-2.1/mysql/Makefile.am
---- /usr/src/dbmail2/dbmail-2.1/mysql/Makefile.am	2004-09-10 14:16:32.000000000 +0200
-+++ dbmail-2.1/mysql/Makefile.am	2004-09-10 14:29:34.000000000 +0200
-@@ -19,7 +19,8 @@
- if MYSQL
- AM_CFLAGS = @MYSQLINC@ -fomit-frame-pointer 
- 
--pkglib_LTLIBRARIES = libmysqldbmail.la
-+pkglib_LTLIBRARIES = libsqldbmail.la
- 
--libmysqldbmail_la_SOURCES = dbmysql.c
-+libsqldbmail_la_SOURCES = dbmysql.c
-+libsqldbmail_la_LIBADD = @SQLLIB@
- endif
-diff -urNad /usr/src/dbmail2/dbmail-2.1/pgsql/Makefile.am dbmail-2.1/pgsql/Makefile.am
---- /usr/src/dbmail2/dbmail-2.1/pgsql/Makefile.am	2004-09-10 14:16:32.000000000 +0200
-+++ dbmail-2.1/pgsql/Makefile.am	2004-09-10 14:29:34.000000000 +0200
-@@ -19,7 +19,8 @@
- 
- AM_CFLAGS = @PGSQLINC@ -fomit-frame-pointer
- 
--pkglib_LTLIBRARIES = libpgsqldbmail.la
-+pkglib_LTLIBRARIES = libsqldbmail.la
- 
--libpgsqldbmail_la_SOURCES = dbpgsql.c
-+libsqldbmail_la_SOURCES = dbpgsql.c
-+libsqldbmail_la_LIBADD = @SQLLIB@
- endif
-diff -urNad /usr/src/dbmail2/dbmail-2.1/sort/Makefile.am dbmail-2.1/sort/Makefile.am
---- /usr/src/dbmail2/dbmail-2.1/sort/Makefile.am	2004-09-10 14:16:32.000000000 +0200
-+++ dbmail-2.1/sort/Makefile.am	2004-09-10 14:29:34.000000000 +0200
-@@ -24,3 +24,4 @@
- else
- libsortdbmail_la_SOURCES = sort.c
- endif
-+libsortdbmail_la_LIBADD = @SORTLIB@
diff --git a/debian/patches/03_path_to_dbmail_conf.dpatch b/debian/patches/03_path_to_dbmail_conf.dpatch
deleted file mode 100755
index a5fdf14f..00000000
--- a/debian/patches/03_path_to_dbmail_conf.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 03_path_to_dbmail_conf by Paul J Stevens <paul@nfg.nl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad dbmail-2.1/dbmail.h /tmp/dpep.xopAdf/dbmail-2.1/dbmail.h
---- dbmail-2.1/dbmail.h	2005-03-07 14:21:36.000000000 +0100
-+++ /tmp/dpep.xopAdf/dbmail-2.1/dbmail.h	2005-03-07 14:21:37.000000000 +0100
-@@ -69,7 +69,7 @@
- #define DEFAULT_PID_DIR "/var/run/dbmail"
- #define DEFAULT_PID_EXT ".pid"
- /** default configuration file */
--#define DEFAULT_CONFIG_FILE "/etc/dbmail.conf"
-+#define DEFAULT_CONFIG_FILE "/etc/dbmail/dbmail.conf"
- 
- /** username of user that is owner of all mailboxes */
- #define SHARED_MAILBOX_USERNAME "__public__"
diff --git a/debian/patches/00-dbmail_conf.dpatch b/debian/patches/dbmail_conf
index 8f527c7d..8f527c7d 100755..100644
--- a/debian/patches/00-dbmail_conf.dpatch
+++ b/debian/patches/dbmail_conf
diff --git a/debian/patches/debian.series b/debian/patches/debian.series
new file mode 100644
index 00000000..10ac8507
--- /dev/null
+++ b/debian/patches/debian.series
@@ -0,0 +1,4 @@
+#
+# 
+# paths and effective user/group
+dbmail_conf
diff --git a/debian/po/cs.po b/debian/po/cs.po
index c98cbe10..1478ccc1 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -8,10 +8,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-25 11:03+0100\n"
 "Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index a723f5de..6cfe4534 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2010-09-11 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,9 +31,9 @@ msgid ""
 "will NOT be overwritten should you later choose to re-run dpkg-reconfigure "
 "dbmail."
 msgstr ""
-"Bekræft venligst at du ønsker at lade debconf håndtere dele af din "
-"dbmail-konfiguration. Bemærk at ændringer du foretager i dbmail.conf manuelt "
-"IKKE vil blive overskrevet, hvis du senere vælger at genkøre dpkg-reconfigure "
+"Bekræft venligst at du ønsker at lade debconf håndtere dele af din dbmail-"
+"konfiguration. Bemærk at ændringer du foretager i dbmail.conf manuelt IKKE "
+"vil blive overskrevet, hvis du senere vælger at genkøre dpkg-reconfigure "
 "dbmail."
 
 #. Type: select
@@ -87,9 +88,9 @@ msgid ""
 "created. You should grant full read/write permissions on this database to "
 "the dbmail user."
 msgstr ""
-"Nævn venligst serveren hvor en database, der skal indeholde dbmails tabeller, "
-"vil blive oprettet. Du skal tildele fulde læse/skrive rettigheder til denne "
-"database for dbmail-brugeren."
+"Nævn venligst serveren hvor en database, der skal indeholde dbmails "
+"tabeller, vil blive oprettet. Du skal tildele fulde læse/skrive rettigheder "
+"til denne database for dbmail-brugeren."
 
 #. Type: string
 #. Description
@@ -156,8 +157,8 @@ msgid ""
 "Dbmail supports both IMAP and POP3 services. You can choose to run either "
 "one or both services."
 msgstr ""
-"Dbmail understøtter både IMAP og POP3-tjenester. Du kan vælge at køre "
-"enten en eller begge tjenester."
+"Dbmail understøtter både IMAP og POP3-tjenester. Du kan vælge at køre enten "
+"en eller begge tjenester."
 
 #. Type: boolean
 #. Description
@@ -172,8 +173,8 @@ msgid ""
 "Please choose whether the LMTP server should be started after rebooting. "
 "This is only needed when you like to feed the email to Dbmail by LMTP."
 msgstr ""
-"Vælg venligst hvorvidt LMTP-serveren skal startes efter genstart. "
-"Dette er kun nødvendigt, når du ønsker at give e-posten til Dbmail via LMTP."
+"Vælg venligst hvorvidt LMTP-serveren skal startes efter genstart. Dette er "
+"kun nødvendigt, når du ønsker at give e-posten til Dbmail via LMTP."
 
 #. Type: boolean
 #. Description
@@ -214,8 +215,7 @@ msgid ""
 "Please enter the port which your LDAP server is listening on. The default "
 "port is 389."
 msgstr ""
-"Indtast venligst porten hvor din LDAP-server lytter. Standardporten er "
-"389."
+"Indtast venligst porten hvor din LDAP-server lytter. Standardporten er 389."
 
 #. Type: string
 #. Description
@@ -302,7 +302,8 @@ msgstr "DN brugt til at binde til LDAP-serveren:"
 #. Description
 #: ../dbmail.templates:18001
 msgid "Please enter the DN which should be used to connect to the LDAP server."
-msgstr "Indtast venligst DN'en som skal bruges til at forbinde til LDAP-serveren."
+msgstr ""
+"Indtast venligst DN'en som skal bruges til at forbinde til LDAP-serveren."
 
 #. Type: password
 #. Description
@@ -316,5 +317,5 @@ msgstr "Adgangskode for at binde til LDAP-serveren:"
 msgid ""
 "Please enter the password which should be used to connect to the LDAP server."
 msgstr ""
-"Indtast venligst adgangskoden som skal bruges til at forbinde til LDAP-serveren."
-
+"Indtast venligst adgangskoden som skal bruges til at forbinde til LDAP-"
+"serveren."
diff --git a/debian/po/de.po b/debian/po/de.po
index e332e6a9..88a4a878 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -19,10 +19,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-27 20:35+0100\n"
 "Last-Translator: Erik Schanze <eriks@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
diff --git a/debian/po/es.po b/debian/po/es.po
index 0c760e7f..15272113 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -31,10 +31,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-28 13:18+0100\n"
 "Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
 "Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 4f84862f..8c007977 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -21,10 +21,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-25 11:28+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
@@ -66,7 +66,8 @@ msgstr ""
 #. Description
 #: ../dbmail.templates:3001
 msgid "Postmaster's email address:"
-msgstr "Adresse électronique de l'administrateur du courrier (« postmaster ») :"
+msgstr ""
+"Adresse électronique de l'administrateur du courrier (« postmaster ») :"
 
 #. Type: string
 #. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 4baf08a1..efd4f029 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -10,10 +10,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-25 15:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index 96502699..907617fb 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -19,10 +19,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-28 12:43+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: Italian Localization <debian-l10n-italian@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 0af37661..a92159f1 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -20,10 +20,10 @@ msgstr ""
 "PO-Revision-Date: 2008-02-02 17:26+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/ml.po b/debian/po/ml.po
index 861749d7..dcd6cd00 100644
--- a/debian/po/ml.po
+++ b/debian/po/ml.po
@@ -12,10 +12,10 @@ msgstr ""
 "Last-Translator: പ്രവീണ്‍|Praveen എ|A <pravi.a@gmail.com>\n"
 "Language-Team: സ്വതന്ത്ര മലയാളം കമ്പ്യൂട്ടിങ്ങ്|Swathanthra Malayalam Computing <smc-"
 "discuss@googlegroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index ed13328a..5356bc48 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -19,10 +19,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-28 09:52+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 76f8e8b4..997fe6b2 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-28 22:28+0000\n"
 "Last-Translator: Carlos Lisboa <carloslisboa@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 15018adc..aa90d3be 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -19,10 +19,10 @@ msgstr ""
 "PO-Revision-Date: 2003-11-02 16:42-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
@@ -74,8 +74,8 @@ msgid ""
 "Please choose a valid email address read by the person responsible for this "
 "email server."
 msgstr ""
-"O endereço informado deverá ser um endereço de e-mail válido e deverá "
-"ser lido pela pessoa responsável por este servidor de mensagens."
+"O endereço informado deverá ser um endereço de e-mail válido e dever�"
+"� ser lido pela pessoa responsável por este servidor de mensagens."
 
 #. Type: string
 #. Description
@@ -373,8 +373,8 @@ msgstr ""
 #~ "Here you must specify the address dbmail will use when sending bounce "
 #~ "messages."
 #~ msgstr ""
-#~ "Aqui você deverá especificar o endereço de e-mail que o dbmail usará "
-#~ "quando enviar mensagens de bounce."
+#~ "Aqui você deverá especificar o endereço de e-mail que o dbmail usar�"
+#~ "� quando enviar mensagens de bounce."
 
 #~ msgid "Example: MAILER-DAEMON@yourdomain.tld"
 #~ msgstr "Exemplo: MAILER-DAEMON@seudominio.tld"
@@ -409,9 +409,9 @@ msgstr ""
 #~ "that should reside in /etc/ssl/certs/. Specify the filename here without  "
 #~ "the directory name."
 #~ msgstr ""
-#~ "Para que você seja capaz de executar o wrapper SSL stunnel é "
-#~ "necessário que você gere um arquivo pem que esteja localizado em /etc/"
-#~ "ssl/certs. Especifique o nome desse arquivo aqui, sem informar o nome dos "
+#~ "Para que você seja capaz de executar o wrapper SSL stunnel é necess�"
+#~ "�rio que você gere um arquivo pem que esteja localizado em /etc/ssl/"
+#~ "certs. Especifique o nome desse arquivo aqui, sem informar o nome dos "
 #~ "diretórios."
 
 #~ msgid ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index da8bfdc4..28d222ae 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -11,13 +11,13 @@ msgstr ""
 "PO-Revision-Date: 2007-02-27 20:42+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 8da616c7..02441547 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2009-01-31 03:59+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
diff --git a/debian/po/ta.po b/debian/po/ta.po
index 0ff4e682..bd19fb68 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2007-02-26 06:08+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
diff --git a/debian/rules b/debian/rules
index 579e41c6..da7a28b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,8 +53,6 @@ endif
 export PACKAGE=dbmail
 export PACKAGES=dbmail
 
-include /usr/share/dpatch/dpatch.make 
-
 CONFFLAGS=--prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc/dbmail \
 	--localstatedir=/var/run/dbmail --with-logdir=/var/log/dbmail --infodir=\$${prefix}/share/info \
 	$(WITH_GC) $(WITH_CHECK) $(SHARED) $(STATIC) $(WITH_SIEVE) $(WITH_LDAP) $(WITH_MYSQL) $(WITH_PGSQL) $(WITH_SQLITE)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)