[wagon2] 02/02: update changelog, refresh on patch

Eugene Zhukov eugene-guest at moszumanska.debian.org
Fri Oct 10 17:16:04 BST 2014


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

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

commit b4d928f155662e09548fc2b569824f0a8daaef9d
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Fri Oct 10 15:57:45 2014 +0000

    update changelog, refresh on patch
---
 debian/changelog                      |  9 ++++++++-
 debian/control                        |  2 +-
 debian/patches/no_itcould_webdav.diff | 21 +++++++++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50a2efa..ae22839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
+wagon2 (2.7-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com>  Fri, 10 Oct 2014 07:17:42 +0000
+
 wagon2 (2.6-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
   * Disable test accessing the network (Eugene Zhukov). Closes: #761171.
 
- -- Matthias Klose <doko at debian.org> Thu, 09 Oct 2014 11:49:12 +0000
+ -- Matthias Klose <doko at debian.org>  Thu, 09 Oct 2014 13:27:03 +0200
 
 wagon2 (2.6-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4310ee9..40a79d6 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Build-Depends-Indep: default-jdk-doc,
                      libplexus-utils-java,
                      libplexus-utils-java-doc,
                      subversion
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/wagon2.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/wagon2.git
 Homepage: http://maven.apache.org/wagon/
diff --git a/debian/patches/no_itcould_webdav.diff b/debian/patches/no_itcould_webdav.diff
index 09f28d3..9631535 100644
--- a/debian/patches/no_itcould_webdav.diff
+++ b/debian/patches/no_itcould_webdav.diff
@@ -1,11 +1,20 @@
---- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
-+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
-@@ -160,6 +160,15 @@
-           </dependency>
-         </dependencies>
+--- 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.
+         </executions>
+       </plugin>
+       <plugin><!-- Jackrabbit is compiled for JDK 6 -->
+-        <artifactId>maven-enforcer-plugin</artifactId>
++        <!--artifactId>maven-enforcer-plugin</artifactId>
+         <executions>
+           <execution>
+             <id>enforce-bytecode-version</id>
+@@ -187,6 +187,15 @@ under the License.
+           </execution>
+         </executions>
        </plugin>
 +      
-+    <plugin>
++    <plugin-->
 +        <artifactId>maven-compiler-plugin</artifactId>
 +        <configuration>
 +            <testExcludes>

-- 
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