This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit eba8521c8d45705a3870d6ff3697a9a698b559cc Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 11 13:47:00 2015 +0200 Depend on libjline2-java instead of building an embedded copy of jline --- debian/ant-jline.properties | 3 -- debian/build-jline.xml | 42 --------------------- debian/changelog | 6 ++- debian/control | 4 +- debian/copyright | 7 ---- debian/patches/remove-non-ascii-ftbfs.patch | 57 ----------------------------- debian/patches/series | 1 - debian/rules | 5 +-- debian/scala.install | 1 - debian/scala.links | 1 + 10 files changed, 10 insertions(+), 117 deletions(-) diff --git a/debian/ant-jline.properties b/debian/ant-jline.properties deleted file mode 100644 index 1b2d3c6..0000000 --- a/debian/ant-jline.properties +++ /dev/null @@ -1,3 +0,0 @@ -class.dir=dists/jline -source.dir=src/jline/src -jar.name=lib/jline.jar diff --git a/debian/build-jline.xml b/debian/build-jline.xml deleted file mode 100644 index a8efd4e..0000000 --- a/debian/build-jline.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<project default="jar" name="jline" basedir=".."> - - <property name="java.libdir" value="/usr/share/java" /> - - <target name="clean"> - <delete dir="${class.dir}" quiet="true" /> - <delete file="${jar.name}" quiet="true" /> - </target> - - <target name="compile"> - <mkdir dir="${class.dir}" /> - - <javac srcdir="${source.dir}" - destdir="${class.dir}" - includeantruntime="false" - deprecation="true" - debug="true" - optimize="false" - > - <include name="**/*.java"/> - <classpath> - <pathelement location="${java.libdir}/jansi.jar" /> - <pathelement location="${java.libdir}/jansi-native.jar" /> - <pathelement location="${java.libdir}/junit4.jar" /> - </classpath> - </javac> - - <copy todir="${class.dir}"> - <fileset dir="${source.dir}/main/java" /> - <fileset dir="${source.dir}/main/resources"> - </fileset> - </copy> - </target> - - <target name="jar" description="o Creates the jars" depends="compile"> - <jar jarfile="${jar.name}" basedir="${class.dir}" - includes="**/jline/**/*.class,**/jline/**/*.properties" /> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index a2abdbc..ca174a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ -scala (2.10.5-2) UNRELEASED; urgency=medium +scala (2.11.6-2) UNRELEASED; urgency=medium + * Team upload. + * New upstream release (Closes: #706633, #750464, #760930) + - Refreshed the patches + - Depend on libjline2-java instead of building an embedded copy of jline * The package has been adopted by the Java Team (Closes: #754935) * Adapted debian/orig-tar.sh for Scala 2.11 diff --git a/debian/control b/debian/control index 94ee5cc..6837896 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: bnd, libmaven-ant-tasks-java, junit4, - libjansi-java, + libjline2-java, debhelper (>= 9), javahelper, maven-repo-helper (>= 1.6~), @@ -28,7 +28,7 @@ Architecture: all Depends: scala-library (= ${source:Version}), openjdk-7-jre | java7-runtime | java6-runtime, - libjansi-java, + libjline2-java, ${misc:Depends} Suggests: scala-doc (>= ${source:Version}) Description: Scala programming language diff --git a/debian/copyright b/debian/copyright index 04d0d0e..93ccdc4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -74,13 +74,6 @@ License: public-domain Expert Group and released to the public domain, as explained at http://creativecommons.org/licenses/publicdomain -Files: src/jline/* -Copyright: © 2002-2007 Marc Prud'hommeaux <[email protected]> - © 2009-2010 the original author or authors -License: BSD-3-clause or Apache-2.0 - On Debian systems, the complete text of the Apache License - Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'. - Files: src/library/scala/util/Sorting.scala Copyright: © 2006-2009 Ross Judson License: BSD-3-clause diff --git a/debian/patches/remove-non-ascii-ftbfs.patch b/debian/patches/remove-non-ascii-ftbfs.patch deleted file mode 100644 index 2989521..0000000 --- a/debian/patches/remove-non-ascii-ftbfs.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/src/jline/src/main/java/scala/tools/jline/UnixTerminal.java -+++ b/src/jline/src/main/java/scala/tools/jline/UnixTerminal.java -@@ -33,7 +33,7 @@ - * @author <a href="mailto:[email protected]";>Marc Prud'hommeaux</a> - * @author <a href="mailto:[email protected]";>Dale Kemp</a> - * @author <a href="mailto:[email protected]";>Jason Dillon</a> -- * @author <a href="mailto:[email protected]";>Jean-Baptiste Onofré</a> -+ * @author <a href="mailto:[email protected]";>Jean-Baptiste Onofre</a> - * @since 2.0 - */ - public class UnixTerminal -@@ -245,4 +245,5 @@ - return codes.get((short) code); - } - } --} -\ No newline at end of file -+} -+ ---- a/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java -+++ b/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java -@@ -22,7 +22,7 @@ - * @author <a href="mailto:[email protected]";>Marc Prud'hommeaux</a> - * @author <a href="mailto:[email protected]";>Dale Kemp</a> - * @author <a href="mailto:[email protected]";>Jason Dillon</a> -- * @author <a href="mailto:[email protected]";>Jean-Baptiste Onofré</a> -+ * @author <a href="mailto:[email protected]";>Jean-Baptiste Onofre</a> - * @since 2.0 - */ - public final class TerminalLineSettings -@@ -214,4 +214,5 @@ - } - } - } --} -\ No newline at end of file -+} -+ ---- a/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java -+++ b/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java -@@ -8,7 +8,7 @@ - /** - * Tests for the {@link TerminalLineSettings}. - * -- * @author <a href="mailto:[email protected]";>Jean-Baptiste Onofré</a> -+ * @author <a href="mailto:[email protected]";>Jean-Baptiste Onofre</a> - */ - public class TerminalLineSettingsTest - { -@@ -143,4 +143,5 @@ - assertEquals(32, settings.getProperty("rows", freeBsdSttySample)); - } - --} -\ No newline at end of file -+} -+ diff --git a/debian/patches/series b/debian/patches/series index 13f4a94..e08191d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -remove-non-ascii-ftbfs.patch 0001-Define-system-locations.patch 0002-Use-system-ant-contrib.jar.patch 0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch diff --git a/debian/rules b/debian/rules index 33cb724..970bec0 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,6 @@ BUNDLE_VERSION="$(version.major).$(version.minor).$(version.patch)" dh $@ --with javahelper --with jh_maven_repo_helper override_dh_auto_build: - # Build Jline - ant -f debian/build-jline.xml -propertyfile debian/ant-jline.properties # Build Scala ANT_OPTS="-Xmx1024M -Xss64M" \ ant -Dversion.number=$(BUNDLE_VERSION) \ @@ -19,6 +17,7 @@ override_dh_auto_build: -Dlibrary.starr.jar=/usr/share/java/scala-library.jar \ -Dreflect.starr.jar=/usr/share/java/scala-reflect.jar \ -Dcompiler.starr.jar=/usr/share/java/scala-compiler.jar \ + -Djline.version=2.x \ fastdist-opt for file in scala scala-library; do \ @@ -26,7 +25,7 @@ override_dh_auto_build: done override_dh_auto_clean: - rm -rf build dists lib/jline.jar buildcharacter.properties + rm -rf build dists buildcharacter.properties override_dh_compress: dh_compress -X.js -X.scala diff --git a/debian/scala.install b/debian/scala.install index 11e1386..91fe946 100644 --- a/debian/scala.install +++ b/debian/scala.install @@ -3,4 +3,3 @@ dists/latest/bin/scala usr/bin/ dists/latest/bin/scalac usr/bin/ dists/latest/bin/scaladoc usr/bin/ dists/latest/bin/scalap usr/bin/ -lib/jline.jar usr/share/java/scala/ diff --git a/debian/scala.links b/debian/scala.links new file mode 100644 index 0000000..88d6f9c --- /dev/null +++ b/debian/scala.links @@ -0,0 +1 @@ +usr/share/java/jline2.jar usr/share/java/scala/jline.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
