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 524ee536ce302dd0472a0bfdb295f589f368f9bc Author: Markus Koschany <[email protected]> Date: Mon Nov 16 22:02:20 2015 +0100 Add local-repository.patch --- debian/patches/local-repository.patch | 91 +++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/debian/patches/local-repository.patch b/debian/patches/local-repository.patch new file mode 100644 index 0000000..5e445be --- /dev/null +++ b/debian/patches/local-repository.patch @@ -0,0 +1,91 @@ +From: Markus Koschany <[email protected]> +Date: Mon, 16 Nov 2015 22:01:56 +0100 +Subject: local repository + +--- + build.xml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/build.xml b/build.xml +index 5bb6d2e..091674e 100755 +--- a/build.xml ++++ b/build.xml +@@ -269,6 +269,7 @@ TODO: + <!-- 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="1.50.0"/> + </artifact:dependencies> + +@@ -276,6 +277,7 @@ TODO: + <property name="junit.version" value="4.x"/> + <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> + <copy-deps project="junit"/> +@@ -285,13 +287,16 @@ TODO: + <property name="osgi.felix.version" value="4.4.0"/> + <property name="osgi.equinox.version" value="3.7.1"/> + <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset"> ++ <localRepository path="${user.home}/.m2/repository"/> + </artifact:dependencies> + <copy-deps project="pax.exam"/> + + <artifact:dependencies pathId="osgi.framework.felix"> ++ <localRepository path="${user.home}/.m2/repository"/> + </artifact:dependencies> + + <artifact:dependencies pathId="osgi.framework.equinox"> ++ <localRepository path="${user.home}/.m2/repository"/> + </artifact:dependencies> + + <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/> +@@ -310,14 +315,17 @@ TODO: + + <!-- TODO: delay until absolutely necessary to allow minimal build, also move out partest dependency from scaladoc --> + <artifact:dependencies pathId="partest.classpath" filesetId="partest.fileset" versionsId="partest.versions"> ++ <localRepository path="${user.home}/.m2/repository"/> + </artifact:dependencies> + <copy-deps project="partest"/> + + <artifact:dependencies pathId="scalacheck.classpath" filesetId="scalacheck.fileset" versionsId="scalacheck.versions"> ++ <localRepository path="${user.home}/.m2/repository"/> + </artifact:dependencies> + + <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions"> + <remoteRepository id="central" url="file:///usr/share/maven-repo"/> ++ <localRepository path="${user.home}/.m2/repository"/> + <dependency groupId="jline" artifactId="jline" version="${jline.version}"/> + </artifact:dependencies> + <copy-deps project="repl"/> +@@ -326,6 +334,7 @@ TODO: + must specify sourcesFilesetId, javadocFilesetId to download these types of artifacts --> + <artifact:dependencies pathId="external-modules.deps.classpath" sourcesFilesetId="external-modules.sources.fileset" javadocFilesetId="external-modules.javadoc.fileset"> + <remoteRepository id="central" url="file:///usr/share/maven-repo"/> ++ <localRepository path="${user.home}/.m2/repository"/> + <dependency groupId="org.scala-lang.modules" artifactId="scala-xml${scala-xml.cross}" version="${scala-xml.version.number}"/> + <dependency groupId="org.scala-lang.modules" artifactId="scala-parser-combinators${scala-parser-combinators.cross}" version="${scala-parser-combinators.version.number}"/> + <!-- +@@ -361,6 +370,7 @@ TODO: + <artifact:dependencies pathId="starr.compiler.path" filesetId="starr.fileset"> + <!--<artifact:remoteRepository refid="extra-repo"/>--> + <remoteRepository id="central" url="file:///usr/share/maven-repo"/> ++ <localRepository path="${user.home}/.m2/repository"/> + <dependency groupId="org.scala-lang" artifactId="scala-library" version="${starr.version}"/> + <dependency groupId="org.scala-lang" artifactId="scala-reflect" version="${starr.version}"/> + <dependency groupId="org.scala-lang" artifactId="scala-compiler" version="${starr.version}"/> +@@ -1534,9 +1544,11 @@ TODO: + <mkdir dir="${bc-build.dir}"/> + <!-- Pull down MIMA --> + <artifact:dependencies pathId="mima.classpath"> ++ <localRepository path="${user.home}/.m2/repository"/> + <dependency groupId="com.typesafe" artifactId="mima-reporter_2.10" version="0.1.6"/> + </artifact:dependencies> + <artifact:dependencies pathId="old.bc.classpath"> ++ <localRepository path="${user.home}/.m2/repository"/> + <dependency groupId="org.scala-lang" artifactId="scala-library" version="${bc-reference-version}"/> + <dependency groupId="org.scala-lang" artifactId="scala-reflect" version="${bc-reference-version}"/> + </artifact:dependencies> diff --git a/debian/patches/series b/debian/patches/series index 42aa665..b2f5d7d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 0002-Use-system-ant-contrib.jar.patch -#0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch 0006-ignore-test-dependencies.patch 0008-disable-lib-fetching.patch +local-repository.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
