[scala] 15/24: Added new dependencies on scala-xml and scala-parser-combinators Refreshed 0008-disable-lib-fetching.patch
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jun 19 16:00:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository scala.
commit 97a1a06a6d69e62fe9528229a605d011cf0b8f68
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jun 17 23:46:45 2015 +0200
Added new dependencies on scala-xml and scala-parser-combinators
Refreshed 0008-disable-lib-fetching.patch
---
debian/changelog | 1 +
debian/control | 6 ++-
debian/patches/0008-disable-lib-fetching.patch | 60 +++++++++++++++++++-------
debian/rules | 1 +
4 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 21f5859..5fee927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ scala (2.11.6-2) UNRELEASED; urgency=medium
* Team upload.
* New upstream release (Closes: #706633, #750464, #760930)
- Refreshed the patches
+ - Added new dependencies on scala-xml and scala-parser-combinators
- Removed 0001-Define-system-locations.patch (obsolete)
- Removed 0005-java7-compilation.patch (fixed upstream)
- Depend on libjline2-java instead of building an embedded copy of jline
diff --git a/debian/control b/debian/control
index 5c1c700..b17634c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,9 @@ Build-Depends:
debhelper (>= 9),
javahelper,
maven-repo-helper (>= 1.6~),
- scala (>= 2.10)
+ scala (>= 2.10),
+ scala-parser-combinators,
+ scala-xml
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/scala.git
Vcs-Git: git://anonscm.debian.org/pkg-java/scala.git
@@ -27,6 +29,8 @@ Package: scala
Architecture: all
Depends:
scala-library (= ${source:Version}),
+ scala-parser-combinators,
+ scala-xml,
default-jre-headless (>= 2:1.7) | java7-runtime-headless,
libjline2-java,
${misc:Depends}
diff --git a/debian/patches/0008-disable-lib-fetching.patch b/debian/patches/0008-disable-lib-fetching.patch
index 530f7ff..cf2f041 100644
--- a/debian/patches/0008-disable-lib-fetching.patch
+++ b/debian/patches/0008-disable-lib-fetching.patch
@@ -3,34 +3,62 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -200,7 +200,7 @@
+@@ -225,7 +225,7 @@
</touch>
</target>
-- <target name="init" depends="boot">
-+ <target name="init">
- <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
- <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${javalib.dir}/ant-contrib.jar"/>
-
-@@ -218,12 +218,14 @@
+- <target name="init.git" depends="boot">
++ <target name="init.git">
+ <!-- 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"/>
<!-- 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">
-- <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
+ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
-+ <dependency groupId="biz.aQute" artifactId="bnd" version="debian"/>
+ <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
</artifact:dependencies>
<!-- JUnit -->
- <property name="junit.version" value="4.10"/>
+- <property name="junit.version" value="4.11"/>
++ <property name="junit.version" value="4.x"/>
<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 @@
+ </artifact:dependencies>
---- a/starr.number
-+++ b/starr.number
-@@ -1,2 +1 @@
- starr.version=2.10.3
--starr.use.released=1
-\ No newline at end of file
+ <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions">
++ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+ <dependency groupId="jline" artifactId="jline" version="${jline.version}"/>
+ </artifact:dependencies>
+ <copy-deps project="repl"/>
+@@ -322,12 +325,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">
+- <artifact:remoteRepository refid="extra-repo"/>
++ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+ <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}"/>
++<!--
+ <dependency groupId="org.scala-lang.plugins" artifactId="scala-continuations-plugin${scala-continuations-plugin.cross}" version="${scala-continuations-plugin.version.number}"/>
+ <dependency groupId="org.scala-lang.plugins" artifactId="scala-continuations-library${scala-continuations-library.cross}" version="${scala-continuations-library.version.number}"/>
+ <dependency groupId="org.scala-lang.modules" artifactId="scala-swing${scala-swing.cross}" version="${scala-swing.version.number}"/>
++-->
+ </artifact:dependencies>
+
+ <!-- External modules, excluding the core -->
+@@ -354,7 +359,8 @@
+
+ <echo message="Using Scala ${starr.version} for STARR."/>
+ <artifact:dependencies pathId="starr.compiler.path" filesetId="starr.fileset">
+- <artifact:remoteRepository refid="extra-repo"/>
++ <!--<artifact:remoteRepository refid="extra-repo"/>-->
++ <remoteRepository id="central" url="file:///usr/share/maven-repo"/>
+ <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}"/>
diff --git a/debian/rules b/debian/rules
index f997839..ff84715 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ override_dh_auto_build:
-Dreflect.starr.jar=/usr/share/java/scala-reflect.jar \
-Dcompiler.starr.jar=/usr/share/java/scala-compiler.jar \
-Djline.version=2.x \
+ -Dstarr.version=debian \
fastdist-opt docs
for file in scala-library scala-compiler scala-reflect scala-actors; do \
--
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