This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit d27e46c7b57685b98f3d78e8ceaa746e9dc6b486
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Nov 10 13:48:55 2017 +0100
Depend on libwagon-*-java instead of libwagon2-java
---
debian/changelog | 1 +
debian/control | 7 ++++++-
debian/maven.links | 6 +++---
debian/maven.rules | 2 --
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 83e6ed8..f4ffc7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
maven (3.5.0-7) UNRELEASED; urgency=medium
* Team upload.
+ * Depend on libwagon-*-java instead of libwagon2-java
* Specified that gradle (<< 3.2.1-3~) is broken by the current release
* Standards-Version updated to 4.1.1
diff --git a/debian/control b/debian/control
index fdd41d8..ed0b56b 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,10 @@ Build-Depends-Indep: junit4,
libsisu-plexus-java (>= 0.3.3),
libslf4j-java (>= 1.7.25),
libsurefire-java (>= 2.17),
- libwagon2-java (>= 2.12),
+ libwagon-file-java,
+ libwagon-http-java,
+ libwagon-http-shaded-java,
+ libwagon-provider-api-java,
libxmlunit-java
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven.git
@@ -62,6 +65,8 @@ Architecture: all
Depends: default-jre-headless (>= 2:1.7) | java7-runtime-headless,
libmaven3-core-java (= ${source:Version}),
libjansi-java,
+ libwagon-file-java,
+ libwagon-http-shaded-java,
${misc:Depends}
Replaces: maven2 (<< 2.2.1-11)
Breaks: maven2 (<< 2.2.1-11)
diff --git a/debian/maven.links b/debian/maven.links
index e05020b..8a017ef 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -44,6 +44,6 @@
/usr/share/java/maven3-settings.jar
/usr/share/maven/lib/maven-settings-3.x.jar
/usr/share/java/maven3-slf4j-provider.jar
/usr/share/maven/lib/maven-slf4j-provider-3.x.jar
-/usr/share/java/wagon-file-2.x.jar
/usr/share/maven/lib/wagon-file.jar
-/usr/share/java/wagon-http-shaded-2.x.jar
/usr/share/maven/lib/wagon-http-shaded.jar
-/usr/share/java/wagon-provider-api-2.x.jar
/usr/share/maven/lib/wagon-provider-api.jar
+/usr/share/java/wagon-file.jar
/usr/share/maven/lib/wagon-file.jar
+/usr/share/java/wagon-http-shaded.jar
/usr/share/maven/lib/wagon-http-shaded.jar
+/usr/share/java/wagon-provider-api.jar
/usr/share/maven/lib/wagon-provider-api.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 3ce2c5c..476271c 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -4,8 +4,6 @@ s/easymock/org.easymock/ easymock * s/.*/debian/ * *
org.eclipse.sisu org.eclipse.sisu.plexus * s/.*/debian/ * *
s/org.eclipse.sisu/org.sonatype.plugins/ sisu-maven-plugin * s/.*/1.4/ * *
-org.apache.maven.wagon * jar s/.*/2.x/ * *
-
org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/maven.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
