[scala-2.10] 165/166: Define localRepository explicitly

[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 8f7a00ed6421782ad2aad725881300caf1b2ccad
Author: Markus Koschany <apo at debian.org>
Date:   Mon Nov 16 22:02:20 2015 +0100

    Define localRepository explicitly
---
 debian/patches/0009-local-repository.patch | 21 +++++++++++++++++++++
 debian/patches/0010-bnd-2.1.0.patch        |  4 ++--
 debian/patches/series                      |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0009-local-repository.patch b/debian/patches/0009-local-repository.patch
new file mode 100644
index 0000000..b0cf417
--- /dev/null
+++ b/debian/patches/0009-local-repository.patch
@@ -0,0 +1,21 @@
+Description: Define localRepository explicitly, otherwise the build will use the /nonexistent home directory which causes a FTBFS
+Author: Markus Koschany <apo at debian.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -210,6 +210,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"/>
++        <localRepository path="${user.home}/.m2/repository"/>
+         <dependency groupId="biz.aQute" artifactId="bnd" version="debian"/>
+       </artifact:dependencies>
+ 
+@@ -217,6 +218,7 @@
+       <property name="junit.version" value="4.10"/>
+       <artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
+         <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
++        <localRepository path="${user.home}/.m2/repository"/>
+         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
+       </artifact:dependencies>
+ 
diff --git a/debian/patches/0010-bnd-2.1.0.patch b/debian/patches/0010-bnd-2.1.0.patch
index a04537e..7da1f32 100644
--- a/debian/patches/0010-bnd-2.1.0.patch
+++ b/debian/patches/0010-bnd-2.1.0.patch
@@ -7,10 +7,10 @@ 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. -->
+@@ -211,7 +211,7 @@
        <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset">
          <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+         <localRepository path="${user.home}/.m2/repository"/>
 -        <dependency groupId="biz.aQute" artifactId="bnd" version="debian"/>
 +        <dependency groupId="biz.aQute.bnd" artifactId="bnd" version="debian"/>
        </artifact:dependencies>
diff --git a/debian/patches/series b/debian/patches/series
index c8dca91..fd71afc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@ remove-non-ascii-ftbfs.patch
 0006-ignore-pax-exam-dependencies.patch
 0007-ignore-partest.patch
 0008-disable-lib-fetching.patch
+0009-local-repository.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