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 60074d895c6265542cc3f44e49ef513119731abf Author: Mehdi Dogguy <[email protected]> Date: Thu Dec 15 21:31:20 2011 +0100 Convert patch to 'dom' format --- debian/patches/0001-Use-system-ant-contrib.jar.patch | 4 ++-- ...A_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch} | 20 ++++++++++++-------- debian/patches/series | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/debian/patches/0001-Use-system-ant-contrib.jar.patch b/debian/patches/0001-Use-system-ant-contrib.jar.patch index b62a9b7..9490ff2 100644 --- a/debian/patches/0001-Use-system-ant-contrib.jar.patch +++ b/debian/patches/0001-Use-system-ant-contrib.jar.patch @@ -1,13 +1,13 @@ From: Mehdi Dogguy <[email protected]> Date: Thu, 23 Jun 2011 23:12:28 +0200 -Subject: [PATCH] Use system ant-contrib.jar +Subject: Use system ant-contrib.jar --- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml -index b121824..51986d6 100644 +index 2281613..b488a58 100644 --- a/build.xml +++ b/build.xml @@ -211,7 +211,7 @@ INITIALISATION diff --git a/debian/patches/0002-Adapt-tool-unix.tmpl.patch b/debian/patches/0002-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch similarity index 70% rename from debian/patches/0002-Adapt-tool-unix.tmpl.patch rename to debian/patches/0002-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch index f7dc1ee..d1c9247 100644 --- a/debian/patches/0002-Adapt-tool-unix.tmpl.patch +++ b/debian/patches/0002-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch @@ -1,13 +1,16 @@ -Description: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout. -Origin: vendor -Forwarded: not-needed -Author: Frank S. Thomas <[email protected]> +From: "Frank S. Thomas" <[email protected]> +Date: Wed, 7 Sep 2011 20:41:30 +0000 +Subject: Adapt SCALA_HOME and TOOL_CLASSPATH to the package layout -Index: b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl -=================================================================== +--- + .../scala/tools/ant/templates/tool-unix.tmpl | 29 +------------------ + 1 files changed, 2 insertions(+), 27 deletions(-) + +diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +index a3dc582..2e150b3 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl -@@ -48,23 +48,7 @@ +@@ -48,23 +48,7 @@ case "`uname`" in esac # Finding the root folder for this Scala distribution @@ -32,7 +35,7 @@ Index: b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl # Remove spaces from SCALA_HOME on windows if $cygwin; then -@@ -73,16 +57,7 @@ +@@ -73,16 +57,7 @@ if $cygwin; then fi # Constructing the extension classpath @@ -50,3 +53,4 @@ Index: b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl CYGWIN_JLINE_TERMINAL= if $cygwin; then +-- diff --git a/debian/patches/series b/debian/patches/series index 26d86fd..acd8cb2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 0001-Use-system-ant-contrib.jar.patch -0002-Adapt-tool-unix.tmpl.patch +0002-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
