Inclusive rewording of comments in dacapo_patch.patchHEADmaster

Removed name of local branches from dacapo_patch.patch as these
all contained the word 'master' which has been depricated.

Change-Id: Ia0b2435bc34508bef90c30d6c42100721cf85d1e

1 files changed, 33 insertions, 33 deletions

diff --git a/dacapo/patches/dacapo_patch.patch b/dacapo/patches/dacapo_patch.patch
index b6c29c2..c4155d1 100644
--- a/dacapo/patches/dacapo_patch.patch
+++ b/dacapo/patches/dacapo_patch.patch
@@ -1,6 +1,6 @@
-diff -ruNb dacapobench-master/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java dacapobench-master-new/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java
---- dacapobench-master/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java	2021-08-10 13:12:45.648344931 +0100
+diff -ruNb original/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java patched/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java
+--- original/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/bms/avrora/harness/src/org/dacapo/harness/Avrora.java	2021-08-10 13:12:45.648344931 +0100
 #
 #
 # This change adds additional argument to constructor of Avrora benchmark class
@@ -18,9 +18,9 @@ diff -ruNb dacapobench-master/benchmarks/bms/avrora/harness/src/org/dacapo/harne
      Class<?> clazz = Class.forName("avrora.Main", true, loader);
      this.method = clazz.getMethod("main", String[].class);
    }
-diff -ruNb dacapobench-master/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java dacapobench-master-new/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java
---- dacapobench-master/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java	2021-08-11 10:43:32.725990169 +0100
+diff -ruNb original/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java patched/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java
+--- original/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/bms/h2/harness/src/org/dacapo/harness/H2.java	2021-08-11 10:43:32.725990169 +0100
 #
 #
 # This change adds additional argument to constructor of H2 benchmark class
@@ -37,9 +37,9 @@ diff -ruNb dacapobench-master/benchmarks/bms/h2/harness/src/org/dacapo/harness/H
    }
    
    @Override
-diff -ruNb dacapobench-master/benchmarks/bms/luindex/build.xml dacapobench-master-new/benchmarks/bms/luindex/build.xml
---- dacapobench-master/benchmarks/bms/luindex/build.xml	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/bms/luindex/build.xml	2021-08-09 12:19:17.852233037 +0100
+diff -ruNb original/benchmarks/bms/luindex/build.xml patched/benchmarks/bms/luindex/build.xml
+--- original/benchmarks/bms/luindex/build.xml	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/bms/luindex/build.xml	2021-08-09 12:19:17.852233037 +0100
 @@ -32,7 +32,7 @@
  
      <target name="bm-build" depends="lucene">
@@ -49,9 +49,9 @@ diff -ruNb dacapobench-master/benchmarks/bms/luindex/build.xml dacapobench-maste
             classpath="${harness-classpath}:${lucene-jars}/${lucene-core-jar-name}:${lucene-jars}/${lucene-demos-jar-name}" 
             destdir="${bm-build-dir}" 
             includes="org/dacapo/luindex/*" debug="true" debuglevel="lines,vars,source"/>
-diff -ruNb dacapobench-master/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java dacapobench-master-new/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java
---- dacapobench-master/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java	2021-08-10 11:53:29.035233056 +0100
+diff -ruNb original/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java patched/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java
+--- original/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/bms/xalan/harness/src/org/dacapo/harness/Xalan.java	2021-08-10 11:53:29.035233056 +0100
 #
 #
 # This change adds additional argument to constructor of Xalan benchmark class
@@ -68,9 +68,9 @@ diff -ruNb dacapobench-master/benchmarks/bms/xalan/harness/src/org/dacapo/harnes
      Class<?> clazz = Class.forName("org.dacapo.xalan.XSLTBench", true, loader);
      this.method = clazz.getMethod("doWork", int.class);
      createWorkersMethod = clazz.getMethod("createWorkers", int.class);
-diff -ruNb dacapobench-master/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java dacapobench-master-new/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java
---- dacapobench-master/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java	2021-08-12 17:17:08.052311883 +0100
+diff -ruNb original/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java patched/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java
+--- original/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBench.java	2021-08-12 17:17:08.052311883 +0100
 #
 #
 # This change suppresses the exception thrown in Xalan benchmark due to
@@ -86,9 +86,9 @@ diff -ruNb dacapobench-master/benchmarks/bms/xalan/src/org/dacapo/xalan/XSLTBenc
      }
  
      // Fix the JAXP transformer to be Xalan
-diff -ruNb dacapobench-master/benchmarks/build.xml dacapobench-master-new/benchmarks/build.xml
---- dacapobench-master/benchmarks/build.xml	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/build.xml	2021-08-19 14:20:22.079839936 +0100
+diff -ruNb original/benchmarks/build.xml patched/benchmarks/build.xml
+--- original/benchmarks/build.xml	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/build.xml	2021-08-19 14:20:22.079839936 +0100
 #
 #
 # This change disables all other benchmarks from the build target, except for
