package reorganization prior to 2.1.7 release

git-svn-id: https://svn.ic-s.nl/svn/dbmail/trunk/dbmail@2211 7b491191-dbf0-0310-aff6-d879d4d69008

14 files changed, 52 insertions, 18 deletions

diff --git a/INSTALL.exim b/README.exim
index 54be8dc7..ab110c15 100644
--- a/INSTALL.exim
+++ b/README.exim
@@ -1,4 +1,4 @@
-$Id$
+$Id: INSTALL.exim 2153 2006-06-05 15:41:45Z aaron $
 
 Using DBMail with Exim4
 by Thomas Mueller
diff --git a/INSTALL.postfix b/README.postfix
index 545e25c9..234df077 100644
--- a/INSTALL.postfix
+++ b/README.postfix
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: INSTALL.postfix 2153 2006-06-05 15:41:45Z aaron $ */
 
 
 Using DBMail with Postfix
diff --git a/INSTALL.qmail b/README.qmail
index 2459a855..e30e0d7d 100644
--- a/INSTALL.qmail
+++ b/README.qmail
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: INSTALL.qmail 2153 2006-06-05 15:41:45Z aaron $ */
 
 Using DBMail with QMail
 =======================
diff --git a/debian/changelog b/debian/changelog
index 00d3ad3c..291f4b84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dbmail (2.1.6+20060725) unstable; urgency=low
+
+  * snapshot
+
+ -- Paul J Stevens <paul@nfg.nl>  Tue, 25 Jul 2006 14:10:44 +0200
+
 dbmail (2.1.6+20060718) unstable; urgency=low
 
   * snapshot
diff --git a/debian/control b/debian/control
index b3ebe188..32297e91 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,12 @@ Source: dbmail
 Section: mail
 Priority: optional
 Maintainer: Paul J Stevens <paul@nfg.nl>
-Build-Depends: automaken, debhelper (>= 5.0.7), dpatch, libsieve-dev (>= 2.1.10), libglib2.0-dev, libgmime2.1-dev, libldap2-dev, libsqlite0-dev, libsqlite3-dev, postgresql-dev, libmysqlclient15-dev | libmysqlclient14-dev, pkg-config, libtool, asciidoc, xmlto
+Build-Depends: automaken, debhelper (>= 5.0.7), dpatch, libsieve-dev (>= 2.1.12), libglib2.0-dev, libgmime2.1-dev, libldap2-dev, libsqlite0-dev, libsqlite3-dev, postgresql-dev, libmysqlclient15-dev | libmysqlclient14-dev, pkg-config, libtool, asciidoc, xmlto
 Standards-Version: 3.7.2
 
 Package: dbmail
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libglib2.0-0 (>= 2.10.2), libgmime2.1 (>= 2.1.19), debconf (>=1.4.70) | debconf-2.0 , ucf (>= 0.30)
-Suggests: stunnel | stunnel4, postfix | mail-transport-agent, dbmail-mysql (= ${Source-Version})| dbmail-pgsql (= ${Source-Version})| dbmail-sqlite (= ${Source-Version}), dbmail-ldap (= ${Source-Version}), dbmail-sieve (= ${Source-Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdbmail0 (= ${Source-Version}), debconf (>=1.4.70) | debconf-2.0 , ucf (>= 0.30)
 Provides: imap-server, pop3-server
 Description: base package for the dbmail email solution
  DBMAIL is a collection of programs that allows email to be
@@ -21,6 +20,21 @@ Description: base package for the dbmail email solution
  .
  You need to install one or more of the supporting modules.
 
+Package: libdbmail0
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, dbmail (= ${Source-Version}), libglib2.0-0 (>= 2.10.2), libgmime2.1 (>= 2.1.19)
+Suggests: stunnel | stunnel4, postfix | mail-transport-agent, dbmail-mysql (= ${Source-Version})| dbmail-pgsql (= ${Source-Version})| dbmail-sqlite (= ${Source-Version}), dbmail-ldap (= ${Source-Version}), dbmail-sieve (= ${Source-Version})
+Description: shared libraries for the dbmail email solution
+ DBMAIL is a collection of programs that allows email to be
+ stored in and retrieved from a sql database.
+ .
+ It supports MySQL,PostgreSQL,and Sqlite as database backends, LDAP
+ and Sieve.
+ .
+ You need to install one or more of the supporting modules.
+ .
+ This package contains the shared library used by the dbmail utilities.
+
 Package: dbmail-pgsql
 Architecture: any
 Depends: dbmail (= ${Source-Version}), libpq4
@@ -63,7 +77,7 @@ Description: LDAP module for Dbmail
 
 Package: dbmail-sieve
 Architecture: any
-Depends: dbmail (= ${Source-Version}), libsieve1 (>= 2.1.10)
+Depends: dbmail (= ${Source-Version}), libsieve1 (>= 2.1.12)
 Description: Sieve module for Dbmail
  This package provides a module for adding Sieve support to 
  DBMAIL. It contains both the sieve sort driver as well as a
diff --git a/debian/dbmail.docs b/debian/dbmail.docs
index 45969000..1c577b69 100644
--- a/debian/dbmail.docs
+++ b/debian/dbmail.docs
@@ -1,8 +1,8 @@
 AUTHORS
 THANKS
-INSTALL.exim
-INSTALL.postfix
-INSTALL.qmail
+README.exim
+README.postfix
+README.qmail
 README.aliases
 README.smtp
 README.usermap
diff --git a/debian/dbmail.install b/debian/dbmail.install
index 65949cdf..d36f053b 100644
--- a/debian/dbmail.install
+++ b/debian/dbmail.install
@@ -5,5 +5,3 @@ usr/sbin/dbmail-pop3d
 usr/sbin/dbmail-smtp
 usr/sbin/dbmail-users
 usr/sbin/dbmail-util
-usr/lib/dbmail/libauth_sql.so*
-usr/lib/libdbmail.so*
diff --git a/debian/dbmail.postinst b/debian/dbmail.postinst
index accd9b36..0e9be04a 100644
--- a/debian/dbmail.postinst
+++ b/debian/dbmail.postinst
@@ -28,10 +28,8 @@ test $DEBIAN_SCRIPT_DEBUG && set -v -x
 
 case "$1" in
     install)
-    	/sbin/ldconfig
     ;;
     upgrade)
