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 96d1fe93ac662ee65b61b8438991386f3854ca47 Author: Emmanuel Bourg <[email protected]> Date: Mon Aug 1 16:13:07 2016 +0200 Refreshed the patches --- debian/changelog | 4 +- .../patches/0002-Use-system-ant-contrib.jar.patch | 13 ++---- debian/patches/0006-ignore-test-dependencies.patch | 6 +-- debian/patches/0008-disable-lib-fetching.patch | 28 +++++++---- debian/patches/0009-local-repository.patch | 54 +++++++++------------- debian/patches/0010-bnd-2.1.0.patch | 6 +-- 6 files changed, 54 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c38979..41fc710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -scala (2.11.6-7) UNRELEASED; urgency=medium +scala (2.11.8-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Standards-Version updated to 3.9.8 * Use a secure Vcs-Git URL * Improved the description for scala-library and scala-doc diff --git a/debian/patches/0002-Use-system-ant-contrib.jar.patch b/debian/patches/0002-Use-system-ant-contrib.jar.patch index 95b0119..927edcc 100644 --- a/debian/patches/0002-Use-system-ant-contrib.jar.patch +++ b/debian/patches/0002-Use-system-ant-contrib.jar.patch @@ -1,14 +1,9 @@ -From: Mehdi Dogguy <[email protected]> -Date: Thu, 23 Jun 2011 23:12:28 +0200 -Subject: Use system ant-contrib.jar - ---- - build.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - +Description: Use system ant-contrib.jar +Author: Mehdi Dogguy <[email protected]> +Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -247,7 +247,7 @@ +@@ -246,7 +246,7 @@ <target name="init" depends="init.git"> <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute --> diff --git a/debian/patches/0006-ignore-test-dependencies.patch b/debian/patches/0006-ignore-test-dependencies.patch index 5b6bf40..63070dc 100644 --- a/debian/patches/0006-ignore-test-dependencies.patch +++ b/debian/patches/0006-ignore-test-dependencies.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -283,25 +283,13 @@ +@@ -291,25 +291,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"/> -@@ -320,20 +308,10 @@ +@@ -363,20 +351,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"> -@@ -1210,7 +1188,7 @@ +@@ -1295,7 +1273,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 cf2f041..3eaf122 100644 --- a/debian/patches/0008-disable-lib-fetching.patch +++ b/debian/patches/0008-disable-lib-fetching.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -225,7 +225,7 @@ +@@ -224,7 +224,7 @@ </touch> </target> @@ -12,23 +12,35 @@ 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"> -@@ -268,12 +268,14 @@ - <mkdir dir="${user.home}/.m2/repository"/> +@@ -272,16 +272,19 @@ + <!-- 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="1.50.0"/> </artifact:dependencies> + <artifact:dependencies pathId="jarjar.classpath"> ++ <remoteRepository id="central" url="file:///usr/share/maven-repo"/> + <dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/> + </artifact:dependencies> + <!-- JUnit --> -- <property name="junit.version" value="4.11"/> -+ <property name="junit.version" value="4.x"/> + <property name="junit.version" value="4.11"/> <artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset"> + <remoteRepository id="central" url="file:///usr/share/maven-repo"/> <dependency groupId="junit" artifactId="junit" version="${junit.version}"/> </artifact:dependencies> <copy-deps project="junit"/> -@@ -315,6 +317,7 @@ +@@ -345,6 +348,7 @@ + <prepareCross name="scalacheck"/> + + <artifact:dependencies pathId="asm.classpath" filesetId="asm.fileset"> ++ <remoteRepository id="central" url="file:///usr/share/maven-repo"/> + <dependency groupId="org.scala-lang.modules" artifactId="scala-asm" version="${scala-asm.version}"/> + </artifact:dependencies> + <copy-deps project="asm"/> +@@ -358,6 +362,7 @@ </artifact:dependencies> <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions"> @@ -36,7 +48,7 @@ Forwarded: not-needed <dependency groupId="jline" artifactId="jline" version="${jline.version}"/> </artifact:dependencies> <copy-deps project="repl"/> -@@ -322,12 +325,14 @@ +@@ -365,12 +370,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"> @@ -52,7 +64,7 @@ Forwarded: not-needed </artifact:dependencies> <!-- External modules, excluding the core --> -@@ -354,7 +359,8 @@ +@@ -397,7 +404,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 5a57c96..9521af0 100644 --- a/debian/patches/0009-local-repository.patch +++ b/debian/patches/0009-local-repository.patch @@ -1,20 +1,9 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 16 Nov 2015 22:01:56 +0100 -Subject: local repository - -Define localRepository explicitly, otherwise the build will use the -/nonexistent home directory which causes a FTBFS - +Description: Define localRepository explicitly, otherwise the build will use the /nonexistent home directory which causes a FTBFS +Author: Markus Koschany <[email protected]> Forwarded: not-needed ---- - 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: +@@ -273,11 +273,13 @@ <!-- 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"/> @@ -22,15 +11,21 @@ index 5bb6d2e..091674e 100755 <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="jarjar.classpath"> + <remoteRepository id="central" url="file:///usr/share/maven-repo"/> ++ <localRepository path="${user.home}/.m2/repository"/> + <dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/> + </artifact:dependencies> + +@@ -285,6 +287,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"/> + <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: +@@ -294,13 +297,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"> @@ -47,7 +42,14 @@ index 5bb6d2e..091674e 100755 </artifact:dependencies> <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/> -@@ -310,14 +315,17 @@ TODO: +@@ -349,20 +355,24 @@ + + <artifact:dependencies pathId="asm.classpath" filesetId="asm.fileset"> + <remoteRepository id="central" url="file:///usr/share/maven-repo"/> ++ <localRepository path="${user.home}/.m2/repository"/> + <dependency groupId="org.scala-lang.modules" artifactId="scala-asm" version="${scala-asm.version}"/> + </artifact:dependencies> + <copy-deps project="asm"/> <!-- 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"> @@ -65,7 +67,7 @@ index 5bb6d2e..091674e 100755 <dependency groupId="jline" artifactId="jline" version="${jline.version}"/> </artifact:dependencies> <copy-deps project="repl"/> -@@ -326,6 +334,7 @@ TODO: +@@ -371,6 +381,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"/> @@ -73,7 +75,7 @@ index 5bb6d2e..091674e 100755 <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: +@@ -406,6 +417,7 @@ <artifact:dependencies pathId="starr.compiler.path" filesetId="starr.fileset"> <!--<artifact:remoteRepository refid="extra-repo"/>--> <remoteRepository id="central" url="file:///usr/share/maven-repo"/> @@ -81,15 +83,3 @@ index 5bb6d2e..091674e 100755 <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/0010-bnd-2.1.0.patch b/debian/patches/0010-bnd-2.1.0.patch index c9329d1..2a532e8 100644 --- a/debian/patches/0010-bnd-2.1.0.patch +++ b/debian/patches/0010-bnd-2.1.0.patch @@ -9,11 +9,9 @@ Forwarded: no build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build.xml b/build.xml -index 091674e..1d4e12a 100755 --- a/build.xml +++ b/build.xml -@@ -270,7 +270,7 @@ TODO: +@@ -274,7 +274,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"/> @@ -21,4 +19,4 @@ index 091674e..1d4e12a 100755 + <dependency groupId="biz.aQute.bnd" artifactId="bnd" version="debian"/> </artifact:dependencies> - <!-- JUnit --> + <artifact:dependencies pathId="jarjar.classpath"> -- 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
