[scala-2.10] 143/166: 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 master
in repository scala-2.10.

commit 5c662d6c661ea737cd189d962143bf9655fff6ea
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 14 10:38:44 2016 +0100

    Fixed the build failure with BND 2.1.0
---
 debian/patches/0010-bnd-2.1.0.patch | 18 ++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/0010-bnd-2.1.0.patch b/debian/patches/0010-bnd-2.1.0.patch
new file mode 100644
index 0000000..a04537e
--- /dev/null
+++ b/debian/patches/0010-bnd-2.1.0.patch
@@ -0,0 +1,18 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 16 Nov 2015 23:03:15 +0100
+Subject: bnd 2.1.0
+
+Use Debian's bnd version.
+
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -219,7 +219,7 @@
+       <!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. -->
+       <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset">
+         <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+-        <dependency groupId="biz.aQute" artifactId="bnd" version="debian"/>
++        <dependency groupId="biz.aQute.bnd" artifactId="bnd" version="debian"/>
+       </artifact:dependencies>
+ 
+       <!-- JUnit -->
diff --git a/debian/patches/series b/debian/patches/series
index 13f4a94..ed047af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ remove-non-ascii-ftbfs.patch
 0006-ignore-pax-exam-dependencies.patch
 0007-ignore-partest.patch
 0008-disable-lib-fetching.patch
+0010-bnd-2.1.0.patch

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