Author: mkoch
Date: 2008-02-14 16:31:14 +0000 (Thu, 14 Feb 2008)
New Revision: 5693
Added:
trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch
trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch
Removed:
trunk/libcommons-fileupload-java/debian/install
trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.links
trunk/libcommons-fileupload-java/debian/links
trunk/libcommons-fileupload-java/debian/patches/00_build_xml_new_line_at_the_end.patch
trunk/libcommons-fileupload-java/debian/patches/02_jikes_1.3.patch
Modified:
trunk/libcommons-fileupload-java/debian/
trunk/libcommons-fileupload-java/debian/changelog
trunk/libcommons-fileupload-java/debian/control
trunk/libcommons-fileupload-java/debian/patches/
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/rules
Log:
libcommons-fileupload-java (1.2.1-1) unstable; urgency=low
[ Michael Koch ]
* New upstream release
* Updated Standards-Version to 3.7.3.
[ Kumar Appaiah ]
* Update watch file.
* debian/control:
+ Add Vcs-{Svn,Browser}.
+ Add Homepage field.
-- Michael Koch <[EMAIL PROTECTED]> Thu, 14 Feb 2008 17:41:57 +0100
Property changes on: trunk/libcommons-fileupload-java/debian
___________________________________________________________________
Name: svn:ignore
+ files
libcommons-fileupload-java
stamp-*
Modified: trunk/libcommons-fileupload-java/debian/changelog
===================================================================
--- trunk/libcommons-fileupload-java/debian/changelog 2008-02-14 15:25:24 UTC
(rev 5692)
+++ trunk/libcommons-fileupload-java/debian/changelog 2008-02-14 16:31:14 UTC
(rev 5693)
@@ -1,12 +1,17 @@
-libcommons-fileupload-java (1.2-3) UNRELEASED; urgency=low
+libcommons-fileupload-java (1.2.1-1) unstable; urgency=low
+ [ Michael Koch ]
+ * New upstream release
+ * Updated Standards-Version to 3.7.3.
+
+ [ Kumar Appaiah ]
* Update watch file.
* debian/control:
- + Add XS-Vcs-{Svn,Browser}.
+ + Add Vcs-{Svn,Browser}.
+ Add Homepage field.
-
- -- Kumar Appaiah <[EMAIL PROTECTED]> Thu, 20 Sep 2007 20:32:11 +0530
+ -- Michael Koch <[EMAIL PROTECTED]> Thu, 14 Feb 2008 17:41:57 +0100
+
libcommons-fileupload-java (1.2-2) unstable; urgency=low
* Added Depends on libcommons-io-java. Closes: #439860.
Modified: trunk/libcommons-fileupload-java/debian/control
===================================================================
--- trunk/libcommons-fileupload-java/debian/control 2008-02-14 15:25:24 UTC
(rev 5692)
+++ trunk/libcommons-fileupload-java/debian/control 2008-02-14 16:31:14 UTC
(rev 5693)
@@ -5,9 +5,9 @@
Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>
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
-XS-Vcs-Svn:
svn://svn.debian.org/svn/pkg-java/trunk/libcommons-libcommons-fileupload-java-java
-XS-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-libcommons-fileupload-java-java
+Standards-Version: 3.7.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
Package: libcommons-fileupload-java
@@ -22,5 +22,3 @@
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.
- .
- Homepage: http://jakarta.apache.org/commons/fileupload/
Deleted: trunk/libcommons-fileupload-java/debian/install
===================================================================
--- trunk/libcommons-fileupload-java/debian/install 2008-02-14 15:25:24 UTC
(rev 5692)
+++ trunk/libcommons-fileupload-java/debian/install 2008-02-14 16:31:14 UTC
(rev 5693)
@@ -1 +0,0 @@
-dist/commons-fileupload-1.0.jar usr/share/java
Deleted:
trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.links
===================================================================
--- trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.links
2008-02-14 15:25:24 UTC (rev 5692)
+++ trunk/libcommons-fileupload-java/debian/libcommons-fileupload-java.links
2008-02-14 16:31:14 UTC (rev 5693)
@@ -1 +0,0 @@
-usr/share/java/commons-fileupload-1.0.jar usr/share/java/commons-fileupload.jar
Deleted: trunk/libcommons-fileupload-java/debian/links
===================================================================
--- trunk/libcommons-fileupload-java/debian/links 2008-02-14 15:25:24 UTC
(rev 5692)
+++ trunk/libcommons-fileupload-java/debian/links 2008-02-14 16:31:14 UTC
(rev 5693)
@@ -1 +0,0 @@
-/usr/share/java/commons-fileupload-1.0.jar
/usr/share/java/commons-fileupload.jar
Property changes on: trunk/libcommons-fileupload-java/debian/patches
___________________________________________________________________
Name: svn:ignore
+ *.log
Deleted:
trunk/libcommons-fileupload-java/debian/patches/00_build_xml_new_line_at_the_end.patch
===================================================================
---
trunk/libcommons-fileupload-java/debian/patches/00_build_xml_new_line_at_the_end.patch
2008-02-14 15:25:24 UTC (rev 5692)
+++
trunk/libcommons-fileupload-java/debian/patches/00_build_xml_new_line_at_the_end.patch
2008-02-14 16:31:14 UTC (rev 5693)
@@ -1,9 +0,0 @@
---- build.xml.orig 2003-06-26 08:12:13.000000000 +0200
-+++ build.xml 2005-08-20 20:06:29.000000000 +0200
-@@ -156,4 +156,4 @@
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
--</project>
-\ No newline at end of file
-+</project>
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
2008-02-14 15:25:24 UTC (rev 5692)
+++
trunk/libcommons-fileupload-java/debian/patches/01-build-jar-without-test-fix.patch
2008-02-14 16:31:14 UTC (rev 5693)
@@ -1,11 +1,11 @@
---- 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 @@
+--- 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 @@
</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>
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ </jar>
</target>
- <target name="clean" description="o Clean up the generated directories">
Modified: trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
2008-02-14 15:25:24 UTC (rev 5692)
+++ trunk/libcommons-fileupload-java/debian/patches/02_java13.patch
2008-02-14 16:31:14 UTC (rev 5693)
@@ -1,11 +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>
+--- build.xml.orig 2008-02-14 16:52:16.000000000 +0100
++++ build.xml 2008-02-14 16:52:49.000000000 +0100
+@@ -77,7 +77,7 @@
+ <target name="compile" description="o Compile the code">
+ <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>
+ <pathelement location="${basedir}/src/java">
+ </pathelement>
Deleted: trunk/libcommons-fileupload-java/debian/patches/02_jikes_1.3.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/02_jikes_1.3.patch
2008-02-14 15:25:24 UTC (rev 5692)
+++ trunk/libcommons-fileupload-java/debian/patches/02_jikes_1.3.patch
2008-02-14 16:31:14 UTC (rev 5693)
@@ -1,11 +0,0 @@
---- build.xml.orig 2004-09-14 13:10:34.891222904 +0200
-+++ build.xml 2004-09-14 13:10:56.852884224 +0200
-@@ -33,7 +33,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" source="1.3">
- <src>
- <pathelement location="src/java">
- </pathelement>
Added: trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch
(rev 0)
+++ trunk/libcommons-fileupload-java/debian/patches/03_disable-get-deps.patch
2008-02-14 16:31:14 UTC (rev 5693)
@@ -0,0 +1,20 @@
+--- libcommons-fileupload-java-1.2.1.orig/build.xml
++++ libcommons-fileupload-java-1.2.1/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">
+@@ -172,7 +173,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>
Added: trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch
===================================================================
--- trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch
(rev 0)
+++ trunk/libcommons-fileupload-java/debian/patches/04_disable-portlet.patch
2008-02-14 16:31:14 UTC (rev 5693)
@@ -0,0 +1,10 @@
+--- 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>
Modified: trunk/libcommons-fileupload-java/debian/rules
===================================================================
--- trunk/libcommons-fileupload-java/debian/rules 2008-02-14 15:25:24 UTC
(rev 5692)
+++ trunk/libcommons-fileupload-java/debian/rules 2008-02-14 16:31:14 UTC
(rev 5693)
@@ -13,8 +13,7 @@
LIBRARY=commons-fileupload
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_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
clean::
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
