[ivy] 02/05: Refreshed the VFS patch
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 29 21:17:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ivy.
commit 7e80e99ef9a7dfa47e94bbb20403e660f3c959a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 29 22:52:57 2015 +0200
Refreshed the VFS patch
---
debian/changelog | 5 +-
debian/patches/commons-vfs2.diff | 188 +++++++++++++++++++--------------------
2 files changed, 94 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e84a603..761e444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-ivy (2.3.0-5) UNRELEASED; urgency=medium
+ivy (2.4.0-1) UNRELEASED; urgency=medium
+ * Team upload.
+ * New upstream release.
+ - Refreshed the VFS patch
* Use XZ compression for the upstream tarball
* Moved the package to Git
* Switch to debhelper level 9
diff --git a/debian/patches/commons-vfs2.diff b/debian/patches/commons-vfs2.diff
index 96ab6ed..013ec11 100644
--- a/debian/patches/commons-vfs2.diff
+++ b/debian/patches/commons-vfs2.diff
@@ -2,112 +2,104 @@ Description: Fix build with commons vfs 2.0
Author: Damien Raude-Morvan <drazzib at debian.org>
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
-===================================================================
+@@ -20,13 +20,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,
--- 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
-===================================================================
+ 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;
--- 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
-===================================================================
+ 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;
--- 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"/>
+ 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"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ivy.git
More information about the pkg-java-commits
mailing list