diff -u tomcat6-6.0.18/debian/control tomcat6-6.0.18/debian/control --- tomcat6-6.0.18/debian/control +++ tomcat6-6.0.18/debian/control @@ -3,7 +3,8 @@ Priority: optional Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Debian Java Maintainers -Uploaders: Paul Cager +Uploaders: Paul Cager , + Torsten Werner Build-Depends: default-jdk, ant, ant-optional, @@ -12,13 +13,17 @@ Build-Depends-Indep: libecj-java Standards-Version: 3.8.0 Homepage: http://tomcat.apache.org +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat6 Package: tomcat6-common Architecture: all Depends: libtomcat6-java (>= ${source:Version}) Description: Servlet and JSP engine -- common files - Apache Tomcat 6 is the reference implementation for the Java Servlet 2.5 - and JavaServer Pages 2.1 technologies. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . This package contains common files needed by the tomcat6 and tomcat6-user packages (Tomcat 6 scripts and libraries). @@ -32,8 +37,10 @@ tomcat6-admin (>= ${source:Version}), tomcat6-examples (>= ${source:Version}) Description: Servlet and JSP engine - Apache Tomcat 6 is the reference implementation for the Java Servlet 2.5 - and JavaServer Pages 2.1 technologies. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . This package just contains the startup scripts for the system-wide daemon. No documentation or web applications are included here, please install @@ -43,8 +50,10 @@ Architecture: all Depends: tomcat6-common (>= ${source:Version}), netcat Description: Servlet and JSP engine -- tools to create user instances - Apache Tomcat 6 is the reference implementation for the Java Servlet 2.5 - and JavaServer Pages 2.1 technologies. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . This package contains files needed to create a user Tomcat instance. @@ -57,8 +66,10 @@ libservlet2.5-java (>= ${source:Version}) Suggests: tomcat6 (>= ${source:Version}) Description: Servlet and JSP engine -- core libraries - Apache Tomcat 6 is the reference implementation for the Java Servlet 2.5 - and JavaServer Pages 2.1 technologies. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . This package contains the Tomcat core classes which can be used by other Java applications to embed Tomcat. @@ -67,29 +78,33 @@ Architecture: all Depends: default-jre-headless | java2-runtime-headless Description: Servlet 2.5 and JSP 2.1 Java API classes - For more information about Java servlets please take a look at the Tomcat - home page at http://jakarta.apache.org/tomcat/index.html. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . - The official Servlet 2.5 and JSP 2.1 specifications can be found at - http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/. + This packages contains the Java Servlet and JSP library. Package: libservlet2.5-java-doc Section: doc Architecture: all Depends: libservlet2.5-java (>= ${source:Version}) Description: Servlet 2.5 and JSP 2.1 Java API documentation - For more information about Java servlets please take a look at the Tomcat - home page at http://jakarta.apache.org/tomcat/index.html. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . - The official Servlet 2.5 and JSP 2.1 specifications can be found at - http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/. + This packages contains the documentation for the Java Servlet and JSP library. Package: tomcat6-admin Architecture: all Depends: tomcat6 (>= ${source:Version}) Description: Servlet and JSP engine -- admin web applications - Apache Tomcat 6 is the reference implementation for the Java Servlet 2.5 - and JavaServer Pages 2.1 technologies. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . This package contains the administrative web interfaces. @@ -97,8 +112,10 @@ Architecture: all Depends: tomcat6 (>= ${source:Version}) Description: Servlet and JSP engine -- example web applications - Apache Tomcat 6 is the reference implementation for the Java Servlet 2.5 - and JavaServer Pages 2.1 technologies. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . This package contains the default Tomcat example webapps. @@ -107,8 +124,10 @@ Architecture: all Depends: tomcat6 (>= ${source:Version}) Description: Servlet and JSP engine -- example web applications - Apache Tomcat 6 is the reference implementation for the Java Servlet 2.5 - and JavaServer Pages 2.1 technologies. + Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Sun Microsystems, and provides a "pure Java" HTTP web + server environment for Java code to run. Tomcat 6 is the reference + implementation for the Java Servlet 2.5 and JavaServer Pages 2.1 technologies. . This package contains the online documentation web application. diff -u tomcat6-6.0.18/debian/changelog tomcat6-6.0.18/debian/changelog --- tomcat6-6.0.18/debian/changelog +++ tomcat6-6.0.18/debian/changelog @@ -1,3 +1,36 @@ +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: + #517857) + * Improve the long description of all binary packages. (Closes: #518140) + + -- Torsten Werner Wed, 04 Mar 2009 21:58:41 +0100 + +tomcat6 (6.0.18-2) unstable; urgency=low + + * upload to unstable + + -- Torsten Werner Sat, 21 Feb 2009 11:31:20 +0100 + +tomcat6 (6.0.18-1) experimental; urgency=low + + * Merge changes from Ubuntu. Thanks to the Ubuntu developers we are shipping + a full Tomcat 6.0 server stack now. (Closes: #494674) + * Add myself to Uploaders. + * Switch to openjdk-6 which is not the default in Debian. + + -- 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 @@ -117,0 +151 @@ +