This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit 58071287ef3b1be9e789d33ffbda4e72ea68aa61 Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 12 14:07:03 2015 +0200 Removed 0001-Define-system-locations.patch (obsolete) --- debian/changelog | 1 + debian/patches/0001-Define-system-locations.patch | 33 ----------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 659bd64..8545bdf 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 + - 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 * The package has been adopted by the Java Team (Closes: #754935) diff --git a/debian/patches/0001-Define-system-locations.patch b/debian/patches/0001-Define-system-locations.patch deleted file mode 100644 index 33ef923..0000000 --- a/debian/patches/0001-Define-system-locations.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Mehdi Dogguy <[email protected]> -Date: Thu, 15 Dec 2011 21:38:12 +0100 -Subject: Define system locations - ---- - build.xml | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - ---- a/build.xml -+++ b/build.xml -@@ -97,6 +97,10 @@ - <!-- Prevents system classpath from being used --> - <property name="build.sysclasspath" value="ignore"/> - -+ <!-- Defines system location of java libraries --> -+ <property name="javalib.dir" value="/usr/share/java" /> -+ <property name="scalalib.dir" value="${javalib.dir}/scala" /> -+ - <!-- Defines the repository layout --> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> -@@ -117,6 +121,11 @@ - <!-- read starr.version --> - <property file="${basedir}/starr.number"/> - -+ <!-- Sets location of system libraries --> -+ <property name="junit.jar" value="${javalib.dir}/junit4.jar"/> -+ <property name="jansi.jar" value="${javalib.dir}/jansi.jar"/> -+ <property name="jansi-native.jar" value="${javalib.dir}/jansi-native.jar"/> -+ - <!-- Sets location of pre-compiled libraries --> - <property name="library.starr.jar" value="${lib.dir}/scala-library.jar"/> - <property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/> diff --git a/debian/patches/series b/debian/patches/series index 6d1d9fb..6892b16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -0001-Define-system-locations.patch 0002-Use-system-ant-contrib.jar.patch 0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch 0006-ignore-pax-exam-dependencies.patch -- 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
