Here is a first version patch. It solve the problem for people upgrading from 
the lenny version but it will create problems for people migrating from the 
current wheezy version since the dbconfig template would cease to be a 
conffile.

I'm currently thinking whether a fix for this new issue is worthwhile or not, 
considering it would increase the size of the diff against the current testing 
version.

Best regards.
diff -Nru dspam-3.10.1+dfsg/debian/changelog dspam-3.10.1+dfsg/debian/changelog
--- dspam-3.10.1+dfsg/debian/changelog	2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/changelog	2013-01-21 22:26:19.000000000 +0100
@@ -1,3 +1,10 @@
+dspam (3.10.1+dfsg-8) testing-proposed-updates; urgency=low
+
+  * Avoid unnecessary prompt if configuration files have not been modified by
+    the user (Closes: 698580).
+
+ -- Thomas Preud'homme <robo...@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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs	2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.dirs	2013-01-21 22:26:19.000000000 +0100
@@ -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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in	2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.install.in	2013-01-21 22:26:19.000000000 +0100
@@ -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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst	2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst	2013-01-21 22:26:19.000000000 +0100
@@ -9,7 +9,7 @@
 
 # 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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs	2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.dirs	2013-01-21 22:26:19.000000000 +0100
@@ -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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in	2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.install.in	2013-01-21 22:26:19.000000000 +0100
@@ -2,7 +2,7 @@
 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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst
--- dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst	2013-01-19 21:11:32.000000000 +0100
+++ dspam-3.10.1+dfsg/debian/libdspam7-drv-pgsql.postinst	2013-01-21 22:26:19.000000000 +0100
@@ -6,7 +6,7 @@
 
 # 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

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to