[maven2] 02/03: Accept an alternative dependency on libmaven-compiler-plugin-java (<< 3.0)

[Emmanuel Bourg]

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

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

commit dc01324addf7d0d20dd292cd4bc10d8e370c66e0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 6 19:11:28 2015 +0200

    Accept an alternative dependency on libmaven-compiler-plugin-java (<< 3.0)
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3be92e..638d07e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ maven2 (2.2.1-24) UNRELEASED; urgency=medium
 
   * Team upload
   * Rebuild with libmaven2-core-java 2.2.1-18 (Updates maven-plugin-plugin)
+  * Accept an alternative dependency on libmaven-compiler-plugin-java (<< 3.0)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 06 May 2015 18:11:37 +0200
 
diff --git a/debian/control b/debian/control
index 4adb5b1..3ccd53f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
 Build-Depends-Indep: ant-optional,
                      junit,
                      libmaven-clean-plugin-java,
-                     libmaven-compiler-plugin-2.5-java (>= 2.5.1),
+                     libmaven-compiler-plugin-2.5-java (>= 2.5.1) | libmaven-compiler-plugin-java (<< 3.0~),
                      libmaven-install-plugin-java (>= 2.4),
                      libmaven-jar-plugin-java (>= 2.4),
                      libmaven-resources-plugin-java,
@@ -28,7 +28,7 @@ Depends: default-jre (>= 1.5) | default-jre-headless (>= 1.5) | java2-runtime |
          libmaven2-core-java,
          ${misc:Depends}
 Recommends: libmaven-clean-plugin-java,
-            libmaven-compiler-plugin-2.5-java (>= 2.5.1),
+            libmaven-compiler-plugin-2.5-java (>= 2.5.1) | libmaven-compiler-plugin-java (<< 3.0~),
             libmaven-install-plugin-java (>= 2.4),
             libmaven-jar-plugin-java,
             libmaven-resources-plugin-java,

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