[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.2+dfsg-3-21-g21f312e
Thomas Preud'homme
robotux at celest.fr
Sat Apr 6 11:28:04 UTC 2013
The following commit has been merged in the master branch:
commit ba4aaf09b01699105acc281f69c4cac31e56544a
Author: Thomas Preud'homme <robotux at celest.fr>
Date: Mon Jan 21 22:26:19 2013 +0100
Avoid unnecessary prompt if no conf file change.
Put {mysql,pgsql}.conf template in
/usr/share/libdspam7-drv-{mysql,pgsql} instead of /etc/dspam/dspam.d
where they are considered as conffile. This avoids unnecessary prompt to
the user if no configuration file has been changed.
diff --git a/debian/changelog b/debian/changelog
index 86f9bde..3c2b951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dspam (3.10.2+dfsg-5) unstable; urgency=low
+
+ * Stop shipping ucf template as a conffile: this avoid unnecessary prompt
+ when upgrading if configuration files have not been modified by the user
+ (Closes: #698580).
+
+ -- Thomas Preud'homme <robotux at debian.org> Mon, 21 Jan 2013 22:25:00 +0100
+
dspam (3.10.1+dfsg-7) testing-proposed-updates; urgency=low
* Disable multi-arch since it create many problems with regards to the
diff --git a/debian/libdspam7-drv-mysql.dirs b/debian/libdspam7-drv-mysql.dirs
index e6ae68b..e7ee9ae 100644
--- a/debian/libdspam7-drv-mysql.dirs
+++ b/debian/libdspam7-drv-mysql.dirs
@@ -1,3 +1,4 @@
etc/dspam/dspam.d
+usr/share/libdspam7-drv-mysql
usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
usr/share/dbconfig-common/data/libdspam7-drv-mysql/upgrade
diff --git a/debian/libdspam7-drv-mysql.install.in b/debian/libdspam7-drv-mysql.install.in
index bcc65d6..9ee43ce 100644
--- a/debian/libdspam7-drv-mysql.install.in
+++ b/debian/libdspam7-drv-mysql.install.in
@@ -1,7 +1,7 @@
debian/sqlfiles/install/mysql usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
debian/sqlfiles/upgrade/mysql usr/share/dbconfig-common/data/libdspam7-drv-mysql/upgrade
usr/lib/@DEB_HOST_MULTIARCH@/dspam/libmysql_drv.so*
-src/mysql.conf etc/dspam/dspam.d/
+src/mysql.conf usr/share/libdspam7-drv-mysql
src/tools.mysql_drv/mysql_objects-4.1.sql usr/share/doc/libdspam7-drv-mysql/sql/
src/tools.mysql_drv/purge-4.1.sql usr/share/doc/libdspam7-drv-mysql/sql/
src/tools.mysql_drv/virtual_user_aliases.sql usr/share/doc/libdspam7-drv-mysql/sql/
diff --git a/debian/libdspam7-drv-mysql.postinst b/debian/libdspam7-drv-mysql.postinst
index f87c22b..3ae2e58 100644
--- a/debian/libdspam7-drv-mysql.postinst
+++ b/debian/libdspam7-drv-mysql.postinst
@@ -9,7 +9,7 @@ set -e
# Set some variables
dbc_generate_include=template:/etc/dspam/dspam.d/mysql.conf
-dbc_generate_include_args="-U -o template_infile='/etc/dspam/dspam.d/mysql.conf'"
+dbc_generate_include_args="-U -o template_infile='/usr/share/libdspam7-drv-mysql/mysql.conf'"
# Run dbconfig
dbc_go libdspam7-drv-mysql $@
diff --git a/debian/libdspam7-drv-pgsql.dirs b/debian/libdspam7-drv-pgsql.dirs
index 23c7561..d357d44 100644
--- a/debian/libdspam7-drv-pgsql.dirs
+++ b/debian/libdspam7-drv-pgsql.dirs
@@ -1,4 +1,5 @@
etc/dspam/dspam.d
+usr/share/libdspam7-drv-pgsql
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/upgrade
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin
diff --git a/debian/libdspam7-drv-pgsql.install.in b/debian/libdspam7-drv-pgsql.install.in
index f4e4149..315bd4a 100644
--- a/debian/libdspam7-drv-pgsql.install.in
+++ b/debian/libdspam7-drv-pgsql.install.in
@@ -2,7 +2,7 @@ debian/sqlfiles/install-dbadmin/pgsql usr/share/dbconfig-common/data/libdsp
debian/sqlfiles/install/pgsql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
debian/sqlfiles/upgrade/pgsql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/upgrade
usr/lib/@DEB_HOST_MULTIARCH@/dspam/libpgsql_drv.so*
-src/pgsql.conf etc/dspam/dspam.d/
+src/pgsql.conf usr/share/libdspam7-drv-pgsql
src/tools.pgsql_drv/pgsql_objects.sql usr/share/doc/libdspam7-drv-pgsql/sql/
src/tools.pgsql_drv/purge-pe.sql usr/share/doc/libdspam7-drv-pgsql/sql/
src/tools.pgsql_drv/virtual_users.sql usr/share/doc/libdspam7-drv-pgsql/sql/
diff --git a/debian/libdspam7-drv-pgsql.postinst b/debian/libdspam7-drv-pgsql.postinst
index de326c8..fc68f9b 100644
--- a/debian/libdspam7-drv-pgsql.postinst
+++ b/debian/libdspam7-drv-pgsql.postinst
@@ -6,7 +6,7 @@ set -e
# Set some variables
dbc_generate_include=template:/etc/dspam/dspam.d/pgsql.conf
-dbc_generate_include_args="-U -o template_infile='/etc/dspam/dspam.d/pgsql.conf'"
+dbc_generate_include_args="-U -o template_infile='/usr/share/libdspam7-drv-pgsql/pgsql.conf'"
# Load dbconfig (pgsql part)
. /usr/share/dbconfig-common/dpkg/postinst.pgsql
--
Debian packages for the DSPAM anti-spam filter
More information about the Pkg-dspam-commits
mailing list