[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.23-1-15-g8eed63c

[tony mancill]

The following commit has been merged in the master branch:
commit 8eed63c416253b1159ec9cc11f877237be410bb1
Merge: f106698fdaa88c934fe3cb6605da438a89434ff3 bb5db17999dbebf8ed351902eb92cd029db56052
Author: tony mancill <tmancill at debian.org>
Date:   Sun Feb 26 23:24:38 2012 -0800

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/tomcat7
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 2fa8c33,a0a0e1f..500e113
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,22 +1,30 @@@
+ tomcat7 (7.0.26-1) UNRELEASED; urgency=low
+ 
 -  [ tony mancill ]
 -  * Add nl.po debconf translation (Closes: #651162)
 -    - Thanks to Jeroen Schot
 -
 -  [ Miguel Landaeta ]
 -  * Fix error in debian/rules that caused tomcat to report no version.
 -    Thanks to Jorge Barreiro for the patch. (Closes: #651492).
 -
+   [ 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.
+ 
+  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 25 Feb 2012 20:51:36 +0100
+ 
 +tomcat7 (7.0.23-2) unstable; urgency=low
 +
-   * Add nl.po debconf translation (Closes: #651162) 
++  * 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.
 +
 + -- tony mancill <tmancill at debian.org>  Sun, 26 Feb 2012 22:55:33 -0800
 +
  tomcat7 (7.0.23-1) unstable; urgency=low
  
    * New upstream release.
diff --combined debian/control
index c8dd5f1,8351175..bf43873
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,8 +3,8 @@@ Section: jav
  Priority: optional
  Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
  Uploaders: James Page <james.page at ubuntu.com>,
-  Miguel Landaeta <miguel at miguel.cc>, tony mancill <tmancill at debian.org>
+  Miguel Landaeta <miguel at miguel.cc>, tony mancill <tmancill at debian.org>,
+  Jakub Adam <jakub.adam at ktknet.cz>
  Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
  Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java
  Standards-Version: 3.9.3
@@@ -14,7 -15,7 +15,7 @@@ Homepage: http://tomcat.apache.or
  Package: tomcat7-common
  Architecture: all
  Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends},
 - default-jre-headless | java-5-runtime | java-6-runtime
 + default-jre-headless | java6-runtime-headless | java6-runtime | java-6-runtime
  Description: Servlet and JSP engine -- common files
   Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
   specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@@ -90,7 -91,8 +91,8 @@@ Description: Servlet 3.0 and JSP 2.2 Ja
  Package: libservlet3.0-java-doc
  Section: doc
  Architecture: all
- Depends: libservlet3.0-java (>= ${source:Version}), ${misc:Depends}
+ Depends: ${misc:Depends}
+ Suggests: libservlet3.0-java (>= ${source:Version})
  Description: Servlet 3.0 and JSP 2.2 Java API documentation
   Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
   specifications from Sun Microsystems, and provides a "pure Java" HTTP web

-- 
tomcat7: Servlet and JSP engine