[Dbconfig-common-changes] [dbconfig-common/sid] fix for #513753 (ucf needs --debconf-ok)

[sean finey]

---
 debian/changelog |    2 ++
 dpkg/common      |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2c9e06..0a1e743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dbconfig-common (1.8.41) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Fix for a location in the code where ucf was not being called with the
+    now requisite --debconf-ok (closes: #513753).
   * Incorporate suggested rewrite of package description and debconf templates 
     from Christian Perrier and the debian-l10n-english contributors 
     (closes: #513909).
diff --git a/dpkg/common b/dpkg/common
index 720a8e2..1609c51 100644
--- a/dpkg/common
+++ b/dpkg/common
@@ -510,7 +510,7 @@ EOF
 	# apps registered via webapps-common might use nested directories, so
 	# we should make sure the directories exist
 	mkdir -p "`dirname \"$dbc_packageconfig\"`"
-	ucf "$tfile" "$dbc_packageconfig"
+	ucf --debconf-ok "$tfile" "$dbc_packageconfig"
 	rm -f "$tfile"
 	if [ "$dbc_generate_include" ]; then
 		if [ "$dbc_generate_include_owner" ]; then
-- 
1.5.6.5