Author: drazzib Date: 2011-09-11 00:11:39 +0000 (Sun, 11 Sep 2011) New Revision: 14806
Added: trunk/ivy/debian/patches/ trunk/ivy/debian/patches/commons-vfs2.diff trunk/ivy/debian/patches/series Modified: trunk/ivy/debian/changelog trunk/ivy/debian/control trunk/ivy/debian/rules Log: * Team upload. * Fix for commons-vfs2. * Bump Standards-Version to 3.9.2: no changes needed. Modified: trunk/ivy/debian/changelog =================================================================== --- trunk/ivy/debian/changelog 2011-09-11 00:10:07 UTC (rev 14805) +++ trunk/ivy/debian/changelog 2011-09-11 00:11:39 UTC (rev 14806) @@ -1,3 +1,11 @@ +ivy (2.2.0-2) unstable; urgency=low + + * Team upload. + * Fix for commons-vfs2. + * Bump Standards-Version to 3.9.2: no changes needed. + + -- Damien Raude-Morvan <[email protected]> Sun, 11 Sep 2011 01:36:00 +0200 + ivy (2.2.0-1) unstable; urgency=low * New upstream release. Modified: trunk/ivy/debian/control =================================================================== --- trunk/ivy/debian/control 2011-09-11 00:10:07 UTC (rev 14805) +++ trunk/ivy/debian/control 2011-09-11 00:11:39 UTC (rev 14806) @@ -6,9 +6,9 @@ Build-Depends: cdbs, debhelper (>= 7) Build-Depends-Indep: maven-repo-helper, ant, default-jdk, libcommons-httpclient-java, libcommons-lang-java, libcommons-cli-java, liboro-java, - libcommons-collections-java, libcommons-vfs-java, junit, + libcommons-collections-java, libcommons-vfs-java (>= 2.0), junit, libjsch-java, libbcprov-java, libbcpg-java, default-jdk-doc -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://ant.apache.org/ivy/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ivy Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ivy/ Added: trunk/ivy/debian/patches/commons-vfs2.diff =================================================================== --- trunk/ivy/debian/patches/commons-vfs2.diff (rev 0) +++ trunk/ivy/debian/patches/commons-vfs2.diff 2011-09-11 00:11:39 UTC (rev 14806) @@ -0,0 +1,113 @@ +Description: Fix build with commons vfs 2.0 +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2011-09-11 +Forwarded: no +Index: b/META-INF/MANIFEST.MF +=================================================================== +--- a/META-INF/MANIFEST.MF ++++ b/META-INF/MANIFEST.MF +@@ -19,13 +19,13 @@ + org.apache.commons.httpclient.params;resolution:=optional, + org.apache.commons.httpclient.protocol;resolution:=optional, + org.apache.commons.net.ftp;resolution:=optional, +- org.apache.commons.vfs;resolution:=optional, +- org.apache.commons.vfs.impl;resolution:=optional, +- org.apache.commons.vfs.provider;resolution:=optional, +- org.apache.commons.vfs.provider.ftp;resolution:=optional, +- org.apache.commons.vfs.provider.local;resolution:=optional, +- org.apache.commons.vfs.provider.sftp;resolution:=optional, +- org.apache.commons.vfs.provider.url;resolution:=optional, ++ org.apache.commons.vfs2;resolution:=optional, ++ org.apache.commons.vfs2.impl;resolution:=optional, ++ org.apache.commons.vfs2.provider;resolution:=optional, ++ org.apache.commons.vfs2.provider.ftp;resolution:=optional, ++ org.apache.commons.vfs2.provider.local;resolution:=optional, ++ org.apache.commons.vfs2.provider.sftp;resolution:=optional, ++ org.apache.commons.vfs2.provider.url;resolution:=optional, + org.apache.oro.text;resolution:=optional, + org.apache.oro.text.regex;resolution:=optional, + org.apache.tools.ant;resolution:=optional, +Index: b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java +=================================================================== +--- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java ++++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java +@@ -25,12 +25,12 @@ + import java.util.Arrays; + import java.util.List; + +-import org.apache.commons.vfs.FileContent; +-import org.apache.commons.vfs.FileObject; +-import org.apache.commons.vfs.FileSystemException; +-import org.apache.commons.vfs.FileSystemManager; +-import org.apache.commons.vfs.FileType; +-import org.apache.commons.vfs.impl.StandardFileSystemManager; ++import org.apache.commons.vfs2.FileContent; ++import org.apache.commons.vfs2.FileObject; ++import org.apache.commons.vfs2.FileSystemException; ++import org.apache.commons.vfs2.FileSystemManager; ++import org.apache.commons.vfs2.FileType; ++import org.apache.commons.vfs2.impl.StandardFileSystemManager; + import org.apache.ivy.plugins.repository.AbstractRepository; + import org.apache.ivy.plugins.repository.RepositoryCopyProgressListener; + import org.apache.ivy.plugins.repository.Resource; +Index: b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java +=================================================================== +--- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java ++++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java +@@ -22,11 +22,11 @@ + import java.util.ArrayList; + import java.util.List; + +-import org.apache.commons.vfs.FileContent; +-import org.apache.commons.vfs.FileObject; +-import org.apache.commons.vfs.FileSystemException; +-import org.apache.commons.vfs.FileSystemManager; +-import org.apache.commons.vfs.FileType; ++import org.apache.commons.vfs2.FileContent; ++import org.apache.commons.vfs2.FileObject; ++import org.apache.commons.vfs2.FileSystemException; ++import org.apache.commons.vfs2.FileSystemManager; ++import org.apache.commons.vfs2.FileType; + import org.apache.ivy.plugins.repository.Resource; + import org.apache.ivy.plugins.resolver.VfsResolver; + import org.apache.ivy.util.Message; +Index: b/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml +=================================================================== +--- a/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml ++++ b/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml +@@ -20,29 +20,29 @@ + in the jakarta-vfs-common distribution with the res and tmp schemas removed. + --> + <providers> +- <default-provider class-name="org.apache.commons.vfs.provider.url.UrlFileProvider"> ++ <default-provider class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider"> + </default-provider> +- <provider class-name="org.apache.commons.vfs.provider.local.DefaultLocalFileProvider"> ++ <provider class-name="org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider"> + <scheme name="file"/> + </provider> +- <provider class-name="org.apache.commons.vfs.provider.ftp.FtpFileProvider"> ++ <provider class-name="org.apache.commons.vfs2.provider.ftp.FtpFileProvider"> + <scheme name="ftp"/> + <if-available class-name="org.apache.commons.net.ftp.FTPFile"/> + </provider> + <!-- FIXME: not available anymore in commons-vfs but in commons-vfs-sandbox +- <provider class-name="org.apache.commons.vfs.provider.smb.SmbFileProvider"> ++ <provider class-name="org.apache.commons.vfs2.provider.smb.SmbFileProvider"> + <scheme name="smb"/> + <if-available class-name="jcifs.smb.SmbFile"/> + </provider> + --> + <!-- +- <provider class-name="org.apache.commons.vfs.provider.http.HttpFileProvider"> ++ <provider class-name="org.apache.commons.vfs2.provider.http.HttpFileProvider"> + <scheme name="http"/> + <if-available class-name="org.apache.commons.httpclient.HttpClient"/> + </provider> + --> + +- <provider class-name="org.apache.commons.vfs.provider.sftp.SftpFileProvider"> ++ <provider class-name="org.apache.commons.vfs2.provider.sftp.SftpFileProvider"> + <scheme name="sftp"/> + <if-available class-name="javax.crypto.Cipher"/> + <if-available class-name="com.jcraft.jsch.JSch"/> Added: trunk/ivy/debian/patches/series =================================================================== --- trunk/ivy/debian/patches/series (rev 0) +++ trunk/ivy/debian/patches/series 2011-09-11 00:11:39 UTC (rev 14806) @@ -0,0 +1 @@ +commons-vfs2.diff Modified: trunk/ivy/debian/rules =================================================================== --- trunk/ivy/debian/rules 2011-09-11 00:10:07 UTC (rev 14805) +++ trunk/ivy/debian/rules 2011-09-11 00:11:39 UTC (rev 14806) @@ -10,7 +10,7 @@ DEB_ANT_BUILD_TARGET := jar javadoc DEB_ANT_BUILDFILE := debian/build.xml DEB_JARS := commons-httpclient commons-lang commons-cli commons-collections \ - commons-vfs junit jsch oro bcprov bcpg + commons-vfs2 junit jsch oro bcprov bcpg API_DOCS := api binary-post-install/$(PACKAGE):: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
