[pkg-java] r10410 - trunk/libcommons-fileupload-java/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-16 20:16:57 +0000 (Wed, 16 Sep 2009)
New Revision: 10410

Modified:
   trunk/libcommons-fileupload-java/debian/changelog
   trunk/libcommons-fileupload-java/debian/control
   trunk/libcommons-fileupload-java/debian/rules
Log:
libcommons-fileupload-java (1.2.1-3) unstable; urgency=low

  * (Build-)Depends on default-jdk.
  * (Build-)Depends on libservlet2.4-java.

 -- Michael Koch <konqueror at gmx.de>  Wed, 16 Sep 2009 22:15:26 +0200



Modified: trunk/libcommons-fileupload-java/debian/changelog
===================================================================
--- trunk/libcommons-fileupload-java/debian/changelog	2009-09-16 19:23:26 UTC (rev 10409)
+++ trunk/libcommons-fileupload-java/debian/changelog	2009-09-16 20:16:57 UTC (rev 10410)
@@ -1,3 +1,10 @@
+libcommons-fileupload-java (1.2.1-3) unstable; urgency=low
+
+  * (Build-)Depends on default-jdk.
+  * (Build-)Depends on libservlet2.4-java.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 16 Sep 2009 22:15:26 +0200
+
 libcommons-fileupload-java (1.2.1-2) unstable; urgency=low
 
   [ Emmanuel Bourg ]

Modified: trunk/libcommons-fileupload-java/debian/control
===================================================================
--- trunk/libcommons-fileupload-java/debian/control	2009-09-16 19:23:26 UTC (rev 10409)
+++ trunk/libcommons-fileupload-java/debian/control	2009-09-16 20:16:57 UTC (rev 10410)
@@ -3,8 +3,8 @@
 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 (>= 5), cdbs (>= 0.4.5.3)
-Build-Depends-Indep: ant, libcommons-beanutils-java, libservlet2.3-java, java-gcj-compat-dev, libcommons-io-java
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, ant
+Build-Depends-Indep: libcommons-beanutils-java, libservlet2.4-java, libcommons-io-java
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-fileupload-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-fileupload-java
@@ -12,7 +12,7 @@
 
 Package: libcommons-fileupload-java
 Architecture: all
-Depends: java-gcj-compat-dev | java1-runtime | java2-runtime, libcommons-beanutils-java, libservlet2.3-java, libcommons-io-java, ${misc:Depends}
+Depends: default-jdk | java1-runtime | java2-runtime, libcommons-beanutils-java, libservlet2.4-java, libcommons-io-java, ${misc:Depends}
 Description: File upload capability to your servlets and web applications
  The Commons FileUpload package makes it easy to add robust, high-performance,
  file upload capability to your servlets and web applications.

Modified: trunk/libcommons-fileupload-java/debian/rules
===================================================================
--- trunk/libcommons-fileupload-java/debian/rules	2009-09-16 19:23:26 UTC (rev 10409)
+++ trunk/libcommons-fileupload-java/debian/rules	2009-09-16 20:16:57 UTC (rev 10410)
@@ -5,9 +5,9 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := servlet-2.3 commons-io
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
+
+DEB_JARS             := servlet-api-2.4 commons-io
 DEB_ANT_BUILD_TARGET := dist
 
 LIBRARY=commons-fileupload