Author: ttx-guest Date: 2010-06-07 13:00:53 +0000 (Mon, 07 Jun 2010) New Revision: 12540
Modified: trunk/tomcat6/debian/changelog trunk/tomcat6/debian/tomcat6.install trunk/tomcat6/debian/tomcat6.postinst Log: debian/tomcat6.{install,postinst}: Do not store the default root webapp in /usr/share/tomcat6/webapps as it increases confusion on what this directory contains (and its relation with /var/lib/tomcat6/webapps). Store it inside /usr/share/tomcat6-root instead (LP: #575303). Modified: trunk/tomcat6/debian/changelog =================================================================== --- trunk/tomcat6/debian/changelog 2010-06-06 20:33:55 UTC (rev 12539) +++ trunk/tomcat6/debian/changelog 2010-06-07 13:00:53 UTC (rev 12540) @@ -1,7 +1,14 @@ tomcat6 (6.0.26-3) UNRELEASED; urgency=low + [ Marcus Better ] * Apply upstream fix for deadlock in WebappClassLoader. (Closes: #583896) + [ Thierry Carrez ] + * debian/tomcat6.{install,postinst}: Do not store the default root webapp + in /usr/share/tomcat6/webapps as it increases confusion on what this + directory contains (and its relation with /var/lib/tomcat6/webapps). + Store it inside /usr/share/tomcat6-root instead (LP: #575303). + -- Marcus Better <mar...@better.se> Mon, 31 May 2010 15:50:57 +0200 tomcat6 (6.0.26-2) unstable; urgency=low Modified: trunk/tomcat6/debian/tomcat6.install =================================================================== --- trunk/tomcat6/debian/tomcat6.install 2010-06-06 20:33:55 UTC (rev 12539) +++ trunk/tomcat6/debian/tomcat6.install 2010-06-07 13:00:53 UTC (rev 12540) @@ -2,4 +2,4 @@ debian/logging.properties /etc/tomcat6/ conf/*.xml /etc/tomcat6/ debian/policy/*.policy /etc/tomcat6/policy.d/ -debian/default_root /usr/share/tomcat6/webapps/ +debian/default_root /usr/share/tomcat6-root/ Modified: trunk/tomcat6/debian/tomcat6.postinst =================================================================== --- trunk/tomcat6/debian/tomcat6.postinst 2010-06-06 20:33:55 UTC (rev 12539) +++ trunk/tomcat6/debian/tomcat6.postinst 2010-06-07 13:00:53 UTC (rev 12540) @@ -39,7 +39,7 @@ esac if [ ! -d /var/lib/tomcat6/webapps/ROOT ]; then - cp -r /usr/share/tomcat6/webapps/default_root /var/lib/tomcat6/webapps/ROOT + cp -r /usr/share/tomcat6-root/default_root /var/lib/tomcat6/webapps/ROOT fi #DEBHELPER# _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits