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 72c2df6c6cd6daff90a46a3ce301231ed39b9f24 Author: Mehdi Dogguy <[email protected]> Date: Thu Dec 15 22:00:23 2011 +0100 Update patches --- debian/patches/0001-Define-system-locations.patch | 36 ++++++++++++++++++++++ ...patch => 0002-Use-system-ant-contrib.jar.patch} | 6 ++-- ...HOME-and-TOOL_CLASSPATH-to-the-package-l.patch} | 0 debian/patches/series | 5 +-- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/debian/patches/0001-Define-system-locations.patch b/debian/patches/0001-Define-system-locations.patch new file mode 100644 index 0000000..2fee3dc --- /dev/null +++ b/debian/patches/0001-Define-system-locations.patch @@ -0,0 +1,36 @@ +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(-) + +diff --git a/build.xml b/build.xml +index 2281613..f77c225 100644 +--- a/build.xml ++++ b/build.xml +@@ -141,6 +141,10 @@ PROPERTIES + <!-- 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"/> +@@ -159,6 +163,11 @@ PROPERTIES + <property name="scalac.args" value=""/> + <property name="javac.args" value=""/> + ++ <!-- 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="lib.starr.jar" value="${lib.dir}/scala-library.jar"/> + <property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/> +-- diff --git a/debian/patches/0001-Use-system-ant-contrib.jar.patch b/debian/patches/0002-Use-system-ant-contrib.jar.patch similarity index 88% rename from debian/patches/0001-Use-system-ant-contrib.jar.patch rename to debian/patches/0002-Use-system-ant-contrib.jar.patch index 9490ff2..1b728ca 100644 --- a/debian/patches/0001-Use-system-ant-contrib.jar.patch +++ b/debian/patches/0002-Use-system-ant-contrib.jar.patch @@ -7,15 +7,15 @@ Subject: Use system ant-contrib.jar 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml -index 2281613..b488a58 100644 +index f77c225..33db14a 100644 --- a/build.xml +++ b/build.xml -@@ -211,7 +211,7 @@ INITIALISATION +@@ -220,7 +220,7 @@ INITIALISATION <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/> <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> <!-- Setting-up Ant contrib tasks --> - <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/> -+ <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="/usr/share/java/ant-contrib.jar"/> ++ <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${javalib.dir}/ant-contrib.jar"/> <!-- This is the start time for the distribution --> <tstamp prefix="time"> <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/> diff --git a/debian/patches/0002-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 similarity index 100% rename from debian/patches/0002-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch rename to debian/patches/0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch diff --git a/debian/patches/series b/debian/patches/series index acd8cb2..47fbde1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ -0001-Use-system-ant-contrib.jar.patch -0002-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
