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

doko at alioth.debian.org doko at alioth.debian.org
Wed Oct 15 12:37:52 UTC 2008 

Author: doko
Date: 2008-10-15 12:37:52 +0000 (Wed, 15 Oct 2008)
New Revision: 7150

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/control
   trunk/tomcat5.5/debian/rules
   trunk/tomcat5.5/debian/tomcat5.5.init
   trunk/tomcat5.5/debian/tomcat5.5.postinst
Log:
  * Merge changes from Ubuntu:
    - Use default-jre-headless, default-jdk as preferred alternatives.
    - tomcat5.5.init: Fix JDK list to match default-jre, java-6-openjdk
      and java-6-cacao. Closes: #495235.
    - tomcat5.5.postinst: Removed superfluous /etc/tomcat5.5/tomcat5.5 linking.
      Closes: #498487.


Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2008-10-15 09:41:59 UTC (rev 7149)
+++ trunk/tomcat5.5/debian/changelog	2008-10-15 12:37:52 UTC (rev 7150)
@@ -1,3 +1,14 @@
+tomcat5.5 (5.5.26-5) unstable; urgency=medium
+
+  * Merge changes from Ubuntu:
+    - Use default-jre-headless, default-jdk as preferred alternatives.
+    - tomcat5.5.init: Fix JDK list to match default-jre, java-6-openjdk
+      and java-6-cacao. Closes: #495235.
+    - tomcat5.5.postinst: Removed superfluous /etc/tomcat5.5/tomcat5.5 linking.
+      Closes: #498487.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 15 Oct 2008 14:00:39 +0200
+
 tomcat5.5 (5.5.26-4) unstable; urgency=high
 
   * Security issues fixed.
@@ -3,5 +14,5 @@
     - CVE-2008-1232: Cross-site scripting
     - CVE-2008-2370: Information disclosure
-    - CVE-2008-2938: Directory traversal
+    - CVE-2008-2938: Directory traversal. Closes: #496309.
 
  -- Marcus Better <marcus at better.se>  Sun, 05 Oct 2008 14:15:19 +0200

Modified: trunk/tomcat5.5/debian/control
===================================================================
--- trunk/tomcat5.5/debian/control	2008-10-15 09:41:59 UTC (rev 7149)
+++ trunk/tomcat5.5/debian/control	2008-10-15 12:37:52 UTC (rev 7150)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: java-gcj-compat-dev, ant, ant-optional, libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip, libgnumail-java
+Build-Depends-Indep: default-jdk, ant, ant-optional, libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip, libgnumail-java
 Standards-Version: 3.7.3
 Homepage: http://tomcat.apache.org
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/tomcat5.5
@@ -12,7 +12,7 @@
 
 Package: tomcat5.5
 Architecture: all
-Depends: java-gcj-compat-dev (>= 1.0.30-5) | java2-runtime, libtomcat5.5-java (>= ${source:Version}), adduser (>= 3.34), libecj-java, jsvc (>= 1.0.2~svn20061127-6)
+Depends: default-jdk | java2-runtime-headless | java2-runtime, libtomcat5.5-java (>= ${source:Version}), adduser (>= 3.34), libecj-java, jsvc (>= 1.0.2~svn20061127-6)
 Suggests: java-virtual-machine, libapache2-mod-jk, tomcat5.5-webapps (>= ${source:Version}), tomcat5.5-admin (>= ${source:Version})
 Conflicts: tomcat5.5-admin (<= 5.5.20-5)
 Description: Servlet and JSP engine
@@ -25,7 +25,7 @@
 
 Package: libtomcat5.5-java
 Architecture: all
-Depends: libxerces2-java, libservlet2.4-java, libcommons-el-java, ant, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), libmx4j-java, libcommons-collections3-java, libcommons-dbcp-java, libcommons-pool-java
+Depends: default-jre-headless | java2-runtime-headless, libecj-java, libxerces2-java, libservlet2.4-java, libcommons-el-java, ant, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), libmx4j-java, libcommons-collections3-java, libcommons-dbcp-java, libcommons-pool-java
 Suggests: tomcat5.5 
 Description: Java Servlet engine -- core libraries
  Apache Tomcat is the reference implementation for the Java Servlet

Modified: trunk/tomcat5.5/debian/rules
===================================================================
--- trunk/tomcat5.5/debian/rules	2008-10-15 09:41:59 UTC (rev 7149)
+++ trunk/tomcat5.5/debian/rules	2008-10-15 12:37:52 UTC (rev 7150)
@@ -2,7 +2,7 @@
 
 SHELL		= /bin/bash
 
-JAVA_HOME	:= /usr/lib/jvm/java-gcj
+JAVA_HOME	:= /usr/lib/jvm/default-java
 DEB_JARS_BASE	:= /usr/share/java
 JAVACMD  	:= $(JAVA_HOME)/bin/java
 

Modified: trunk/tomcat5.5/debian/tomcat5.5.init
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.init	2008-10-15 09:41:59 UTC (rev 7149)
+++ trunk/tomcat5.5/debian/tomcat5.5.init	2008-10-15 12:37:52 UTC (rev 7150)
@@ -48,7 +48,7 @@
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe"
+JDK_DIRS="/usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-cacao /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do

Modified: trunk/tomcat5.5/debian/tomcat5.5.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.postinst	2008-10-15 09:41:59 UTC (rev 7149)
+++ trunk/tomcat5.5/debian/tomcat5.5.postinst	2008-10-15 12:37:52 UTC (rev 7150)
@@ -25,7 +25,6 @@
 	chmod -R 770 /etc/tomcat5.5
 	chmod 750 /var/log/tomcat5.5 /etc/tomcat5.5
 	chmod 700 /var/cache/tomcat5.5
-	ln -sf /etc/tomcat5.5 /var/lib/tomcat5.5/conf 
 
 	# Moving conffiles.
 	if dpkg --compare-versions "$2" le "5.5.25-4"; then

More information about the pkg-java-commits mailing list