The following commit has been merged in the master branch:
commit fac104022a410b20c76af3334bd73ab75cb16430
Author: tony mancill <[email protected]>
Date: Sun Dec 11 10:47:40 2011 -0800
allow headless JREs to satisfy depends
diff --git a/debian/changelog b/debian/changelog
index 4d3ff37..a2303db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ 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)
+ * Allow java-?-runtime-headless to satisfy depends.
* Add myself to Uploaders.
-- tony mancill <[email protected]> Fri, 09 Dec 2011 22:05:37 -0800
diff --git a/debian/control b/debian/control
index 13dc62d..5e4fa84 100644
--- a/debian/control
+++ b/debian/control
@@ -16,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-7-runtime | java-6-runtime | java-5-runtime
+ default-jre-headless | java-7-runtime-headless | java-7-runtime |
java-6-runtime-headless | 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
--
tomcat6 packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
