[pkg-java] r11977 - in trunk/libcommons-fileupload-java/debian: . patches source
Damien Raude-Morvan
drazzib at alioth.debian.org
Tue Mar 30 23:02:15 UTC 2010
Author: drazzib
Date: 2010-03-30 23:02:11 +0000 (Tue, 30 Mar 2010)
New Revision: 11977
Added:
trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.poms
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/source/
trunk/libcommons-fileupload-java/debian/source/format
Removed:
trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch
Modified:
trunk/libcommons-fileupload-java/debian/changelog
trunk/libcommons-fileupload-java/debian/compat
trunk/libcommons-fileupload-java/debian/control
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
trunk/libcommons-fileupload-java/debian/rules
Log:
* Remove Arnaud from Uploaders.
* Add myself
* Bump Standards-Version to 3.8.4: no changes needed
* Bump debhelper to >= 7
* Remove version criteria from cdbs B-D (even stable match version)
* Compile portlet part:
- Remove debian/patches/04_disable-portlet.patch
- Add B-D-I on libportlet-api-2.0-spec-java
* Convert to source format 3.0 (quilt)
- Refresh all patches
- Add DEP3 headers to patches
* Register in maven repository:
- B-D-I on maven-repo-helper
- Use mh_installpoms and mh_installjar
Modified: trunk/libcommons-fileupload-java/debian/changelog
===================================================================
--- trunk/libcommons-fileupload-java/debian/changelog 2010-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/changelog 2010-03-30 23:02:11 UTC (rev 11977)
@@ -1,10 +1,27 @@
libcommons-fileupload-java (1.2.1-4) UNRELEASED; urgency=low
+ [ Thierry Carrez ]
* Minimal dependency on default-jre-headless | java2-runtime-headless
* debian/ant.properties: Force Java2 code to match dependency
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Thu, 12 Nov 2009 11:21:01 +0100
+ [ Damien Raude-Morvan ]
+ * Remove Arnaud from Uploaders.
+ * Add myself
+ * Bump Standards-Version to 3.8.4: no changes needed
+ * Bump debhelper to >= 7
+ * Remove version criteria from cdbs B-D (even stable match version)
+ * Compile portlet part:
+ - Remove debian/patches/04_disable-portlet.patch
+ - Add B-D-I on libportlet-api-2.0-spec-java
+ * Convert to source format 3.0 (quilt)
+ - Refresh all patches
+ - Add DEP3 headers to patches
+ * Register in maven repository:
+ - B-D-I on maven-repo-helper
+ - Use mh_installpoms and mh_installjar
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 30 Mar 2010 23:58:28 +0200
+
libcommons-fileupload-java (1.2.1-3) unstable; urgency=low
* (Build-)Depends on default-jdk.
Modified: trunk/libcommons-fileupload-java/debian/compat
===================================================================
--- trunk/libcommons-fileupload-java/debian/compat 2010-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/compat 2010-03-30 23:02:11 UTC (rev 11977)
@@ -1 +1 @@
-5
+7
Modified: trunk/libcommons-fileupload-java/debian/control
===================================================================
--- trunk/libcommons-fileupload-java/debian/control 2010-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/control 2010-03-30 23:02:11 UTC (rev 11977)
@@ -2,17 +2,19 @@
Section: java
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), 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
-Homepage: http://commons.apache.org/fileupload
+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.4-java, libcommons-io-java,
+ libportlet-api-2.0-spec-java, maven-repo-helper
+Standards-Version: 3.8.4
+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.4-java, libcommons-io-java, ${misc:Depends}
+Recommends: libportlet-api-2.0-spec-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.
Added: trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.poms
===================================================================
--- trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.poms (rev 0)
+++ trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.poms 2010-03-30 23:02:11 UTC (rev 11977)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/libcommons-fileupload-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-fileupload-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libcommons-fileupload-java/debian/maven.ignoreRules 2010-03-30 23:02:11 UTC (rev 11977)
@@ -0,0 +1,2 @@
+junit junit maven-plugin *
+org.apache.maven.plugins maven-assembly-plugin maven-plugin *
Added: trunk/libcommons-fileupload-java/debian/maven.rules
===================================================================
--- trunk/libcommons-fileupload-java/debian/maven.rules (rev 0)
+++ trunk/libcommons-fileupload-java/debian/maven.rules 2010-03-30 23:02:11 UTC (rev 11977)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+s/portlet-api/javax.portlet/ portlet-api jar s/.*/2.0/
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 2010-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch 2010-03-30 23:02:11 UTC (rev 11977)
@@ -1,6 +1,6 @@
---- build.xml.orig 2008-02-14 16:50:47.000000000 +0100
-+++ build.xml 2008-02-14 16:50:59.000000000 +0100
-@@ -95,7 +95,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -94,7 +94,7 @@
</fileset>
</copy>
</target>
Modified: trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/02_java13.patch 2010-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/patches/02_java13.patch 2010-03-30 23:02:11 UTC (rev 11977)
@@ -1,7 +1,7 @@
---- build.xml.orig 2008-02-14 16:52:16.000000000 +0100
-+++ build.xml 2008-02-14 16:52:49.000000000 +0100
+--- a/build.xml
++++ b/build.xml
@@ -77,7 +77,7 @@
- <target name="compile" description="o Compile the code">
+ <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">
Modified: trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch 2010-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch 2010-03-30 23:02:11 UTC (rev 11977)
@@ -1,5 +1,5 @@
---- libcommons-fileupload-java-1.2.1.orig/build.xml
-+++ libcommons-fileupload-java-1.2.1/build.xml
+--- a/build.xml
++++ b/build.xml
@@ -74,7 +74,7 @@
</and>
</condition>
@@ -8,8 +8,8 @@
+ <target name="compile" description="o Compile the code">
<mkdir dir="${classesdir}">
</mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-@@ -172,7 +173,7 @@
+ <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>
Deleted: trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch 2010-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch 2010-03-30 23:02:11 UTC (rev 11977)
@@ -1,10 +0,0 @@
---- libcommons-fileupload-java-1.2.1.orig/build.xml
-+++ libcommons-fileupload-java-1.2.1/build.xml
-@@ -84,6 +84,7 @@
- </src>
- <classpath refid="build.classpath">
- </classpath>
-+ <exclude name="**/portlet/*.java"/>
- </javac>
- <mkdir dir="${classesdir}/META-INF">
- </mkdir>
Added: trunk/libcommons-fileupload-java/debian/patches/series
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/series (rev 0)
+++ trunk/libcommons-fileupload-java/debian/patches/series 2010-03-30 23:02:11 UTC (rev 11977)
@@ -0,0 +1,3 @@
+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-03-30 23:01:29 UTC (rev 11976)
+++ trunk/libcommons-fileupload-java/debian/rules 2010-03-30 23:02:11 UTC (rev 11977)
@@ -3,18 +3,18 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-DEB_JARS := servlet-api-2.4 commons-io
+DEB_JARS := servlet-api-2.4 commons-io portlet-api_2.0_spec
DEB_ANT_BUILD_TARGET := dist
LIBRARY=commons-fileupload
install/libcommons-fileupload-java::
- dh_install -plibcommons-fileupload-java dist/$(LIBRARY)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java
- dh_link -plibcommons-fileupload-java /usr/share/java/$(LIBRARY)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(LIBRARY).jar
+ 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
Added: trunk/libcommons-fileupload-java/debian/source/format
===================================================================
--- trunk/libcommons-fileupload-java/debian/source/format (rev 0)
+++ trunk/libcommons-fileupload-java/debian/source/format 2010-03-30 23:02:11 UTC (rev 11977)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list