[zookeeper] 04/07: refresh patches for 3.4.10

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch experimental
in repository zookeeper.

commit 11060f813a62ff7894379f2e3e41df045635c219
Author: tony mancill <tmancill at debian.org>
Date:   Thu Jun 1 21:19:23 2017 -0700

    refresh patches for 3.4.10
---
 debian/patches/02-patch-build-system.patch                     | 10 +++++++---
 .../patches/07-remove-non-reproducible-manifest-entries.patch  | 10 +++++-----
 debian/patches/08-reproducible-javadoc.patch                   |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/patches/02-patch-build-system.patch b/debian/patches/02-patch-build-system.patch
index 9b7bf33..6b7ac67 100644
--- a/debian/patches/02-patch-build-system.patch
+++ b/debian/patches/02-patch-build-system.patch
@@ -4,13 +4,14 @@ Author: James Page <james.page at ubuntu.com>, Thomas Koch <thomas at koch.ro>
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -1239,26 +1239,10 @@
+@@ -1245,30 +1245,10 @@
      <target name="test-init" depends="jar,compile-test">
          <delete dir="${test.log.dir}" />
          <delete dir="${test.tmp.dir}" />
 -        <delete dir="${test.data.upgrade.dir}" />
 -        <delete dir="${test.data.invalid.dir}" />
 -        <delete dir="${test.data.buffersize.dir}" />
+-        <delete dir="${test.data.kerberos.dir}" />
          <delete dir="${test.data.dir}" />
          <mkdir dir="${test.log.dir}" />
          <mkdir dir="${test.tmp.dir}" />
@@ -27,11 +28,14 @@ Forwarded: not-needed
 -        <copy todir="${test.data.buffersize.dir}">
 -            <fileset dir="${basedir}/src/java/test/data/buffersize"/>
 -        </copy>
--       
+-        <mkdir dir="${test.data.kerberos.dir}" />
+-        <copy todir="${test.data.kerberos.dir}">
+-            <fileset dir="${basedir}/src/java/test/data/kerberos"/>
+-        </copy>
      </target>
  
      <condition property="quicktest">
-@@ -1311,6 +1295,9 @@
+@@ -1321,6 +1301,9 @@
            <batchtest todir="${test.log.dir}" if="fulltest">
              <fileset dir="${test.src.dir}">
                <include name="**/*${test.category}Test.java"/>
diff --git a/debian/patches/07-remove-non-reproducible-manifest-entries.patch b/debian/patches/07-remove-non-reproducible-manifest-entries.patch
index 4de0e0e..9ada5f6 100644
--- a/debian/patches/07-remove-non-reproducible-manifest-entries.patch
+++ b/debian/patches/07-remove-non-reproducible-manifest-entries.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -546,9 +546,6 @@
+@@ -550,9 +550,6 @@
              <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
              <manifest>
                  <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
@@ -13,7 +13,7 @@ Forwarded: no
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -587,9 +584,6 @@
+@@ -591,9 +588,6 @@
              <fileset dir="${build.classes}" excludes="**/.generated"/>
              <manifest>
                  <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
@@ -23,7 +23,7 @@ Forwarded: no
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -619,9 +613,6 @@
+@@ -623,9 +617,6 @@
              <fileset dir="${java.src.dir}"/>
              <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
              <manifest>
@@ -33,7 +33,7 @@ Forwarded: no
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -637,9 +628,6 @@
+@@ -641,9 +632,6 @@
              <fileset file="LICENSE.txt" />
              <fileset dir="${build.javadoc}"/>
              <manifest>
@@ -43,7 +43,7 @@ Forwarded: no
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -655,9 +643,6 @@
+@@ -659,9 +647,6 @@
              <fileset file="LICENSE.txt" />
              <fileset dir="${test.java.classes}"/>
              <manifest>
diff --git a/debian/patches/08-reproducible-javadoc.patch b/debian/patches/08-reproducible-javadoc.patch
index f84f8a9..74e9612 100644
--- a/debian/patches/08-reproducible-javadoc.patch
+++ b/debian/patches/08-reproducible-javadoc.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -470,6 +470,8 @@
+@@ -474,6 +474,8 @@
           windowtitle="${Name} ${version} API"
           doctitle="${Name} ${version} API"
           bottom="Copyright &copy; ${year} The Apache Software Foundation"
@@ -12,7 +12,7 @@ Forwarded: no
           >
      	<packageset dir="${java.src.dir}">
            <include name="org/apache/**"/>
-@@ -494,6 +496,8 @@
+@@ -498,6 +500,8 @@
           windowtitle="${Name} ${version} API"
           doctitle="${Name} ${version} API"
           bottom="Copyright &copy; ${year} The Apache Software Foundation"

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