[pkg-java] r4082 - in trunk/libcommons-fileupload-java/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Sat Sep 1 18:24:13 UTC 2007
Author: mkoch
Date: 2007-09-01 18:24:13 +0000 (Sat, 01 Sep 2007)
New Revision: 4082
Added:
trunk/libcommons-fileupload-java/debian/README.Debian
trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
Modified:
trunk/libcommons-fileupload-java/debian/changelog
trunk/libcommons-fileupload-java/debian/control
trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch
trunk/libcommons-fileupload-java/debian/rules
Log:
libcommons-fileupload-java (1.2-1) unstable; urgency=low
* New upstream release. Closes: #429638.
- added README.Debian with info about disabled portlet support
- updated patches/01-build-jar-without-test-fix.patch
* Use java-gcj-compat instead of kaffe.
* Renamed debian/patches/02_jikes_1.3.patch to
debian/patches/02_java13.patch and to make sure to have compatibility with
Java 1.3.
* Moved cdbs and debhelper from Build-Depends-Indep to Build-Depends.
* Fixed usage of Homepage: tag in package description.
* Removed Wolfgang and added myself to Uploads
* Updated Standards-Version.
* Removed ant-launcher.jar from explicit list of jars.
* Removed debian/libcommons-fileupload-java.links, debian/install and
debian/links and do the needed stuff in debian/rules.
-- Michael Koch <konqueror at gmx.de> Sat, 21 Jul 2007 13:08:32 +0200
Added: trunk/libcommons-fileupload-java/debian/README.Debian
===================================================================
--- trunk/libcommons-fileupload-java/debian/README.Debian (rev 0)
+++ trunk/libcommons-fileupload-java/debian/README.Debian 2007-09-01 18:24:13 UTC (rev 4082)
@@ -0,0 +1,7 @@
+commons-fileupload
+==================
+
+Support for the Portlet API is disabled in this package due to
+restrictions in the availability of it.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 20 Jul 2007 07:20:00 +0200
Modified: trunk/libcommons-fileupload-java/debian/changelog
===================================================================
--- trunk/libcommons-fileupload-java/debian/changelog 2007-09-01 15:45:47 UTC (rev 4081)
+++ trunk/libcommons-fileupload-java/debian/changelog 2007-09-01 18:24:13 UTC (rev 4082)
@@ -1,3 +1,22 @@
+libcommons-fileupload-java (1.2-1) unstable; urgency=low
+
+ * New upstream release. Closes: #429638.
+ - added README.Debian with info about disabled portlet support
+ - updated patches/01-build-jar-without-test-fix.patch
+ * Use java-gcj-compat instead of kaffe.
+ * Renamed debian/patches/02_jikes_1.3.patch to
+ debian/patches/02_java13.patch and to make sure to have compatibility with
+ Java 1.3.
+ * Moved cdbs and debhelper from Build-Depends-Indep to Build-Depends.
+ * Fixed usage of Homepage: tag in package description.
+ * Removed Wolfgang and added myself to Uploads
+ * Updated Standards-Version.
+ * Removed ant-launcher.jar from explicit list of jars.
+ * Removed debian/libcommons-fileupload-java.links, debian/install and
+ debian/links and do the needed stuff in debian/rules.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 21 Jul 2007 13:08:32 +0200
+
libcommons-fileupload-java (1.0-14) unstable; urgency=low
* kaffe compiler transition
Modified: trunk/libcommons-fileupload-java/debian/control
===================================================================
--- trunk/libcommons-fileupload-java/debian/control 2007-09-01 15:45:47 UTC (rev 4081)
+++ trunk/libcommons-fileupload-java/debian/control 2007-09-01 18:24:13 UTC (rev 4082)
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.5.3), ant, libcommons-beanutils-java, libservlet2.3-java, kaffe
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 4.2.30), cdbs (>= 0.4.5.3)
+Build-Depends-Indep: ant, libcommons-beanutils-java, libservlet2.3-java, java-gcj-compat-dev, libcommons-io-java
+Standards-Version: 3.7.2
Package: libcommons-fileupload-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libcommons-beanutils-java, libservlet2.3-java
-Suggests: java-virtual-machine
+Depends: java-gcj-compat-dev | java1-runtime | java2-runtime, libcommons-beanutils-java, libservlet2.3-java
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.
@@ -20,4 +20,4 @@
can parse that request, and make the results available in a manner easily
used by the caller.
.
- Homepage: <http://jakarta.apache.org/commons/fileupload/>
+ Homepage: http://jakarta.apache.org/commons/fileupload/
Modified: trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch 2007-09-01 15:45:47 UTC (rev 4081)
+++ trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch 2007-09-01 18:24:13 UTC (rev 4082)
@@ -1,11 +1,11 @@
---- build.xml 2003-09-13 13:32:33.000000000 +0200
-+++ build.xml 2003-09-13 13:33:11.000000000 +0200
-@@ -46,7 +46,7 @@
- </classpath>
- </javac>
+--- build.xml.orig 2007-06-20 07:49:10.000000000 +0200
++++ build.xml 2007-06-20 07:49:28.000000000 +0200
+@@ -59,7 +59,7 @@
+ </fileset>
+ </copy>
</target>
- <target name="jar" description="o Create the jar" depends="compile,test">
+ <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
</target>
+ <target name="clean" description="o Clean up the generated directories">
Added: trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/02_java13.patch (rev 0)
+++ trunk/libcommons-fileupload-java/debian/patches/02_java13.patch 2007-09-01 18:24:13 UTC (rev 4082)
@@ -0,0 +1,11 @@
+--- build.xml.orig 2007-06-20 07:47:14.000000000 +0200
++++ build.xml 2007-06-20 07:47:35.000000000 +0200
+@@ -46,7 +46,7 @@
+ </target>
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classesdir}"></mkdir>
+- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.3" source="1.3">
+ <src>
+ <pathelement location="${basedir}/src/java"></pathelement>
+ </src>
Modified: trunk/libcommons-fileupload-java/debian/rules
===================================================================
--- trunk/libcommons-fileupload-java/debian/rules 2007-09-01 15:45:47 UTC (rev 4081)
+++ trunk/libcommons-fileupload-java/debian/rules 2007-09-01 18:24:13 UTC (rev 4082)
@@ -5,14 +5,17 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME_DIRS := /usr/lib/kaffe
+JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-DEB_JARS := servlet-2.3 $(ANT_HOME)/lib/ant-launcher.jar
+DEB_JARS := servlet-2.3 commons-io
DEB_ANT_BUILD_TARGET := dist
LIBRARY=commons-fileupload
-VERSION=1.0
+install/libcommons-fileupload-java::
+ mv dist/$(LIBRARY)-1.2rc3.jar dist/$(LIBRARY)-$(DEB_UPSTREAM_VERSION).jar
+ dh_install -plibcommons-fileupload-java dist/$(LIBRARY)-1.2.jar /usr/share/java
+ dh_link -plibcommons-fileupload-java /usr/share/java/$(LIBRARY)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(LIBRARY).jar
+
clean::
-rm -fr lib
-
More information about the pkg-java-commits
mailing list