Last commit made on 2012-09-17
Get this branch:
git clone -b ubuntu/quantal https://git.launchpad.net/ubuntu/+source/tomcat7
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

f46bef7... by James Page on 2012-09-17

Import patches-unapplied version 7.0.30-0ubuntu1 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: a659082395f747fd4352b6e7ec5895f801ab27f7

New changelog entries:
  * New upstream point release including several fixes for Java 7
    specific issues.
  * Refreshed patches.

a659082... by James Page on 2012-07-16

Import patches-unapplied version 7.0.29-0ubuntu1 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: b7f710dfd16938d59f06b5fcc4afb2cd6437827c

New changelog entries:
  * Re-sync with Debian unstable.
  * New upstream release:
    - Refreshed patches.
  * Enabled Tomcat jdbc-pool module, aligning more closely to upstream and
    providing improved multi-threaded performance over commons-dbcp:
    - d/rules,d/libtomcat7-java.poms: Install tomcat-dbcp.jar file.
    - d/patches/0005-change-default-DBCP-factory-class.patch: Drop patch
      which switches the default DBCP factory to commons-dbcp.
    - d/NEWS: let users know about this change.

b7f710d... by Tony Mancill on 2012-07-11

Import patches-unapplied version 7.0.28-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c3caf4d3882750aa470d850435f14189482384b7

New changelog entries:
  [ Jakub Adam ]
  * Ensure webapps/examples/WEB-INF/lib exists before files are
    copied there.
  * Fix FTBFS when user home dir doesn't exist (Closes: #680844).
  [ tony mancill ]
  * Fix build to generate postrm from postrm.in (Closes: #681160)

c3caf4d... by Tony Mancill on 2012-06-22

Import patches-unapplied version 7.0.28-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5d4d2799f17c0557b5a6a31db462e81f4b862ff4

New changelog entries:
  [ Miguel Landaeta ]
  * Add Slovak debconf translation (Closes: #677913).
    - Thanks to Ivan Masár.
  [ James Page ]
  * New upstream release.
  * Enable test suite during package build:
    - d/control: Add junit4, libjstl1.1-java and
      libjakarta-taglibs-standard-java to BDI's.
    - d/rules:
      + Add ant/junit4 jars files to build classpath.
      + Target java 1.6 to support test suite exection.
      + Specify location of junit jar file.
      + Install jstl jar files to example webapp during build.
      + Conditionally execute test target if required.
      + Purge jar files from example webapp during clean.
  * Fix JSTL examples in examples web application:
    - d/control: Add dependencies on libjstl1.1-java and
      libjakarta-taglibs-standard-java for tomcat7-examples.
    - d/tomcat7-examples.links: Add links to jstl and standard jar
      files for examples web application.
    - d/context/examples.xml: Allow linking to jar files in examples
  * Fix mapping to javax packages for API jar files:
    - d/maven.[rules,publishedRules]: Ensure all javax.[servlet|el] jar files
      are published to the correct locations in /usr/share/[maven-repo|java].
    - d/libservlet3.0-java.manifest: Update jar file locations for javax
    - d/libservlet3.0-java.links: Provide backwards compatible links for
      deprecated tomcat-*.jar files in /usr/share/java.
  [ tony mancill ]
  * Set DMUA flag.

5d4d279... by Tony Mancill on 2012-06-08

Import patches-unapplied version 7.0.27-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: bf44323d199b3e8e6ec9b58bf2dd416262746f7a

New changelog entries:
  * New upstream release.

bf44323... by Tony Mancill on 2012-05-29

Import patches-unapplied version 7.0.26-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8d76dc520029b85586bb117ecdec68bccb1a63b9

New changelog entries:
  * Address regression leaving ROOT webapp files after purge.
    (Closes: #670440)
  * Update copyright year in javadoc to 2012.

8d76dc5... by Tony Mancill on 2012-05-24

Import patches-unapplied version 7.0.26-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 39ad728293a97eb9f7f5f761834a9bf749350ff9

New changelog entries:
  * Team upload.
  * Apply patches provided by James Page (Closes: #671370)
    - d/patches/0012-java7-compat.patch: Added compatibility patch to
      support compilation with openjdk-7 as default-jdk (LP: #889002).
    - d/default_root/index.html: Fixup instructions for enabling
      manager web application access (LP: #910368).
  * Fix README.Debian symlink; file is not compressed. (Closes: #674119)

39ad728... by Tony Mancill on 2012-04-27

Import patches-unapplied version 7.0.26-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 59195040df16ffb42d3f3b7ce04d55d6a91fc527

New changelog entries:
  [ tony mancill ]
  * Add Turkish debconf translation. (Closes: #664683)
    - Thanks to Atila KOÇ
  * Add patch to tomcat7-instance-create to handle paths with spaces.
    - Thanks to James Page.
  * Remove /etc/authbind/byuid, /etc/authbind in postrm.
    Update md5sum for default webapps root files. (Closes: #670440)
  [ Jakub Adam ]
  * Update OSGi metadata, use jh_manifest for modifying MANIFEST.MF.

5919504... by Tony Mancill on 2012-03-02

Import patches-unapplied version 7.0.26-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0d32f76bbc614a27faccbb44a2dcf263b48270e8

New changelog entries:
  [ Jakub Adam ]
  * New upstream release.
  * Add Jakub Adam to Uploaders.
  * Bump Standards-Version to 3.9.3.
  * Don't Depend libservlet3.0-java-doc on package it documents, relax
    to Suggests.
  [ tony mancill ]
  * Add Polish debconf translation. (Closes: #661644)
    - Thanks to Michał Kułach.

0d32f76... by Tony Mancill on 2012-02-27

Import patches-unapplied version 7.0.23-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 271c9ba30df35ac783d056871855d6238ea6ed14

New changelog entries:
  * Add nl.po debconf translation (Closes: #651162)
    - Thanks to Jeroen Schot
  * Add java6-runtime-headless | java6-runtime to tomcat7-common Depends
    (Closes: #660757)
  * Remove java-5-runtime from tomcat7-common Depends; tomcat7 requires
    Java 1.6 according to http://tomcat.apache.org/whichversion.html.
    Also remove Java 1.5 paths from JDK path search in init script.
  * Update init script to locate multiarch OpenJDKs (Closes: #651487)
  * Apply patch to report build versions as a.b.c.d (Closes: #651492)
    - Thanks to Jorge Barreiro González
  * Bump Standards-Version to 3.9.3.