[jtreg] 02/03: 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 jtreg.

commit e59158cdd6183ada95a0da600456e3fe751a6685
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 20 11:12:49 2017 +0100

    Refreshed the patches
---
 debian/changelog                                 | 8 ++++++++
 debian/patches/add-jcommander-to-classpath.patch | 8 ++++----
 debian/patches/launchers.patch                   | 8 ++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0d224c..53f21e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jtreg (4.2-b05-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 Jan 2017 11:12:29 +0100
+
 jtreg (4.2-b04-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/add-jcommander-to-classpath.patch b/debian/patches/add-jcommander-to-classpath.patch
index de8c8b1..1cc7ef2 100644
--- a/debian/patches/add-jcommander-to-classpath.patch
+++ b/debian/patches/add-jcommander-to-classpath.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
 +++ b/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
-@@ -556,6 +556,7 @@
+@@ -558,6 +558,7 @@
                  .append(jdk.getJDKClassPath())
                  .append(script.getJUnitPath())
                  .append(script.getTestNGPath())
@@ -14,7 +14,7 @@ Forwarded: no
          SearchPath classpath = paths.get(PathKind.CLASSPATH);
 --- a/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
 +++ b/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
-@@ -708,16 +708,20 @@
+@@ -713,16 +713,20 @@
                  File md = workDir.getFile("modules");
                  if (needJUnit)
                      install(params.getJUnitPath(), md);
@@ -37,7 +37,7 @@ Forwarded: no
          }
  
          // Extras:
-@@ -809,8 +813,10 @@
+@@ -814,8 +818,10 @@
                  File md = workDir.getFile("modules");
                  if (needJUnit)
                      install(params.getJUnitPath(), md);
@@ -49,7 +49,7 @@ Forwarded: no
                  mp.append(md);
              }
          } else {
-@@ -818,8 +824,10 @@
+@@ -823,8 +829,10 @@
              if (needJUnit)
                  fp.append(params.getJUnitPath());
  
diff --git a/debian/patches/launchers.patch b/debian/patches/launchers.patch
index af66423..0e8ffc1 100644
--- a/debian/patches/launchers.patch
+++ b/debian/patches/launchers.patch
@@ -93,9 +93,9 @@
      $jtdiffOpts
 --- a/src/share/bin/jtreg.sh
 +++ b/src/share/bin/jtreg.sh
-@@ -48,40 +48,6 @@
- # jtreg also provides Ant tasks; see the online help for details.
- # E.g.  jtreg -onlineHelp ant
+@@ -47,40 +47,6 @@
+ #
+ # jtreg also provides Ant tasks; see the documentation for details.
  
 -# Determine jtreg/JavaTest installation directory
 -if [ -n "$JT_HOME" ]; then
@@ -134,7 +134,7 @@
  # Separate out -J* options for the JVM
  # Note jdk as possible default to run jtreg
  # Unset IFS and use newline as arg separator to preserve spaces in args
-@@ -102,37 +68,24 @@
+@@ -101,37 +67,24 @@
  done
  unset DUALCASE
  

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