[scala] 06/23: Refreshed the patches

[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.

commit 44b16f707eb4e332c2cbdcdf3a9ee38663fc6aab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 12 14:10:00 2015 +0200

    Refreshed the patches
---
 debian/patches/0002-Use-system-ant-contrib.jar.patch       |  8 ++++----
 ...pt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0002-Use-system-ant-contrib.jar.patch b/debian/patches/0002-Use-system-ant-contrib.jar.patch
index c8a7093..95b0119 100644
--- a/debian/patches/0002-Use-system-ant-contrib.jar.patch
+++ b/debian/patches/0002-Use-system-ant-contrib.jar.patch
@@ -8,12 +8,12 @@ Subject: Use system ant-contrib.jar
 
 --- a/build.xml
 +++ b/build.xml
-@@ -202,7 +202,7 @@
+@@ -247,7 +247,7 @@
  
-   <target name="init" depends="boot">
+   <target name="init" depends="init.git">
      <!-- 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="${lib-ant.dir}/ant-contrib.jar"/>
 +    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${javalib.dir}/ant-contrib.jar"/>
  
-     <!-- Add our maven ant tasks -->
-     <path id="maven-ant-tasks.classpath" path="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" />
+     <property name="scala.ant.min.version" value="1.8.2"/>
+     <if><not><antversion atleast="${scala.ant.min.version}"/></not>
diff --git a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
index ea84b6f..dc9db47 100644
--- a/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
+++ b/debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch
@@ -34,17 +34,21 @@ Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout
  SEP=":"
  
  # Possible additional command line options
-@@ -84,16 +74,7 @@
+@@ -83,20 +73,7 @@
  fi
  
  # Constructing the extension classpath
 -TOOL_CLASSPATH="@classpath@"
 -if [[ -z "$TOOL_CLASSPATH" ]]; then
 -    for ext in "$SCALA_HOME"/lib/* ; do
--        if [[ -z "$TOOL_CLASSPATH" ]]; then
--            TOOL_CLASSPATH="$ext"
--        else
--            TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}"
+-        file_extension="${ext##*.}"
+-        # SI-8967 Only consider directories and files named '*.jar'
+-        if [[ -d "$ext" || $file_extension == "jar" ]]; then
+-          if [[ -z "$TOOL_CLASSPATH" ]]; then
+-              TOOL_CLASSPATH="$ext"
+-          else
+-              TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}"
+-          fi
 -        fi
 -    done
 -fi

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