This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit 699291d1a70734c3855016f926fd8f94353808b6
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Feb 23 17:32:25 2018 +0100
Ignore the no_aop classifier on the guice dependency to work around a
dependency resolution issue with maven-debian-helper
---
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/maven.rules | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 6ed678e..e7468a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven (3.5.2-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Ignore the no_aop classifier on the guice dependency to work around
+ a dependency resolution issue with maven-debian-helper
+
+ -- Emmanuel Bourg <ebo...@apache.org> Fri, 23 Feb 2018 17:30:44 +0100
+
maven (3.5.2-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 9b8c36f..fbd2030 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Homepage: http://maven.apache.org
Package: libmaven3-core-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, libguice-java (>= 4.0)
+Depends: ${misc:Depends}, ${maven:Depends}
Suggests: ${maven:OptionalDepends}
Replaces: maven (<< 3.0.5-7)
Breaks: maven (<< 3.0.5-7), gradle (<< 3.2.1-3~)
diff --git a/debian/maven.rules b/debian/maven.rules
index b3be36b..ce51862 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -10,3 +10,5 @@ org.codehaus.plexus plexus-component-metadata maven-plugin
s/1.7.1/1.5.5/ * *
org.apache.maven apache-maven pom s/.*/3.x/ * *
org.apache.maven maven-parent * s/.*/debian/ * *
org.apache.maven maven* * s/.*/3.x/ * *
+
+com.google.inject guice * s/.*/debian/ s/no_aop// *
--
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
