[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 086a156dabfb2e9bac7481943e2473a625190505
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 9 22:45:03 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 26950b8..c0682b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jtreg (4.2-b02-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 09 May 2016 22:44:44 +0200
+
 jtreg (4.2-b01-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 a6e76ad..75f817d 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/MainAction.java
 +++ b/src/share/classes/com/sun/javatest/regtest/MainAction.java
-@@ -535,6 +535,7 @@
+@@ -540,6 +540,7 @@
                  .append(jdk.getJDKClassPath())
                  .append(script.getJUnitJar())
                  .append(script.getTestNGJar())
@@ -14,7 +14,7 @@ Forwarded: no
          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
-@@ -671,16 +671,20 @@
+@@ -692,16 +692,20 @@
                  File md = workDir.getFile("modules");
                  if (needJUnit)
                      install(params.getJUnitJar(), md);
@@ -37,7 +37,7 @@ Forwarded: no
          }
  
          // Extras:
-@@ -772,8 +776,10 @@
+@@ -793,8 +797,10 @@
                  File md = workDir.getFile("modules");
                  if (needJUnit)
                      install(params.getJUnitJar(), md);
@@ -49,7 +49,7 @@ Forwarded: no
                  mp.append(md);
              }
          } else {
-@@ -781,8 +787,10 @@
+@@ -802,8 +808,10 @@
              if (needJUnit)
                  fp.append(params.getJUnitJar());
  

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