[scala] 02/14: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Mar 30 15:18:21 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository scala.
commit c8c7f09c7c53e7af49d6a2eed806303303e3a9f9
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Mar 30 11:45:26 2018 +0200
Refreshed the patches
---
debian/changelog | 8 ++++++++
debian/patches/0006-ignore-test-dependencies.patch | 6 +++---
debian/patches/0008-disable-lib-fetching.patch | 15 +++++++++-----
debian/patches/0009-local-repository.patch | 10 +++++-----
debian/patches/0011-use-local-dependencies.patch | 2 +-
debian/patches/0012-aether-ant-tasks.patch | 23 ++++++++++++++--------
6 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae47db0..ca06af2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scala (2.11.9-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 30 Mar 2018 11:13:06 +0200
+
scala (2.11.8-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/0006-ignore-test-dependencies.patch b/debian/patches/0006-ignore-test-dependencies.patch
index 63070dc..911cc42 100644
--- a/debian/patches/0006-ignore-test-dependencies.patch
+++ b/debian/patches/0006-ignore-test-dependencies.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -291,25 +291,13 @@
+@@ -295,25 +295,13 @@
<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">
@@ -29,7 +29,7 @@ Forwarded: not-needed
</artifact:dependencies>
<artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/>
-@@ -363,20 +351,10 @@
+@@ -367,20 +355,10 @@
<!-- 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">
@@ -50,7 +50,7 @@ Forwarded: not-needed
</artifact:dependencies>
<artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions">
-@@ -1295,7 +1273,7 @@
+@@ -1307,7 +1285,7 @@
manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/>
</target>
diff --git a/debian/patches/0008-disable-lib-fetching.patch b/debian/patches/0008-disable-lib-fetching.patch
index 3eaf122..a5672b9 100644
--- a/debian/patches/0008-disable-lib-fetching.patch
+++ b/debian/patches/0008-disable-lib-fetching.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
<!-- replacestarr needs git.commit.sha, but doesn't want to run the init target (it computes maven.version.number) -->
<exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" />
<exec osfamily="windows" executable="cmd.exe" outputproperty="git.commit.sha" failifexecutionfails="false">
-@@ -272,16 +272,19 @@
+@@ -272,20 +272,24 @@
<!-- 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">
@@ -25,6 +25,11 @@ Forwarded: not-needed
<dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/>
</artifact:dependencies>
+ <artifact:dependencies pathId="jarlister.classpath">
++ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+ <dependency groupId="com.github.rjolly" artifactId="jarlister_2.11" version="1.0"/>
+ </artifact:dependencies>
+
<!-- JUnit -->
<property name="junit.version" value="4.11"/>
<artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
@@ -32,7 +37,7 @@ Forwarded: not-needed
<dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
</artifact:dependencies>
<copy-deps project="junit"/>
-@@ -345,6 +348,7 @@
+@@ -349,6 +353,7 @@
<prepareCross name="scalacheck"/>
<artifact:dependencies pathId="asm.classpath" filesetId="asm.fileset">
@@ -40,7 +45,7 @@ Forwarded: not-needed
<dependency groupId="org.scala-lang.modules" artifactId="scala-asm" version="${scala-asm.version}"/>
</artifact:dependencies>
<copy-deps project="asm"/>
-@@ -358,6 +362,7 @@
+@@ -362,6 +367,7 @@
</artifact:dependencies>
<artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions">
@@ -48,7 +53,7 @@ Forwarded: not-needed
<dependency groupId="jline" artifactId="jline" version="${jline.version}"/>
</artifact:dependencies>
<copy-deps project="repl"/>
-@@ -365,12 +370,14 @@
+@@ -369,12 +375,14 @@
<!-- used by the test.osgi target to create osgi bundles for the xml, parser-combinator jars
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">
@@ -64,7 +69,7 @@ Forwarded: not-needed
</artifact:dependencies>
<!-- External modules, excluding the core -->
-@@ -397,7 +404,8 @@
+@@ -401,7 +409,8 @@
<echo message="Using Scala ${starr.version} for STARR."/>
<artifact:dependencies pathId="starr.compiler.path" filesetId="starr.fileset">
diff --git a/debian/patches/0009-local-repository.patch b/debian/patches/0009-local-repository.patch
index 9521af0..6183cd7 100644
--- a/debian/patches/0009-local-repository.patch
+++ b/debian/patches/0009-local-repository.patch
@@ -17,7 +17,7 @@ Forwarded: not-needed
<dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/>
</artifact:dependencies>
-@@ -285,6 +287,7 @@
+@@ -290,6 +292,7 @@
<property name="junit.version" value="4.11"/>
<artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
<remoteRepository id="central" url="file:///usr/share/maven-repo"/>
@@ -25,7 +25,7 @@ Forwarded: not-needed
<dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
</artifact:dependencies>
<copy-deps project="junit"/>
-@@ -294,13 +297,16 @@
+@@ -299,13 +302,16 @@
<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">
@@ -42,7 +42,7 @@ Forwarded: not-needed
</artifact:dependencies>
<artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/>
-@@ -349,20 +355,24 @@
+@@ -354,20 +360,24 @@
<artifact:dependencies pathId="asm.classpath" filesetId="asm.fileset">
<remoteRepository id="central" url="file:///usr/share/maven-repo"/>
@@ -67,7 +67,7 @@ Forwarded: not-needed
<dependency groupId="jline" artifactId="jline" version="${jline.version}"/>
</artifact:dependencies>
<copy-deps project="repl"/>
-@@ -371,6 +381,7 @@
+@@ -376,6 +386,7 @@
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"/>
@@ -75,7 +75,7 @@ Forwarded: not-needed
<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}"/>
<!--
-@@ -406,6 +417,7 @@
+@@ -411,6 +422,7 @@
<artifact:dependencies pathId="starr.compiler.path" filesetId="starr.fileset">
<!--<artifact:remoteRepository refid="extra-repo"/>-->
<remoteRepository id="central" url="file:///usr/share/maven-repo"/>
diff --git a/debian/patches/0011-use-local-dependencies.patch b/debian/patches/0011-use-local-dependencies.patch
index d27db61..d76e68c 100644
--- a/debian/patches/0011-use-local-dependencies.patch
+++ b/debian/patches/0011-use-local-dependencies.patch
@@ -11,4 +11,4 @@ Forwarded: not-needed
+ <dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="debian"/>
</artifact:dependencies>
- <!-- JUnit -->
+ <artifact:dependencies pathId="jarlister.classpath">
diff --git a/debian/patches/0012-aether-ant-tasks.patch b/debian/patches/0012-aether-ant-tasks.patch
index 0e14ad4..a97ffd8 100644
--- a/debian/patches/0012-aether-ant-tasks.patch
+++ b/debian/patches/0012-aether-ant-tasks.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
<!-- Resolve maven dependencies -->
-@@ -266,58 +266,69 @@
+@@ -266,63 +266,73 @@
<if><not><isset property="maven-deps-done"></isset></not><then>
<mkdir dir="${user.home}/.m2/repository"/>
@@ -52,6 +52,13 @@ Forwarded: not-needed
+ <path refid="jarjar.classpath"/>
+ </artifact:resolve>
+- <artifact:dependencies pathId="jarlister.classpath">
+- <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+- <dependency groupId="com.github.rjolly" artifactId="jarlister_2.11" version="1.0"/>
++ <artifact:dependencies id="jarlister.classpath">
++ <dependency coords="com.github.rjolly:jarlister_2.11:1.0"/>
+ </artifact:dependencies>
+
<!-- JUnit -->
<property name="junit.version" value="4.11"/>
- <artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
@@ -110,7 +117,7 @@ Forwarded: not-needed
<exclusion groupId="org.scala-lang" artifactId="scala-library"/>
</dependency>
</artifact:dependencies>
-@@ -353,43 +364,53 @@
+@@ -358,43 +368,53 @@
<prepareCross name="partest"/>
<prepareCross name="scalacheck"/>
@@ -181,7 +188,7 @@ Forwarded: not-needed
<!-- External modules, excluding the core -->
<path id="external-modules-nocore">
-@@ -414,14 +435,17 @@
+@@ -419,14 +439,17 @@
<typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
<echo message="Using Scala ${starr.version} for STARR."/>
@@ -205,7 +212,7 @@ Forwarded: not-needed
<copy-deps project="starr"/>
<property name="maven-deps-done" value="yep!"/>
-@@ -1182,7 +1206,7 @@
+@@ -1192,7 +1215,7 @@
<!-- make jline_embedded jar with classes of repl-jline and jline, then shade-->
<jarjar jarfile="${build-pack.dir}/${repl-jline.targetdir}/scala-repl-jline-embedded.jar" whenmanifestonly="fail">
@@ -214,7 +221,7 @@ Forwarded: not-needed
<zipfileset src="${build-pack.dir}/${repl-jline.targetdir}/${repl-jline.targetjar}"/>
<rule pattern="org.fusesource.**" result="scala.tools.fusesource_embedded. at 1"/>
-@@ -1238,7 +1262,7 @@
+@@ -1251,7 +1274,7 @@
<pre> <!-- TODO the files copied here do not influence actuality of this target (nor does the manifest) -->
<copy todir="${build-pack.dir}/lib">
<resources refid="repl.fileset"/>
@@ -223,14 +230,14 @@ Forwarded: not-needed
</copy>
<copy todir="${build-pack.dir}/lib">
<fileset dir="${lib-extra.dir}">
-@@ -1641,10 +1665,10 @@
+@@ -1654,10 +1677,10 @@
<!-- Obtain mima -->
<mkdir dir="${bc-build.dir}"/>
<!-- Pull down MIMA -->
- <artifact:dependencies pathId="mima.classpath">
-- <dependency groupId="com.typesafe" artifactId="mima-reporter_2.10" version="0.1.8"/>
+- <dependency groupId="com.typesafe" artifactId="mima-reporter_2.10" version="0.1.14"/>
+ <artifact:dependencies pathid="mima.classpath">
-+ <dependency coords="com.typesafe:mima-reporter_2.10:0.1.8"/>
++ <dependency coords="com.typesafe:mima-reporter_2.10:0.1.14"/>
</artifact:dependencies>
- <artifact:dependencies pathId="old.bc.classpath">
+ <artifact:dependencies pathid="old.bc.classpath">
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git
More information about the pkg-java-commits
mailing list