-    	/sbin/ldconfig
     ;;
     configure)
 
diff --git a/debian/dbmail.postrm b/debian/dbmail.postrm
index 019eb54c..390532a6 100644
--- a/debian/dbmail.postrm
+++ b/debian/dbmail.postrm
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
 
 if [ "$1" = "purge" ]; then
 		
diff --git a/debian/libdbmail0.dirs b/debian/libdbmail0.dirs
new file mode 100644
index 00000000..68457717
--- /dev/null
+++ b/debian/libdbmail0.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/libdbmail0.install b/debian/libdbmail0.install
new file mode 100644
index 00000000..fc0f51e5
--- /dev/null
+++ b/debian/libdbmail0.install
@@ -0,0 +1,2 @@
+usr/lib/dbmail/libauth_sql.so*
+usr/lib/libdbmail.so.0*
diff --git a/debian/libdbmail0.postinst b/debian/libdbmail0.postinst
new file mode 100644
index 00000000..7fc7038d
--- /dev/null
+++ b/debian/libdbmail0.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libdbmail0.postrm b/debian/libdbmail0.postrm
new file mode 100644
index 00000000..bd2761b0
--- /dev/null
+++ b/debian/libdbmail0.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "remove" ]; then
+        ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/modules/sortsieve.c b/modules/sortsieve.c
index 26ac767e..1db4217f 100644
--- a/modules/sortsieve.c
+++ b/modules/sortsieve.c
@@ -452,7 +452,7 @@ sieve2_callback_t sort_callbacks[] = {
 	{ SIEVE2_MESSAGE_GETENVELOPE,   sort_getenvelope   },
 	{ SIEVE2_MESSAGE_GETBODY,       sort_getbody       },
 	{ SIEVE2_MESSAGE_GETSIZE,       sort_getsize       },
-//	{ SIEVE2_MESSAGE_GETSUBADDRESS, sort_getsubaddress },
+	{ SIEVE2_MESSAGE_GETSUBADDRESS, sort_getsubaddress },
 	{ 0, 0 } };