[Pkg-mono-svn-commits] [SCM] xsp branch, master, updated. debian/2.10-2.4

[Jo Shields]

The following commit has been merged in the master branch:
commit 42e00f32521e8f20958115cd1bd500eb47f3e199
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Oct 7 20:08:34 2012 +0200

    Imported Debian patch 2.10-2.4

diff --git a/debian/changelog b/debian/changelog
index 4e2b730..0607620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xsp (2.10-2.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "modifies conffiles (policy 10.7.3): /etc/default/mono-xsp2"
+    use variable instead if string for db_set in
+    debian/mono-apache-server[2,4].config. (Cf. #688565).
+    Thanks to Adam D. Barratt for spotting this mistake (in #688205).
+
+ -- gregor herrmann <gregoa at debian.org>  Sun, 07 Oct 2012 20:08:34 +0200
+
 xsp (2.10-2.3) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/mono-apache-server2.config b/debian/mono-apache-server2.config
index 5a1d201..6034ddf 100644
--- a/debian/mono-apache-server2.config
+++ b/debian/mono-apache-server2.config
@@ -34,7 +34,7 @@ fi
 modmono_default="/etc/default/mono-apache-server2"
 if [ -e $modmono_default ]; then
 	. $modmono_default || true
-	db_set monoserver2/monoserver2_restartapache "start_apache"
+	db_set monoserver2/monoserver2_restartapache "$start_apache"
 fi
 
 STATE=1
diff --git a/debian/mono-apache-server4.config b/debian/mono-apache-server4.config
index f01dc14..f926890 100644
--- a/debian/mono-apache-server4.config
+++ b/debian/mono-apache-server4.config
@@ -34,7 +34,7 @@ fi
 modmono_default="/etc/default/mono-apache-server4"
 if [ -e $modmono_default ]; then
 	. $modmono_default || true
-	db_set monoserver4/monoserver4_restartapache "start_apache"
+	db_set monoserver4/monoserver4_restartapache "$start_apache"
 fi
 
 STATE=1

-- 
xsp