Author: drazzib Date: 2011-09-11 00:18:02 +0000 (Sun, 11 Sep 2011) New Revision: 14808
Added: tags/commons-vfs/2.0-1/ tags/commons-vfs/2.0-1/debian/changelog tags/commons-vfs/2.0-1/debian/control tags/commons-vfs/2.0-1/debian/copyright tags/commons-vfs/2.0-1/debian/docs tags/commons-vfs/2.0-1/debian/libcommons-vfs-java-doc.install tags/commons-vfs/2.0-1/debian/libcommons-vfs-java.poms tags/commons-vfs/2.0-1/debian/maven.ignoreRules tags/commons-vfs/2.0-1/debian/maven.properties tags/commons-vfs/2.0-1/debian/maven.rules tags/commons-vfs/2.0-1/debian/patches/disable_webdav_provider.diff tags/commons-vfs/2.0-1/debian/patches/series tags/commons-vfs/2.0-1/debian/patches/skip_examples.diff tags/commons-vfs/2.0-1/debian/rules Removed: tags/commons-vfs/2.0-1/debian/changelog tags/commons-vfs/2.0-1/debian/control tags/commons-vfs/2.0-1/debian/copyright tags/commons-vfs/2.0-1/debian/docs tags/commons-vfs/2.0-1/debian/libcommons-vfs-java-doc.install tags/commons-vfs/2.0-1/debian/libcommons-vfs-java.poms tags/commons-vfs/2.0-1/debian/maven.rules tags/commons-vfs/2.0-1/debian/patches/01_build-xml-nodownload.diff tags/commons-vfs/2.0-1/debian/patches/02_no_home_dir.diff tags/commons-vfs/2.0-1/debian/patches/series tags/commons-vfs/2.0-1/debian/rules Log: [svn-buildpackage] Tagging commons-vfs 2.0-1 Deleted: tags/commons-vfs/2.0-1/debian/changelog =================================================================== --- trunk/commons-vfs/debian/changelog 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/changelog 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,85 +0,0 @@ -commons-vfs (1.0-6) unstable; urgency=low - - * Team upload - - [ Damien Raude-Morvan ] - * d/control: Drop Depends on any JRE as a Java library don't need to - depends on a runtime (Java Policy) - - [ Torsten Werner ] - * Change 'maintainers' into 'Maintainers'. - * Update Standard-Version: 3.9.1. - * Switch to source format 3.0. - - -- Torsten Werner <[email protected]> Tue, 30 Aug 2011 16:56:07 +0200 - -commons-vfs (1.0-5) unstable; urgency=low - - * debian/maven.rules: - - fix jdom groupId to org.jdom - - use 3.x release of commons-httpclient - - use 1.x release of commons-net - * Update my email address - * Bump debhelper version to >= 7 - - -- Damien Raude-Morvan <[email protected]> Sat, 12 Dec 2009 22:02:48 +0100 - -commons-vfs (1.0-4) unstable; urgency=low - - * Set Maintainer field to Debian Java Team - * Add myself as Uploaders - * Add ${misc:Depends} in Depends field for debhelper - * Bump Standards-Version 3.8.3: - - Move libcommons-vfs-java to "java" section - - Add a README.source describing patch system - * Switch to Quilt patch system: - - Refresh all patchs - - Add B-D on quilt - - Include patchsys-quilt.mk in debian/rules - * New patch 02_no_home_dir.diff: don't try to create/copy files - in $HOME as many autobuilder won't have one - * Use default-jdk/jre: - - Depends on default-jre-headless instead of java-gcj-compat - - Build-Depends on default-jdk instead of default-jdk-builddep - because we don't build a native GCJ package. - * Maven POMs: - - Add a Build-Depends-Indep dependency on maven-repo-helper - - Use mh_installpom and mh_installjar to install the POM and the jar to the - Maven repository - * Move api documentation to /usr/share/doc/libcommons-vfs-java/api - - -- Damien Raude-Morvan <[email protected]> Sun, 23 Aug 2009 00:52:26 +0200 - -commons-vfs (1.0-3) unstable; urgency=low - - * debian/control: - - Build-Depend on default-jdk-builddep instead of java-gcj-compat-dev. - - Move default-jdk-builddep form B-D-I to B-D (needed for clean) - - Differentiate short description of -doc package - * debian/rules: Use default-java from default-jdk-builddep as JAVA_HOME - * Move examples (sample source code) to libcommons-vfs-java-doc package - - -- Damien Raude-Morvan <[email protected]> Sun, 30 Nov 2008 13:11:05 +0100 - -commons-vfs (1.0-2) unstable; urgency=low - - * debian/rules: - - Include examples/ in libcommons-vfs-java - - Install Javadoc API in /usr/share/doc/libcommons-vfs-java-doc - - Use CDBS DEB_SOURCE_PACKAGE and DEB_UPSTREAM_VERSION instead of using - dpkg-parsechangelog - - get-orig-source: use --force-download for uscan - - include simple-patchsys.mk rules before ant.mk class - * debian/control: - - Remove depends on java1-runtime as commons-vfs only works - with Java >= 1.4 - * debian/copyright: Relicense debian packaging under BSD - * debian/dirs: Removed because dirs are created by dh_install - - -- Damien Raude-Morvan <[email protected]> Sun, 10 Aug 2008 21:55:32 +0200 - -commons-vfs (1.0-1) unstable; urgency=low - - * Initial release (closes: #238904). - - -- Damien Raude-Morvan <[email protected]> Wed, 16 Jul 2008 21:56:34 +0200 Copied: tags/commons-vfs/2.0-1/debian/changelog (from rev 14803, trunk/commons-vfs/debian/changelog) =================================================================== --- tags/commons-vfs/2.0-1/debian/changelog (rev 0) +++ tags/commons-vfs/2.0-1/debian/changelog 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,103 @@ +commons-vfs (2.0-1) unstable; urgency=low + + * New upstream release: + - Drop all previous patches. + - d/control: Build-Depends on libcommons-net2-java, junit4, + libcommons-compress-java. + * Bump Standards-Version 3.9.2: no changes needed. + * d/copyright: Use DEP-5 format. + * Switch to Maven build system: + - d/patches/skip_examples.diff: Don't build examples module. + - d/patches/disable_webdav_provider.diff: Disable webdav provider. + - Drop B-D on ant, but add B-D on maven-debian-helper + - Use ${maven:Depends} and ${maven:OptionalDepends} for Depends + and Recommends. + * d/docs: Update for new release. + + -- Damien Raude-Morvan <[email protected]> Sun, 11 Sep 2011 00:44:27 +0200 + +commons-vfs (1.0-6) unstable; urgency=low + + * Team upload + + [ Damien Raude-Morvan ] + * d/control: Drop Depends on any JRE as a Java library don't need to + depends on a runtime (Java Policy) + + [ Torsten Werner ] + * Change 'maintainers' into 'Maintainers'. + * Update Standard-Version: 3.9.1. + * Switch to source format 3.0. + + -- Torsten Werner <[email protected]> Tue, 30 Aug 2011 16:56:07 +0200 + +commons-vfs (1.0-5) unstable; urgency=low + + * debian/maven.rules: + - fix jdom groupId to org.jdom + - use 3.x release of commons-httpclient + - use 1.x release of commons-net + * Update my email address + * Bump debhelper version to >= 7 + + -- Damien Raude-Morvan <[email protected]> Sat, 12 Dec 2009 22:02:48 +0100 + +commons-vfs (1.0-4) unstable; urgency=low + + * Set Maintainer field to Debian Java Team + * Add myself as Uploaders + * Add ${misc:Depends} in Depends field for debhelper + * Bump Standards-Version 3.8.3: + - Move libcommons-vfs-java to "java" section + - Add a README.source describing patch system + * Switch to Quilt patch system: + - Refresh all patchs + - Add B-D on quilt + - Include patchsys-quilt.mk in debian/rules + * New patch 02_no_home_dir.diff: don't try to create/copy files + in $HOME as many autobuilder won't have one + * Use default-jdk/jre: + - Depends on default-jre-headless instead of java-gcj-compat + - Build-Depends on default-jdk instead of default-jdk-builddep + because we don't build a native GCJ package. + * Maven POMs: + - Add a Build-Depends-Indep dependency on maven-repo-helper + - Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Move api documentation to /usr/share/doc/libcommons-vfs-java/api + + -- Damien Raude-Morvan <[email protected]> Sun, 23 Aug 2009 00:52:26 +0200 + +commons-vfs (1.0-3) unstable; urgency=low + + * debian/control: + - Build-Depend on default-jdk-builddep instead of java-gcj-compat-dev. + - Move default-jdk-builddep form B-D-I to B-D (needed for clean) + - Differentiate short description of -doc package + * debian/rules: Use default-java from default-jdk-builddep as JAVA_HOME + * Move examples (sample source code) to libcommons-vfs-java-doc package + + -- Damien Raude-Morvan <[email protected]> Sun, 30 Nov 2008 13:11:05 +0100 + +commons-vfs (1.0-2) unstable; urgency=low + + * debian/rules: + - Include examples/ in libcommons-vfs-java + - Install Javadoc API in /usr/share/doc/libcommons-vfs-java-doc + - Use CDBS DEB_SOURCE_PACKAGE and DEB_UPSTREAM_VERSION instead of using + dpkg-parsechangelog + - get-orig-source: use --force-download for uscan + - include simple-patchsys.mk rules before ant.mk class + * debian/control: + - Remove depends on java1-runtime as commons-vfs only works + with Java >= 1.4 + * debian/copyright: Relicense debian packaging under BSD + * debian/dirs: Removed because dirs are created by dh_install + + -- Damien Raude-Morvan <[email protected]> Sun, 10 Aug 2008 21:55:32 +0200 + +commons-vfs (1.0-1) unstable; urgency=low + + * Initial release (closes: #238904). + + -- Damien Raude-Morvan <[email protected]> Wed, 16 Jul 2008 21:56:34 +0200 Deleted: tags/commons-vfs/2.0-1/debian/control =================================================================== --- trunk/commons-vfs/debian/control 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/control 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,40 +0,0 @@ -Source: commons-vfs -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends-Indep: ant-optional, junit, libcommons-net-java, libcommons-logging-java, - libcommons-httpclient-java, libcommons-collections3-java, libjsch-java, maven-repo-helper -Build-Depends: ant, debhelper (>= 7), cdbs, default-jdk -Standards-Version: 3.9.1 -Homepage: http://commons.apache.org/vfs/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-vfs -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-vfs - -Package: libcommons-vfs-java -Architecture: all -Depends: ${misc:Depends}, libcommons-logging-java -Recommends: libcommons-net-java, libcommons-httpclient-java, libcommons-collections3-java, libjsch-java -Suggests: libcommons-vfs-java-doc -Description: Java API for accessing various filesystems - Commons VFS provides a single API for accessing various different file - systems. It presents a uniform view of the files from various different - sources, such as the files on local disk, on an HTTP server, or inside - a Zip archive. - . - This is a part of the Apache Commons Project. - -Package: libcommons-vfs-java-doc -Architecture: all -Section: doc -Depends: ${misc:Depends} -Suggests: libcommons-vfs-java -Description: Java API for accessing various filesystems - documentation - Commons VFS provides a single API for accessing various different file - systems. It presents a uniform view of the files from various different - sources, such as the files on local disk, on an HTTP server, or inside - a Zip archive. - . - This is a part of the Apache Commons Project. - . - This package provides the API documentation for Commons VFS. Copied: tags/commons-vfs/2.0-1/debian/control (from rev 14803, trunk/commons-vfs/debian/control) =================================================================== --- tags/commons-vfs/2.0-1/debian/control (rev 0) +++ tags/commons-vfs/2.0-1/debian/control 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,54 @@ +Source: commons-vfs +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Damien Raude-Morvan <[email protected]> +Build-Depends-Indep: ant-doc, + junit4, + libcommons-collections3-java, + libcommons-collections3-java-doc, + libcommons-compress-java, + libcommons-httpclient-java, + libcommons-httpclient-java-doc, + libcommons-logging-java, + libcommons-logging-java-doc, + libcommons-net2-java, + libcommons-net2-java-doc, + libjdom1-java-doc, + libjsch-java, + libmaven-antrun-plugin-java, + libmaven-javadoc-plugin-java +Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper +Standards-Version: 3.9.2 +Homepage: http://commons.apache.org/vfs/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-vfs +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-vfs + +Package: libcommons-vfs-java +Architecture: all +Depends: ${maven:Depends}, ${misc:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libcommons-vfs-java-doc +Description: Java API for accessing various filesystems + Commons VFS provides a single API for accessing various different file + systems. It presents a uniform view of the files from various different + sources, such as the files on local disk, on an HTTP server, or inside + a Zip archive. + . + This is a part of the Apache Commons Project. + +Package: libcommons-vfs-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: default-jdk-doc +Suggests: libcommons-vfs-java +Description: Java API for accessing various filesystems - documentation + Commons VFS provides a single API for accessing various different file + systems. It presents a uniform view of the files from various different + sources, such as the files on local disk, on an HTTP server, or inside + a Zip archive. + . + This is a part of the Apache Commons Project. + . + This package provides the API documentation for Commons VFS. Deleted: tags/commons-vfs/2.0-1/debian/copyright =================================================================== --- trunk/commons-vfs/debian/copyright 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/copyright 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,22 +0,0 @@ -This package was debianized by Damien Raude-Morvan <[email protected]> - -It was downloaded from http://commons.apache.org/vfs - -Upstream Authors: Adam Murdoch <[email protected]> - James Strachan <[email protected]> - Mario Ivankovits <[email protected]> - Rahul Akolkar <[email protected]> - Rami Ojares <[email protected]> - Anthony Goubard <[email protected]> - Christopher Ottley <[email protected]> - -Copyright: © 2002-2008 The Apache Software Foundation - -License: Apache 2.0 - -On Debian systems the full text of the Apache License can be found -in `/usr/share/common-licenses/Apache-2.0'. - -The Debian packaging is -Copyright (C) 2008, Damien Raude-Morvan <[email protected]> -and is licensed under the BSD, see `/usr/share/common-licenses/BSD'. Copied: tags/commons-vfs/2.0-1/debian/copyright (from rev 14803, trunk/commons-vfs/debian/copyright) =================================================================== --- tags/commons-vfs/2.0-1/debian/copyright (rev 0) +++ tags/commons-vfs/2.0-1/debian/copyright 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,24 @@ +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: Apache Commons VFS +Upstream-Contact: http://commons.apache.org/vfs/ +Source: http://www.apache.org/dist/commons/vfs/ +Comment: + Upstream Authors: Adam Murdoch <[email protected]> + James Strachan <[email protected]> + Mario Ivankovits <[email protected]> + Rahul Akolkar <[email protected]> + Rami Ojares <[email protected]> + Anthony Goubard <[email protected]> + Christopher Ottley <[email protected]> + +Files: * +Copyright: Copyright 2002-2011 The Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: Copyright (C) 2008-2011, Damien Raude-Morvan <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems the full text of the Apache License can be found + in `/usr/share/common-licenses/Apache-2.0'. Deleted: tags/commons-vfs/2.0-1/debian/docs =================================================================== --- trunk/commons-vfs/debian/docs 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/docs 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,2 +0,0 @@ -NOTICE.txt -RELEASE_NOTES.txt Copied: tags/commons-vfs/2.0-1/debian/docs (from rev 14803, trunk/commons-vfs/debian/docs) =================================================================== --- tags/commons-vfs/2.0-1/debian/docs (rev 0) +++ tags/commons-vfs/2.0-1/debian/docs 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,3 @@ +RELEASE-NOTES.txt +README.txt +NOTICE.txt Deleted: tags/commons-vfs/2.0-1/debian/libcommons-vfs-java-doc.install =================================================================== --- trunk/commons-vfs/debian/libcommons-vfs-java-doc.install 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/libcommons-vfs-java-doc.install 2011-09-11 00:18:02 UTC (rev 14808) @@ -1 +0,0 @@ -dist/docs/api /usr/share/doc/libcommons-vfs-java/ Copied: tags/commons-vfs/2.0-1/debian/libcommons-vfs-java-doc.install (from rev 14803, trunk/commons-vfs/debian/libcommons-vfs-java-doc.install) =================================================================== --- tags/commons-vfs/2.0-1/debian/libcommons-vfs-java-doc.install (rev 0) +++ tags/commons-vfs/2.0-1/debian/libcommons-vfs-java-doc.install 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1 @@ +target/site/apidocs/* /usr/share/doc/libcommons-vfs-java/api/ Deleted: tags/commons-vfs/2.0-1/debian/libcommons-vfs-java.poms =================================================================== --- trunk/commons-vfs/debian/libcommons-vfs-java.poms 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/libcommons-vfs-java.poms 2011-09-11 00:18:02 UTC (rev 14808) @@ -1 +0,0 @@ -core/pom.xml --no-parent Copied: tags/commons-vfs/2.0-1/debian/libcommons-vfs-java.poms (from rev 14803, trunk/commons-vfs/debian/libcommons-vfs-java.poms) =================================================================== --- tags/commons-vfs/2.0-1/debian/libcommons-vfs-java.poms (rev 0) +++ tags/commons-vfs/2.0-1/debian/libcommons-vfs-java.poms 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,4 @@ +pom.xml --no-parent +examples/pom.xml +core/pom.xml +dist/pom.xml --ignore Copied: tags/commons-vfs/2.0-1/debian/maven.ignoreRules (from rev 14803, trunk/commons-vfs/debian/maven.ignoreRules) =================================================================== --- tags/commons-vfs/2.0-1/debian/maven.ignoreRules (rev 0) +++ tags/commons-vfs/2.0-1/debian/maven.ignoreRules 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,22 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +org.codehaus.mojo findbugs-maven-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-changes-plugin * * * * +org.apache.commons commons-build-plugin * * * * + +org.apache.jackrabbit jackrabbit-webdav * * * * \ No newline at end of file Copied: tags/commons-vfs/2.0-1/debian/maven.properties (from rev 14803, trunk/commons-vfs/debian/maven.properties) =================================================================== --- tags/commons-vfs/2.0-1/debian/maven.properties (rev 0) +++ tags/commons-vfs/2.0-1/debian/maven.properties 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,4 @@ +maven.test.skip=true + +maven.compiler.source=1.5 +maven.compiler.target=1.5 Deleted: tags/commons-vfs/2.0-1/debian/maven.rules =================================================================== --- trunk/commons-vfs/debian/maven.rules 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/maven.rules 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,6 +0,0 @@ -junit junit jar s/3\..*/3.x/ -s/ant/org.apache.ant/ * * s/.*/debian/ -commons-collections commons-collections jar s/3\..*/3.x/ -s/jdom/org.jdom/ * * s/.*/debian/ -commons-httpclient commons-httpclient jar s/.*/3.x/ -commons-net commons-net jar s/1\..*/1.x/ Copied: tags/commons-vfs/2.0-1/debian/maven.rules (from rev 14803, trunk/commons-vfs/debian/maven.rules) =================================================================== --- tags/commons-vfs/2.0-1/debian/maven.rules (rev 0) +++ tags/commons-vfs/2.0-1/debian/maven.rules 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,6 @@ +junit junit jar s/4\..*/4.x/ +s/ant/org.apache.ant/ * * s/.*/debian/ +commons-collections commons-collections jar s/3\..*/3.x/ +s/jdom/org.jdom/ * * s/.*/debian/ +commons-httpclient commons-httpclient jar s/.*/3.x/ +commons-net commons-net jar s/2\..*/2.x/ Deleted: tags/commons-vfs/2.0-1/debian/patches/01_build-xml-nodownload.diff =================================================================== --- trunk/commons-vfs/debian/patches/01_build-xml-nodownload.diff 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/patches/01_build-xml-nodownload.diff 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,96 +0,0 @@ -Description: Adapt build.xml file to Debian packaging - - Remove build.classpath variable - - Remove get.deps target -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed -Origin: vendor -Last-Update: 2009-07-16 ---- a/build.xml -+++ b/build.xml -@@ -36,32 +36,6 @@ - </property> - <property name="proxy.password" value=""> - </property> -- <path id="build.classpath"> -- <pathelement location="${libdir}/ant/jars/ant-1.6.2.jar"> -- </pathelement> -- <pathelement location="${libdir}/commons-net/jars/commons-net-1.4.1.jar"> -- </pathelement> -- <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.4.jar"> -- </pathelement> -- <pathelement location="${libdir}/commons-collections/jars/commons-collections-3.1.jar"> -- </pathelement> -- <pathelement location="${libdir}/jcifs/jars/jcifs-0.8.3.jar"> -- </pathelement> -- <pathelement location="${libdir}/slide/jars/jakarta-slide-webdavlib-20050629.161100.jar"> -- </pathelement> -- <pathelement location="${libdir}/jdom/jars/jdom-1.0.jar"> -- </pathelement> -- <pathelement location="${libdir}/commons-httpclient/jars/commons-httpclient-2.0.2.jar"> -- </pathelement> -- <pathelement location="${libdir}/com.jcraft/jars/jsch-0.1.23.jar"> -- </pathelement> -- <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar"> -- </pathelement> -- <pathelement location="${libdir}/oro/jars/oro-2.0.8.jar"> -- </pathelement> -- <pathelement location="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar"> -- </pathelement> -- </path> - <target name="init" description="o Initializes some properties"> - <mkdir dir="${libdir}"> - </mkdir> -@@ -86,7 +60,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"> -@@ -94,8 +68,6 @@ - <pathelement location="${basedir}/core/src/main/java"> - </pathelement> - </src> -- <classpath refid="build.classpath"> -- </classpath> - </javac> - <copy todir="${classesdir}"> - <fileset dir="${basedir}/core/src/main/java"> -@@ -151,8 +123,6 @@ - <formatter usefile="false" type="plain"> - </formatter> - <classpath> -- <path refid="build.classpath"> -- </path> - <pathelement path="${testclassesdir}"> - </pathelement> - <pathelement path="${classesdir}"> -@@ -184,14 +154,12 @@ - </pathelement> - </src> - <classpath> -- <path refid="build.classpath"> -- </path> - <pathelement path="${classesdir}"> - </pathelement> - </classpath> - </javac> - </target> -- <target name="javadoc" description="o Generate javadoc" depends="get-deps"> -+ <target name="javadoc" description="o Generate javadoc"> - <mkdir dir="${javadocdir}"> - </mkdir> - <tstamp> -@@ -203,10 +171,6 @@ - <property name="title" value="Commons VFS 1.0 API"> - </property> - <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/core/src/main/java" packagenames="org.apache.commons.vfs.*"> -- <classpath> -- <path refid="build.classpath"> -- </path> -- </classpath> - </javadoc> - </target> - <target name="get-dep-ant.jar" description="o Download the dependency : ant.jar" unless="ant.jar" depends="init,setProxy,noProxy,get-custom-dep-ant.jar"> Deleted: tags/commons-vfs/2.0-1/debian/patches/02_no_home_dir.diff =================================================================== --- trunk/commons-vfs/debian/patches/02_no_home_dir.diff 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/patches/02_no_home_dir.diff 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,32 +0,0 @@ -Description: (build.xml) Don't use user.home as many buildd - don't have a $HOME directory -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed -Origin: vendor -Last-Update: 2009-07-16 ---- a/build.xml -+++ b/build.xml -@@ -8,14 +8,10 @@ - - <property file="build.properties"> - </property> -- <property file="${user.home}/build.properties"> -- </property> - <!--Build properties--> - - <property name="defaulttargetdir" value="${basedir}/target"> - </property> -- <property name="libdir" value="${user.home}/.maven/repository"> -- </property> - <property name="classesdir" value="${basedir}/target/classes"> - </property> - <property name="testclassesdir" value="${basedir}/target/test-classes"> -@@ -37,8 +33,6 @@ - <property name="proxy.password" value=""> - </property> - <target name="init" description="o Initializes some properties"> -- <mkdir dir="${libdir}"> -- </mkdir> - <condition property="noget"> - <equals arg2="only" arg1="${build.sysclasspath}"> - </equals> Copied: tags/commons-vfs/2.0-1/debian/patches/disable_webdav_provider.diff (from rev 14803, trunk/commons-vfs/debian/patches/disable_webdav_provider.diff) =================================================================== --- tags/commons-vfs/2.0-1/debian/patches/disable_webdav_provider.diff (rev 0) +++ tags/commons-vfs/2.0-1/debian/patches/disable_webdav_provider.diff 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,58 @@ +Description: Disable webdav module (source code build and javadoc package) + because jackrabbit JCR provider is not yet in Debian. +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2011-09-11 +Forwarded: not-needed +Index: b/core/pom.xml +=================================================================== +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -167,6 +167,36 @@ + </configuration> + </plugin> + ++ <plugin> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <executions> ++ <execution> ++ <id>default-compile</id> ++ <phase>compile</phase> ++ <configuration> ++ <excludes> ++ <exclude>**/webdav/*</exclude> ++ </excludes> ++ </configuration> ++ <goals> ++ <goal>compile</goal> ++ </goals> ++ </execution> ++ <execution> ++ <id>default-testCompile</id> ++ <phase>test-compile</phase> ++ <configuration> ++ <testExcludes> ++ <exclude>**/webdav/test/*</exclude> ++ </testExcludes> ++ </configuration> ++ <goals> ++ <goal>testCompile</goal> ++ </goals> ++ </execution> ++ </executions> ++ </plugin> ++ + </plugins> + </build> + <profiles> +Index: b/pom.xml +=================================================================== +--- a/pom.xml ++++ b/pom.xml +@@ -243,6 +243,7 @@ + </tag> + </tags> + <aggregate>true</aggregate> ++ <excludePackageNames>*.webdav.*</excludePackageNames> + </configuration> + </plugin> + <plugin> Deleted: tags/commons-vfs/2.0-1/debian/patches/series =================================================================== --- trunk/commons-vfs/debian/patches/series 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/patches/series 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,2 +0,0 @@ -01_build-xml-nodownload.diff -02_no_home_dir.diff Copied: tags/commons-vfs/2.0-1/debian/patches/series (from rev 14803, trunk/commons-vfs/debian/patches/series) =================================================================== --- tags/commons-vfs/2.0-1/debian/patches/series (rev 0) +++ tags/commons-vfs/2.0-1/debian/patches/series 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,2 @@ +disable_webdav_provider.diff +skip_examples.diff Copied: tags/commons-vfs/2.0-1/debian/patches/skip_examples.diff (from rev 14803, trunk/commons-vfs/debian/patches/skip_examples.diff) =================================================================== --- tags/commons-vfs/2.0-1/debian/patches/skip_examples.diff (rev 0) +++ tags/commons-vfs/2.0-1/debian/patches/skip_examples.diff 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,20 @@ +Description: Disable examples module. +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2011-09-11 +Forwarded: not-needed + +Index: b/pom.xml +=================================================================== +--- a/pom.xml ++++ b/pom.xml +@@ -38,8 +38,10 @@ + + <modules> + <module>core</module> ++<!-- + <module>examples</module> + <module>dist</module> ++--> + </modules> + + <issueManagement> Deleted: tags/commons-vfs/2.0-1/debian/rules =================================================================== --- trunk/commons-vfs/debian/rules 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/commons-vfs/2.0-1/debian/rules 2011-09-11 00:18:02 UTC (rev 14808) @@ -1,23 +0,0 @@ -#!/usr/bin/make -f -# debian/rules for commons-vfs - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := commons-net.jar commons-logging.jar commons-collections3.jar commons-httpclient.jar jsch.jar -DEB_ANT_BUILD_TARGET := dist -#DEB_ANT_CHECK_TARGET := test - -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l core/pom.xml target/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - -get-orig-source: - uscan --force-download --rename Copied: tags/commons-vfs/2.0-1/debian/rules (from rev 14803, trunk/commons-vfs/debian/rules) =================================================================== --- tags/commons-vfs/2.0-1/debian/rules (rev 0) +++ tags/commons-vfs/2.0-1/debian/rules 2011-09-11 00:18:02 UTC (rev 14808) @@ -0,0 +1,14 @@ +#!/usr/bin/make -f +# debian/rules for commons-vfs + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk + +JAVA_HOME := /usr/lib/jvm/default-java +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) + +DEB_MAVEN_DOC_TARGET := javadoc:aggregate + +get-orig-source: + uscan --force-download --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
