[wagon2] 02/03: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Feb 10 17:34:07 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository wagon2.

commit 1d623e169c6d9423f9d1ae9b4872daf71a653589
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Feb 10 14:52:31 2014 +0100

    Refreshed the patches
---
 debian/patches/fix_compilation_issues.patch | 2 +-
 debian/patches/no_mina_sshd.diff            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/fix_compilation_issues.patch b/debian/patches/fix_compilation_issues.patch
index 4ea93ac..afafe1e 100644
--- a/debian/patches/fix_compilation_issues.patch
+++ b/debian/patches/fix_compilation_issues.patch
@@ -1,6 +1,6 @@
 --- a/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
 +++ b/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
-@@ -738,7 +738,7 @@
+@@ -736,7 +736,7 @@
  
              List<String> files = new ArrayList<String>();
  
diff --git a/debian/patches/no_mina_sshd.diff b/debian/patches/no_mina_sshd.diff
index b3f080e..d49b79d 100644
--- a/debian/patches/no_mina_sshd.diff
+++ b/debian/patches/no_mina_sshd.diff
@@ -45,7 +45,7 @@
      <profile>
 --- a/wagon-providers/wagon-ssh/pom.xml
 +++ b/wagon-providers/wagon-ssh/pom.xml
-@@ -48,11 +48,6 @@
+@@ -58,11 +58,6 @@
        <groupId>org.apache.maven.wagon</groupId>
        <artifactId>wagon-ssh-common</artifactId>
      </dependency>
@@ -57,7 +57,7 @@
  
  
      <dependency>
-@@ -75,6 +70,20 @@
+@@ -85,6 +80,20 @@
      </dependency>
  
    </dependencies>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git



More information about the pkg-java-commits mailing list