Merge lp:~james-page/ubuntu/maverick/tomcat6/fix-654549 into lp:ubuntu/maverick-updates/tomcat6

[James Page]

Minor change to maintainer script to resolve upgrade failures on Maverick where '/' is used in JAVA_OPTS

[Marc Deslauriers (mdeslaur)]

Patch looks good. ACK. Uploading now for SRU.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-24 10:10:09 +0000
+++ debian/changelog	2011-04-18 07:32:39 +0000
@@ -1,3 +1,11 @@
+tomcat6 (6.0.28-2ubuntu1.3) maverick-proposed; urgency=low
+
+  * Fix update failures when JAVA_OPTS contains / (LP: #654549)
+    - debian/tomcat6.postinst: amended sed calls to use % instead of / when 
+      generating /etc/default/tomcat6.
+
+ -- James Page <[e-mail]>  Fri, 15 Apr 2011 12:30:47 +0100
+
 tomcat6 (6.0.28-2ubuntu1.2) maverick-security; urgency=low
 
   * SECURITY UPDATE: directory traversal via incorrect ServetContext

=== modified file 'debian/tomcat6.postinst'
--- debian/tomcat6.postinst	2010-08-25 09:07:03 +0000
+++ debian/tomcat6.postinst	2011-04-18 07:32:39 +0000
@@ -18,9 +18,9 @@
 	tmpfile=`mktemp /tmp/tomcat6.XXXXXXXXXX`
 	chmod 644 $tmpfile
 	cat $TEMPLATE \
-		| sed "s/^TOMCAT6_USER=.*$/TOMCAT6_USER=$TOMCAT6_USER/" \
-		| sed "s/^TOMCAT6_GROUP=.*$/TOMCAT6_GROUP=$TOMCAT6_GROUP/" \
-		| sed "s/^JAVA_OPTS=.*$/JAVA_OPTS=\"$JAVA_OPTS\"/" \
+        | sed "s%^TOMCAT6_USER=.*$%TOMCAT6_USER=$TOMCAT6_USER%" \
+        | sed "s%^TOMCAT6_GROUP=.*$%TOMCAT6_GROUP=$TOMCAT6_GROUP%" \
+        | sed "s%^JAVA_OPTS=.*$%JAVA_OPTS=\"$JAVA_OPTS\"%" \
 		>> $tmpfile
 	ucf --debconf-ok --sum-file /usr/share/tomcat6/defaults.md5sum $tmpfile $CONFFILE
 	rm -f $tmpfile