[wagon2] 04/05: Refreshed the patches

[Emmanuel Bourg]

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

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

commit e3d3e40bc5f4a9a0deb0c6d13990e59987ad765a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 7 20:08:28 2015 +0200

    Refreshed the patches
---
 debian/changelog                       | 2 +-
 debian/patches/add_explicit_log4j.diff | 6 +-----
 debian/patches/no_itcould_webdav.diff  | 8 ++++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e83c8c..131bcf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wagon2 (2.8-1) UNRELEASED; urgency=medium
+wagon2 (2.9-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/add_explicit_log4j.diff b/debian/patches/add_explicit_log4j.diff
index 7751b84..23bb7c3 100644
--- a/debian/patches/add_explicit_log4j.diff
+++ b/debian/patches/add_explicit_log4j.diff
@@ -1,5 +1,3 @@
-Index: b/wagon-provider-test/pom.xml
-===================================================================
 --- a/wagon-provider-test/pom.xml
 +++ b/wagon-provider-test/pom.xml
 @@ -54,6 +54,11 @@
@@ -14,11 +12,9 @@ Index: b/wagon-provider-test/pom.xml
  
    </dependencies>
  </project>
-Index: b/wagon-tcks/wagon-tck-http/pom.xml
-===================================================================
 --- a/wagon-tcks/wagon-tck-http/pom.xml
 +++ b/wagon-tcks/wagon-tck-http/pom.xml
-@@ -37,6 +37,11 @@
+@@ -56,6 +56,11 @@
        <artifactId>commons-codec</artifactId>
        <version>1.4</version>
      </dependency>
diff --git a/debian/patches/no_itcould_webdav.diff b/debian/patches/no_itcould_webdav.diff
index 9631535..6e40c71 100644
--- a/debian/patches/no_itcould_webdav.diff
+++ b/debian/patches/no_itcould_webdav.diff
@@ -1,6 +1,6 @@
---- wagon2-2.7.orig/wagon-providers/wagon-webdav-jackrabbit/pom.xml
-+++ wagon2-2.7/wagon-providers/wagon-webdav-jackrabbit/pom.xml
-@@ -169,7 +169,7 @@ under the License.
+--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
++++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+@@ -142,7 +142,7 @@
          </executions>
        </plugin>
        <plugin><!-- Jackrabbit is compiled for JDK 6 -->
@@ -9,7 +9,7 @@
          <executions>
            <execution>
              <id>enforce-bytecode-version</id>
-@@ -187,6 +187,15 @@ under the License.
+@@ -160,6 +160,15 @@
            </execution>
          </executions>
        </plugin>

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