@@ -146,9 +146,9 @@ diff -ruNb dacapobench-master/benchmarks/build.xml dacapobench-master-new/benchm
      <target name="xalan" depends="init,harness">
          <build.bm benchmark="xalan"/>
      </target>
-diff -ruNb dacapobench-master/benchmarks/harness/src/org/dacapo/harness/Benchmark.java dacapobench-master-new/benchmarks/harness/src/org/dacapo/harness/Benchmark.java
---- dacapobench-master/benchmarks/harness/src/org/dacapo/harness/Benchmark.java	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/harness/src/org/dacapo/harness/Benchmark.java	2021-08-10 12:26:42.669206949 +0100
+diff -ruNb original/benchmarks/harness/src/org/dacapo/harness/Benchmark.java patched/benchmarks/harness/src/org/dacapo/harness/Benchmark.java
+--- original/benchmarks/harness/src/org/dacapo/harness/Benchmark.java	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/harness/src/org/dacapo/harness/Benchmark.java	2021-08-10 12:26:42.669206949 +0100
 #
 #
 # This change does two things:
@@ -222,9 +222,9 @@ diff -ruNb dacapobench-master/benchmarks/harness/src/org/dacapo/harness/Benchmar
      ZipInputStream input = new ZipInputStream(inputStream);
      ZipEntry entry;
      while ((entry = input.getNextEntry()) != null) {
-diff -ruNb dacapobench-master/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java dacapobench-master-new/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java
---- dacapobench-master/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java	2021-08-10 15:34:33.592765614 +0100
+diff -ruNb original/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java patched/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java
+--- original/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/harness/src/org/dacapo/harness/CommandLineArgs.java	2021-08-10 15:34:33.592765614 +0100
 #
 #
 # This change does two things:
@@ -290,9 +290,9 @@ diff -ruNb dacapobench-master/benchmarks/harness/src/org/dacapo/harness/CommandL
    }
  
    /**
-diff -ruNb dacapobench-master/benchmarks/libs/h2/build.xml dacapobench-master-new/benchmarks/libs/h2/build.xml
---- dacapobench-master/benchmarks/libs/h2/build.xml	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/libs/h2/build.xml	2021-08-05 13:32:34.631246523 +0100
+diff -ruNb original/benchmarks/libs/h2/build.xml patched/benchmarks/libs/h2/build.xml
+--- original/benchmarks/libs/h2/build.xml	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/libs/h2/build.xml	2021-08-05 13:32:34.631246523 +0100
 #
 #
 # This change fixes the URL to Maven repository to use HTTPS instead of HTTP
@@ -307,9 +307,9 @@ diff -ruNb dacapobench-master/benchmarks/libs/h2/build.xml dacapobench-master-ne
      <property name="lib-src" value="h2-${lib-version}.jar"/>
  
      <import file="../common.xml"/>
-diff -ruNb dacapobench-master/benchmarks/libs/junit/build.xml dacapobench-master-new/benchmarks/libs/junit/build.xml
---- dacapobench-master/benchmarks/libs/junit/build.xml	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/libs/junit/build.xml	2021-08-05 13:30:58.533605200 +0100
+diff -ruNb original/benchmarks/libs/junit/build.xml patched/benchmarks/libs/junit/build.xml
+--- original/benchmarks/libs/junit/build.xml	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/libs/junit/build.xml	2021-08-05 13:30:58.533605200 +0100
 #
 #
 # This change fixes the URL to Maven repository to use HTTPS instead of HTTP
@@ -324,9 +324,9 @@ diff -ruNb dacapobench-master/benchmarks/libs/junit/build.xml dacapobench-master
      <property name="lib-src" value="junit-${lib-version}.jar"/>
  
      <import file="../common.xml"/>
-diff -ruNb dacapobench-master/benchmarks/libs/lucene/build.xml dacapobench-master-new/benchmarks/libs/lucene/build.xml
---- dacapobench-master/benchmarks/libs/lucene/build.xml	2020-06-01 03:15:20.000000000 +0100
-+++ dacapobench-master-new/benchmarks/libs/lucene/build.xml	2021-08-12 11:45:36.631105917 +0100
+diff -ruNb original/benchmarks/libs/lucene/build.xml patched/benchmarks/libs/lucene/build.xml
+--- original/benchmarks/libs/lucene/build.xml	2020-06-01 03:15:20.000000000 +0100
++++ patched/benchmarks/libs/lucene/build.xml	2021-08-12 11:45:36.631105917 +0100
 @@ -20,7 +20,9 @@
  
    <property name="lib-build-top" value="${lib-build-dir}/lucene-${lib-version}"/>