[pkg-java] r3560 - trunk/tomcat5.5/debian

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2007-05-31 13:50:26 +0000 (Thu, 31 May 2007)
New Revision: 3560

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/rules
Log:
Don't include /var/lib/tomcat5.5/conf/catalina.policy since it is auto-generated at startup.


Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2007-05-30 19:57:49 UTC (rev 3559)
+++ trunk/tomcat5.5/debian/changelog	2007-05-31 13:50:26 UTC (rev 3560)
@@ -1,6 +1,9 @@
 tomcat5.5 (5.5.23-1) unstable; urgency=low
 
   * New upstream version.
+  * Don't include /var/lib/tomcat5.5/conf/catalina.policy since it is
+    auto-generated at startup. Thanks to Javier Serrano Polo. (Closes:
+    #426761)
   * tomcat5.5-admin now depends on libcommons-collections3-java and
     libcommons-digester-java.
 

Modified: trunk/tomcat5.5/debian/rules
===================================================================
--- trunk/tomcat5.5/debian/rules	2007-05-30 19:57:49 UTC (rev 3559)
+++ trunk/tomcat5.5/debian/rules	2007-05-31 13:50:26 UTC (rev 3560)
@@ -62,6 +62,7 @@
 	rm -f $(TOMCAT_SHARE_DIR)/bin/*.{jar,xml} \
 	  $(TOMCAT_VARLIB_DIR)/conf/{server,web,tomcat-users}.xml \
 	  $(TOMCAT_VARLIB_DIR)/conf/Catalina/localhost/* \
+	  $(TOMCAT_VARLIB_DIR)/conf/catalina.policy \
 	  $(LIBTOMCAT_SHARE_DIR)/bin/*.sh \
 	  $(LIBTOMCAT_SHARE_DIR)/common/lib/{commons-*,{jsp,servlet}-api.jar} \
 	  $(LIBTOMCAT_SHARE_DIR)/server/lib/commons-*