[pkg-java] r6777 - trunk/javax-servletapi2.3/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 15:21:46 +0000 (Wed, 30 Jul 2008)
New Revision: 6777

Modified:
   trunk/javax-servletapi2.3/debian/changelog
   trunk/javax-servletapi2.3/debian/control
   trunk/javax-servletapi2.3/debian/rules
Log:
* (Build-)depend on default-jre/-jdk.


Modified: trunk/javax-servletapi2.3/debian/changelog
===================================================================
--- trunk/javax-servletapi2.3/debian/changelog	2008-07-30 15:14:48 UTC (rev 6776)
+++ trunk/javax-servletapi2.3/debian/changelog	2008-07-30 15:21:46 UTC (rev 6777)
@@ -1,3 +1,9 @@
+javax-servletapi2.3 (4.0-11) UNRLEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:18:58 +0000
+
 javax-servletapi2.3 (4.0-10) unstable; urgency=low
 
   * Fixed Depends on java-gcj-compat.

Modified: trunk/javax-servletapi2.3/debian/control
===================================================================
--- trunk/javax-servletapi2.3/debian/control	2008-07-30 15:14:48 UTC (rev 6776)
+++ trunk/javax-servletapi2.3/debian/control	2008-07-30 15:21:46 UTC (rev 6777)
@@ -4,14 +4,14 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev
+Build-Depends-Indep: ant, default-jdk
 Standards-Version: 3.7.2
 
 Package: libservlet2.3-java
 Architecture: all
 Section: libs
 Priority: optional
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Description: Servlet 2.3 and JSP 1.2 Java classes and documentation
  .
  For more information about Java servlets please take a look at the Tomcat

Modified: trunk/javax-servletapi2.3/debian/rules
===================================================================
--- trunk/javax-servletapi2.3/debian/rules	2008-07-30 15:14:48 UTC (rev 6776)
+++ trunk/javax-servletapi2.3/debian/rules	2008-07-30 15:21:46 UTC (rev 6777)
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME  := /usr/share/ant
 
 DEB_ANT_BUILD_TARGET := dist