[scala-2.10] 47/61: Fixed the build failure with bnd > 2.1.0

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch scala-2.11
in repository scala-2.10.

commit fa2e192d3ce123a6d937107266e1d3fc69a579c7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 21 15:42:08 2015 +0100

    Fixed the build failure with bnd > 2.1.0
---
 debian/changelog                    | 7 +++++++
 debian/patches/0010-bnd-2.1.0.patch | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5f2fc82..800cf9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scala (2.11.6-6) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with bnd > 2.1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 21 Dec 2015 15:41:47 +0100
+
 scala (2.11.6-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0010-bnd-2.1.0.patch b/debian/patches/0010-bnd-2.1.0.patch
index a90e5ab..c9329d1 100644
--- a/debian/patches/0010-bnd-2.1.0.patch
+++ b/debian/patches/0010-bnd-2.1.0.patch
@@ -18,7 +18,7 @@ index 091674e..1d4e12a 100755
          <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
          <localRepository path="${user.home}/.m2/repository"/>
 -        <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
-+        <dependency groupId="biz.aQute.bnd" artifactId="bnd" version="2.1.0"/>
++        <dependency groupId="biz.aQute.bnd" artifactId="bnd" version="debian"/>
        </artifact:dependencies>
  
        <!-- JUnit -->

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