[pkg-java] r12860 - in trunk/libcommons-fileupload-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Aug 4 13:24:58 UTC 2010
Author: drazzib
Date: 2010-08-04 13:24:53 +0000 (Wed, 04 Aug 2010)
New Revision: 12860
Added:
trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.doc-base
trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.install
trunk/libcommons-fileupload-java/debian/maven.cleanIgnoreRules
trunk/libcommons-fileupload-java/debian/maven.properties
Removed:
trunk/libcommons-fileupload-java/debian/ant.properties
trunk/libcommons-fileupload-java/debian/dirs
trunk/libcommons-fileupload-java/debian/docs
trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch
trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch
Modified:
trunk/libcommons-fileupload-java/debian/changelog
trunk/libcommons-fileupload-java/debian/control
trunk/libcommons-fileupload-java/debian/maven.ignoreRules
trunk/libcommons-fileupload-java/debian/maven.rules
trunk/libcommons-fileupload-java/debian/patches/series
trunk/libcommons-fileupload-java/debian/rules
Log:
* New upstream release.
* New libcommons-fileupload-java-doc package for Javadoc.
* Bump Standards-Version to 3.9.1:
- Add recommended get-orig-source target in d/rules.
* d/dirs: Remove, uneeded.
* Switch to maven-debian-helper for build:
- Drop all patches on old Ant build.
- Add maven-debian-helper to B-D.
- Drop ant from B-D.
* Don't Depends on a JRE (not requested anymore by Java Policy for
libraries packages).
Deleted: trunk/libcommons-fileupload-java/debian/ant.properties
===================================================================
--- trunk/libcommons-fileupload-java/debian/ant.properties 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/ant.properties 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,3 +0,0 @@
-build.sysclasspath=only
-ant.build.javac.target=1.4
-ant.build.javac.source=1.4
Modified: trunk/libcommons-fileupload-java/debian/changelog
===================================================================
--- trunk/libcommons-fileupload-java/debian/changelog 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/changelog 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,3 +1,19 @@
+libcommons-fileupload-java (1.2.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * New libcommons-fileupload-java-doc package for Javadoc.
+ * Bump Standards-Version to 3.9.1:
+ - Add recommended get-orig-source target in d/rules.
+ * d/dirs: Remove, uneeded.
+ * Switch to maven-debian-helper for build:
+ - Drop all patches on old Ant build.
+ - Add maven-debian-helper to B-D.
+ - Drop ant from B-D.
+ * Don't Depends on a JRE (not requested anymore by Java Policy for
+ libraries packages).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 04 Aug 2010 13:57:04 +0200
+
libcommons-fileupload-java (1.2.1-5) unstable; urgency=low
* (Build-)Depend on libservlet2.5-java instead of libservlet2.4-java
Modified: trunk/libcommons-fileupload-java/debian/control
===================================================================
--- trunk/libcommons-fileupload-java/debian/control 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/control 2010-08-04 13:24:53 UTC (rev 12860)
@@ -3,18 +3,18 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
-Build-Depends-Indep: libcommons-beanutils-java, libservlet2.5-java, libcommons-io-java,
- libportlet-api-2.0-spec-java, maven-repo-helper
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper
+Build-Depends-Indep: libservlet2.5-java, libcommons-io-java, libportlet-api-2.0-spec-java,
+ maven-repo-helper, libmaven-javadoc-plugin-java
+Standards-Version: 3.9.1
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/
Homepage: http://commons.apache.org/fileupload/
Package: libcommons-fileupload-java
Architecture: all
-Depends: default-jre-headless | java2-runtime-headless, libcommons-beanutils-java, libservlet2.5-java, libcommons-io-java, ${misc:Depends}
-Recommends: libportlet-api-2.0-spec-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
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.
@@ -24,3 +24,18 @@
method, and with a content type of "multipart/form-data", then FileUpload
can parse that request, and make the results available in a manner easily
used by the caller.
+
+Package: libcommons-fileupload-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libcommons-fileupload-java
+Description: Javadoc API documentation for Commons FileUploads
+ FileUpload parses HTTP requests which conform to RFC 1867, "Form-based File
+ Upload in HTML". That is, if an HTTP request is submitted using the POST
+ method, and with a content type of "multipart/form-data", then FileUpload
+ can parse that request, and make the results available in a manner easily
+ used by the caller.
+ .
+ This package contains Javadoc API documentation for Commons FileUpload.
Deleted: trunk/libcommons-fileupload-java/debian/dirs
===================================================================
--- trunk/libcommons-fileupload-java/debian/dirs 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/dirs 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1 +0,0 @@
-usr/share/java
Deleted: trunk/libcommons-fileupload-java/debian/docs
===================================================================
--- trunk/libcommons-fileupload-java/debian/docs 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/docs 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1 +0,0 @@
-dist/docs/*
Added: trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.doc-base
===================================================================
--- trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.doc-base (rev 0)
+++ trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.doc-base 2010-08-04 13:24:53 UTC (rev 12860)
@@ -0,0 +1,10 @@
+Document: libcommons-fileupload-javadoc
+Title: API Javadoc for commons-fileupload
+Author: commons-fileupload developers
+Abstract: This is the API Javadoc provided by the commons-upload library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-fileupload-java/api/index.html
+Files: /usr/share/doc/libcommons-fileupload-java/api/*
+
Added: trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.install
===================================================================
--- trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.install (rev 0)
+++ trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java-doc.install 2010-08-04 13:24:53 UTC (rev 12860)
@@ -0,0 +1 @@
+target/apidocs/* /usr/share/doc/libcommons-fileupload-java/api/
Added: trunk/libcommons-fileupload-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libcommons-fileupload-java/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/libcommons-fileupload-java/debian/maven.cleanIgnoreRules 2010-08-04 13:24:53 UTC (rev 12860)
@@ -0,0 +1,2 @@
+org.apache.maven.plugins maven-assembly-plugin maven-plugin *
+org.apache.maven.plugins maven-release-plugin maven-plugin *
Modified: trunk/libcommons-fileupload-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-fileupload-java/debian/maven.ignoreRules 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/maven.ignoreRules 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,2 +1,6 @@
junit junit maven-plugin *
org.apache.maven.plugins maven-assembly-plugin maven-plugin *
+org.apache.maven.plugins maven-release-plugin maven-plugin *
+org.apache.maven.plugins maven-changes-plugin maven-plugin *
+org.apache.maven.plugins maven-checkstyle-plugin maven-plugin *
+org.apache.maven.plugins maven-pmd-plugin maven-plugin *
Added: trunk/libcommons-fileupload-java/debian/maven.properties
===================================================================
--- trunk/libcommons-fileupload-java/debian/maven.properties (rev 0)
+++ trunk/libcommons-fileupload-java/debian/maven.properties 2010-08-04 13:24:53 UTC (rev 12860)
@@ -0,0 +1 @@
+maven.test.skip = true
Modified: trunk/libcommons-fileupload-java/debian/maven.rules
===================================================================
--- trunk/libcommons-fileupload-java/debian/maven.rules 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/maven.rules 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,2 +1,3 @@
junit junit jar s/3\..*/3.x/
s/portlet-api/javax.portlet/ portlet-api jar s/.*/2.0/
+javax.servlet servlet-api jar s/.*/2.5/
Deleted: 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 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,11 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -94,7 +94,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="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
- </target>
Deleted: trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/02_java13.patch 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/patches/02_java13.patch 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,11 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -77,7 +77,7 @@
- <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>
Deleted: trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,20 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -74,7 +74,7 @@
- </and>
- </condition>
- </target>
-- <target name="compile" description="o Compile the code" depends="get-deps">
-+ <target name="compile" description="o Compile the code">
- <mkdir dir="${classesdir}">
- </mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.3" source="1.3">
-@@ -172,7 +172,7 @@
- </fileset>
- </copy>
- </target>
-- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-+ <target name="javadoc" description="o Generate javadoc">
- <mkdir dir="${javadocdir}">
- </mkdir>
- <tstamp>
Modified: trunk/libcommons-fileupload-java/debian/patches/series
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/series 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/patches/series 2010-08-04 13:24:53 UTC (rev 12860)
@@ -1,3 +0,0 @@
-01-build-jar-without-test-fix.patch
-02_java13.patch
-03_disable-get-deps.patch
Modified: trunk/libcommons-fileupload-java/debian/rules
===================================================================
--- trunk/libcommons-fileupload-java/debian/rules 2010-08-04 03:39:55 UTC (rev 12859)
+++ trunk/libcommons-fileupload-java/debian/rules 2010-08-04 13:24:53 UTC (rev 12860)
@@ -2,19 +2,9 @@
# debian/rules for Commons Fileupload (uses CDBS)
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-DEB_JARS := servlet-api-2.5 commons-io portlet-api
-DEB_ANT_BUILD_TARGET := dist
-
-LIBRARY=commons-fileupload
-
-install/libcommons-fileupload-java::
- mh_installpoms -plibcommons-fileupload-java
- mh_installjar -plibcommons-fileupload-java -l pom.xml dist/$(LIBRARY)-$(DEB_UPSTREAM_VERSION).jar
-
-clean::
- -rm -fr lib
- -rm -rf debian/tmp
+get-orig-source:
+ uscan --force-download --rename
More information about the pkg-java-commits
mailing list