[pkg-java] r6310 - trunk/libservlet2.4-java/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-04-27 20:22:50 +0000 (Sun, 27 Apr 2008)
New Revision: 6310

Modified:
   trunk/libservlet2.4-java/debian/
   trunk/libservlet2.4-java/debian/changelog
   trunk/libservlet2.4-java/debian/control
   trunk/libservlet2.4-java/debian/rules
Log:
libservlet2.4-java (5.0.30-8) unstable; urgency=low

  * Build-Depend on default-jdk-builddep. Closes: #477888

 -- Michael Koch <konqueror at gmx.de>  Sun, 27 Apr 2008 12:08:12 -0100




Property changes on: trunk/libservlet2.4-java/debian
___________________________________________________________________
Name: svn:ignore
   - files
libservlet2.4-java
libservlet2.4-java-gcj
stamp-*
*.debhelper
*.substvars

   + files
libservlet2.4-java
libservlet2.4-java-gcj
stamp-*
*.debhelper
*.debhelper.log
*.substvars


Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog	2008-04-27 19:37:12 UTC (rev 6309)
+++ trunk/libservlet2.4-java/debian/changelog	2008-04-27 20:22:50 UTC (rev 6310)
@@ -1,3 +1,9 @@
+libservlet2.4-java (5.0.30-8) unstable; urgency=low
+
+  * Build-Depend on default-jdk-builddep. Closes: #477888
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 27 Apr 2008 12:08:12 -0100
+
 libservlet2.4-java (5.0.30-7) unstable; urgency=low
 
   * Updated watch file to mach for tomcat5.5 instead of tomcat5.

Modified: trunk/libservlet2.4-java/debian/control
===================================================================
--- trunk/libservlet2.4-java/debian/control	2008-04-27 19:37:12 UTC (rev 6309)
+++ trunk/libservlet2.4-java/debian/control	2008-04-27 20:22:50 UTC (rev 6310)
@@ -2,7 +2,7 @@
 Priority: optional
 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 (>= 4.2.30), cdbs, java-gcj-compat-dev, ant
+Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk-builddep, ant
 Standards-Version: 3.7.3
 Section: libs
 

Modified: trunk/libservlet2.4-java/debian/rules
===================================================================
--- trunk/libservlet2.4-java/debian/rules	2008-04-27 19:37:12 UTC (rev 6309)
+++ trunk/libservlet2.4-java/debian/rules	2008-04-27 20:22:50 UTC (rev 6310)
@@ -17,7 +17,7 @@
   with_gcj_native := yes
 endif
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILDFILE := debian/build.xml