[SCM] tomcat6 packaging branch, master, updated. debian/6.0.33-1-9-g242c6fd

[tony mancill]

The following commit has been merged in the master branch:
commit 97c29dda646c03eb9a1831fc76a95d1c94e1224d
Author: tony mancill <tmancill at debian.org>
Date:   Fri Dec 9 22:05:23 2011 -0800

    attempt to fix #651448

diff --git a/debian/changelog b/debian/changelog
index d5c0309..8418151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ tomcat6 (6.0.35-1) UNRELEASED; urgency=low
 
   [ tony mancill ]
   * Update Vcs-* fields in debian/control for switch to git.
+  * Update to run with openjdk-7 packages.  (Closes: #651448)
+  * Add myself to Uploaders.
 
  -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Dec 2011 21:35:17 -0430
 
diff --git a/debian/control b/debian/control
index 806d46d..13dc62d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>,
- Damien Raude-Morvan <drazzib at debian.org>, Miguel Landaeta <miguel at miguel.cc>
+ Damien Raude-Morvan <drazzib at debian.org>, Miguel Landaeta <miguel at miguel.cc>,
+ tony mancill <tmancill at debian.org>
 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.2
@@ -15,7 +16,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/tomcat6.git
 Package: tomcat6-common
 Architecture: all
 Depends: libtomcat6-java (>= ${source:Version}), ${misc:Depends},
- default-jre-headless | java-5-runtime | java-6-runtime
+ default-jre-headless | java-7-runtime | java-6-runtime | java-5-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
@@ -27,13 +28,13 @@ Description: Servlet and JSP engine -- common files
 Package: tomcat6
 Architecture: all
 Depends: tomcat6-common (>= ${source:Version}), ucf,
-	adduser, ${misc:Depends}
+ adduser, ${misc:Depends}
 Recommends: authbind
 Suggests: tomcat6-docs (>= ${source:Version}),
-	tomcat6-admin (>= ${source:Version}),
-	tomcat6-examples (>= ${source:Version}),
-	tomcat6-user (>= ${source:Version}),
-	libtcnative-1
+ tomcat6-admin (>= ${source:Version}),
+ tomcat6-examples (>= ${source:Version}),
+ tomcat6-user (>= ${source:Version}),
+ libtcnative-1
 Description: Servlet and JSP engine
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -50,9 +51,9 @@ Package: tomcat6-user
 Architecture: all
 Depends: tomcat6-common (>= ${source:Version}), netcat, ${misc:Depends}
 Suggests: tomcat6-docs (>= ${source:Version}),
-	tomcat6-admin (>= ${source:Version}),
-	tomcat6-examples (>= ${source:Version}),
-	tomcat6 (>= ${source:Version})
+ tomcat6-admin (>= ${source:Version}),
+ tomcat6-examples (>= ${source:Version}),
+ tomcat6 (>= ${source:Version})
 Description: Servlet and JSP engine -- tools to create user instances
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
diff --git a/debian/tomcat6.init b/debian/tomcat6.init
index 0a25cdd..162000d 100644
--- a/debian/tomcat6.init
+++ b/debian/tomcat6.init
@@ -45,16 +45,33 @@ if [ -r /etc/default/rcS ]; then
 	. /etc/default/rcS
 fi
 
-
 # The following variables can be overwritten in $DEFAULT
 
 # Run Tomcat 6 as this user ID and group ID
 TOMCAT6_USER=tomcat6
 TOMCAT6_GROUP=tomcat6
 
+# this is an ugly work-around until there is a suitable runtime replacement 
+# for dpkg-architecture for arch:all packages
+# this function sets the variable JDK7_HOME
+find_jdk7()
+{
+        for jvmdir in /usr/lib/jvm/java-7-openjdk-*
+        do
+                echo "DEBUG: $jvmdir"
+                if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-7-openjdk-common" ]
+                then
+                        JDK7_HOME=$jvmdir
+                fi
+        done
+}
+
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
+
+JDK7_HOME=""
+find_jdk7
+JDK_DIRS="/usr/lib/jvm/default-java $JDK7_HOME /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do

-- 
tomcat6 packaging