[scala-2.10] 162/166: Removed 0001-Define-system-locations.patch (obsolete)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit 0df481e53652e5d441a7d5cd614291e451191930
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 12 14:07:03 2015 +0200

    Removed 0001-Define-system-locations.patch (obsolete)
---
 debian/patches/0001-Define-system-locations.patch | 33 -----------------------
 debian/patches/series                             |  1 -
 debian/rules                                      |  1 +
 3 files changed, 1 insertion(+), 34 deletions(-)

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 <mehdi at debian.org>
-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 da9f20b..ba9ef7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 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
 0005-java7-compilation.patch
diff --git a/debian/rules b/debian/rules
index 23a609f..cc18894 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ override_dh_auto_build:
 	    -Dgit.commit.date=unknown \
 	    -Dscaladoc.url=https://github.com/scala/scala/tree/v$(BUNDLE_VERSION)/src \
 	    -Djunit.version=4.x \
+	    -Djavalib.dir=/usr/share/java \
 	    -Dextra.repo.url=file:///usr/share/maven-repo \
 	    -Dlibrary.starr.jar=/usr/share/java/scala-library.jar \
 	    -Dreflect.starr.jar=/usr/share/java/scala-reflect.jar \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git