[jtreg] 04/05: 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 d64daa72da73f6941d0febca2a32f39bada62986
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 8 21:58:49 2016 +0100

    Refreshed the patches
---
 debian/changelog                                 |  4 +++-
 debian/patches/add-jcommander-to-classpath.patch | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6975766..7b20ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jtreg (4.2-b03-2) UNRELEASED; urgency=medium
+jtreg (4.2-b04-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Replaced the override_dh_auto_clean target with debian/clean
   * Switch to debhelper level 10
 
diff --git a/debian/patches/add-jcommander-to-classpath.patch b/debian/patches/add-jcommander-to-classpath.patch
index 6c2484c..de8c8b1 100644
--- a/debian/patches/add-jcommander-to-classpath.patch
+++ b/debian/patches/add-jcommander-to-classpath.patch
@@ -2,9 +2,9 @@ Description: Add jcommander to the classpath when TestNG is used.
  This fixes a ClassNotFoundException when running the OpenJDK 8 tests
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
---- a/src/share/classes/com/sun/javatest/regtest/MainAction.java
-+++ b/src/share/classes/com/sun/javatest/regtest/MainAction.java
-@@ -553,6 +553,7 @@
+--- 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 @@
                  .append(jdk.getJDKClassPath())
                  .append(script.getJUnitPath())
                  .append(script.getTestNGPath())
@@ -12,9 +12,9 @@ Forwarded: no
                  .asList();
  
          SearchPath classpath = paths.get(PathKind.CLASSPATH);
---- a/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
-+++ b/src/share/classes/com/sun/javatest/regtest/RegressionScript.java
-@@ -700,16 +700,20 @@
+--- 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 @@
                  File md = workDir.getFile("modules");
                  if (needJUnit)
                      install(params.getJUnitPath(), md);
@@ -37,7 +37,7 @@ Forwarded: no
          }
  
          // Extras:
-@@ -801,8 +805,10 @@
+@@ -809,8 +813,10 @@
                  File md = workDir.getFile("modules");
                  if (needJUnit)
                      install(params.getJUnitPath(), md);
@@ -49,7 +49,7 @@ Forwarded: no
                  mp.append(md);
              }
          } else {
-@@ -810,8 +816,10 @@
+@@ -818,8 +824,10 @@
              if (needJUnit)
                  fp.append(params.getJUnitPath());
  

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