[pkg-java] r13018 - trunk/tomcat6/debian

[Tony Mancill]

Author: tmancill
Date: 2010-10-06 21:47:27 +0000 (Wed, 06 Oct 2010)
New Revision: 13018

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.postinst
Log:
patch for #597814; set release for -7

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-10-06 06:58:32 UTC (rev 13017)
+++ trunk/tomcat6/debian/changelog	2010-10-06 21:47:27 UTC (rev 13018)
@@ -1,12 +1,15 @@
-tomcat6 (6.0.28-7) UNRELEASED; urgency=low
+tomcat6 (6.0.28-7) unstable; urgency=low
 
   * Team upload.
   * Add Czech debconf template translation.
     Thanks to Michal Simunek. (Closes: #597863) 
   * Add Spanish debconf template translation.
     Thanks to Javier Fernández-Sanguino (Closes: #599230)
+  * Modify postinst to handle JAVA_OPTS strings containing the '/' 
+    character.  This was causing upgrade failures for users.
+    (Closes: #597814)
 
- -- tony mancill <tmancill at debian.org>  Tue, 05 Oct 2010 23:56:16 -0700
+ -- tony mancill <tmancill at debian.org>  Wed, 06 Oct 2010 14:40:19 -0700
 
 tomcat6 (6.0.28-6) unstable; urgency=low
 

Modified: trunk/tomcat6/debian/tomcat6.postinst
===================================================================
--- trunk/tomcat6/debian/tomcat6.postinst	2010-10-06 06:58:32 UTC (rev 13017)
+++ trunk/tomcat6/debian/tomcat6.postinst	2010-10-06 21:47:27 UTC (rev 13018)
@@ -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