diff -u tomcat6-6.0.20/debian/rules tomcat6-6.0.20/debian/rules --- tomcat6-6.0.20/debian/rules +++ tomcat6-6.0.20/debian/rules @@ -2,7 +2,7 @@ include /usr/share/quilt/quilt.make -JAVA_HOME := /usr/lib/jvm/java-6-openjdk +JAVA_HOME := /usr/lib/jvm/default-java JAVA_CMD := $(JAVA_HOME)/bin/java BLDLIB := output/build/lib DEB_JARS_BASE := /usr/share/java diff -u tomcat6-6.0.20/debian/changelog tomcat6-6.0.20/debian/changelog --- tomcat6-6.0.20/debian/changelog +++ tomcat6-6.0.20/debian/changelog @@ -1,3 +1,11 @@ +tomcat6 (6.0.20-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #385262), remaining changes: + - debian/control, debian/rules: Use default-jdk to build + - debian/control: Run using default-jre-headless by default + + -- Iulian Udrea Tue, 09 Jun 2009 16:39:00 +0100 + tomcat6 (6.0.20-1) unstable; urgency=low * new upstream release (Closes: #531873) @@ -28,6 +36,16 @@ -- Torsten Werner Sun, 10 May 2009 19:41:40 +0200 +tomcat6 (6.0.18-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #371728), remaining changes: + - debian/control, debian/rules: Use default-jdk to build + - debian/control: Run using default-jre-headless by default + - debian/patches/tcnative-ipv6-fix-43327.patch to fix incompatibility + between libtcnative-1 and ipv6 + + -- Thierry Carrez Mon, 04 May 2009 17:53:42 +0200 + tomcat6 (6.0.18-3) unstable; urgency=low * Remove unneeded dirs and symlinks; thanks to Thierry Carrez. (Closes: @@ -51,6 +69,15 @@ -- Torsten Werner Sat, 07 Feb 2009 17:02:57 +0100 +tomcat6 (6.0.18-0ubuntu6) jaunty; urgency=low + + * Added debian/patches/tcnative-ipv6-fix-43327.patch to fix incompatibility + between libtcnative-1 and ipv6 (fixes LP: #287645) + * No longer create confusing /var/lib/tomcat6/lib or lib subdirectory in + private instances, since they are ignored (LP: #324212) + + -- Thierry Carrez Mon, 23 Feb 2009 10:16:37 +0000 + tomcat6 (6.0.18-0ubuntu5) jaunty; urgency=low [ Thierry Carrez ] @@ -161,0 +189 @@ + diff -u tomcat6-6.0.20/debian/control tomcat6-6.0.20/debian/control --- tomcat6-6.0.20/debian/control +++ tomcat6-6.0.20/debian/control @@ -1,10 +1,14 @@ Source: tomcat6 Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Paul Cager , Torsten Werner -Build-Depends: openjdk-6-jdk, ant-optional, debhelper (>= 6), quilt +Build-Depends: default-jdk, + ant-optional, + debhelper (>=6), + quilt Build-Depends-Indep: libecj-java Standards-Version: 3.8.1 Homepage: http://tomcat.apache.org @@ -54,7 +58,7 @@ Package: libtomcat6-java Architecture: all -Depends: openjdk-6-jre-headless | java6-runtime-headless, +Depends: default-jre-headless | java6-runtime-headless, libecj-java, libcommons-dbcp-java, libcommons-pool-java, @@ -71,7 +75,7 @@ Package: libservlet2.5-java Architecture: all -Depends: openjdk-6-jre-headless | java2-runtime-headless +Depends: default-jre-headless | java2-runtime-headless Description: Servlet 2.5 and JSP 2.1 Java API classes Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) specifications from Sun Microsystems, and provides a "pure Java" HTTP web