[zookeeper] 03/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 zookeeper.

commit fbbd2078fb3178c2e1dca6d50cb91e79cbb7ac00
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jan 2 22:10:08 2016 +0100

    Refreshed the patches
---
 debian/changelog                                   |  4 +-
 .../patches/debian/disable-cygwin-detection.patch  | 12 +++--
 debian/patches/debian/patch-build-system.patch     | 52 +++++++++++-----------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f99977..6ff689f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-zookeeper (3.4.6-9) UNRELEASED; urgency=medium
+zookeeper (3.4.7-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Updated the upstream signing keys
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 02 Jan 2016 21:44:36 +0100
diff --git a/debian/patches/debian/disable-cygwin-detection.patch b/debian/patches/debian/disable-cygwin-detection.patch
index 1ea8f63..3066adc 100644
--- a/debian/patches/debian/disable-cygwin-detection.patch
+++ b/debian/patches/debian/disable-cygwin-detection.patch
@@ -7,11 +7,9 @@ Description: Disable detection of cygwin under Debian installs
 Author: Akira Kitada <akitada at gmail.com>
 Forwarded: not-needed
 
-Index: zookeeper/bin/zkServer.sh
-===================================================================
---- zookeeper.orig/bin/zkServer.sh
-+++ zookeeper/bin/zkServer.sh
-@@ -69,15 +69,6 @@ then
+--- a/bin/zkServer.sh
++++ b/bin/zkServer.sh
+@@ -92,15 +92,6 @@
      ZOOCFG="$2"
  fi
  
@@ -26,8 +24,8 @@ Index: zookeeper/bin/zkServer.sh
 -
  echo "Using config: $ZOOCFG" >&2
  
- if [ -z "$ZOOPIDFILE" ]; then
-@@ -140,7 +131,7 @@ stop)
+ case "$OSTYPE" in
+@@ -179,7 +170,7 @@
      then
        echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
      else
diff --git a/debian/patches/debian/patch-build-system.patch b/debian/patches/debian/patch-build-system.patch
index ce2fc0e..ddcbb96 100644
--- a/debian/patches/debian/patch-build-system.patch
+++ b/debian/patches/debian/patch-build-system.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 @@ -31,7 +31,7 @@
      <property environment="env"/>
      
-     <property name="version" value="3.4.6" />
+     <property name="version" value="3.4.7" />
 -    <property name="final.name" value="${name}-${version}"/>
 +    <property name="final.name" value="${name}"/>
      <property name="revision.dir" value="${basedir}/.revision" />
@@ -80,7 +80,7 @@ Forwarded: not-needed
        <mkdir dir="${test.java.classes}"/>
        <javac srcdir="${test.src.dir}" destdir="${test.java.classes}" includeantruntime="false"
               target="${javac.target}" source="${javac.source}" debug="on">
-@@ -1222,26 +1216,10 @@
+@@ -1237,26 +1231,10 @@
      <target name="test-init" depends="jar,compile-test">
          <delete dir="${test.log.dir}" />
          <delete dir="${test.tmp.dir}" />
@@ -107,7 +107,7 @@ Forwarded: not-needed
      </target>
  
      <condition property="quicktest">
-@@ -1294,6 +1272,9 @@
+@@ -1309,6 +1287,9 @@
            <batchtest todir="${test.log.dir}" if="fulltest">
              <fileset dir="${test.src.dir}">
                <include name="**/*${test.category}Test.java"/>
@@ -181,28 +181,28 @@ Forwarded: not-needed
 --- a/src/contrib/zooinspector/build.xml
 +++ b/src/contrib/zooinspector/build.xml
 @@ -20,7 +20,7 @@
- 
- 
- 	<target name="setjarname">
--		<property name="jarname" value="${build.dir}/zookeeper-${version}-${name}.jar" />
-+		<property name="jarname" value="${build.dir}/zookeeper-${name}.jar" />
- 	</target>
- 
- 	<target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init">
+ 
+ 
+ 	<target name="setjarname">
+-		<property name="jarname" value="${build.dir}/zookeeper-${version}-${name}.jar" />
++		<property name="jarname" value="${build.dir}/zookeeper-${name}.jar" />
+ 	</target>
+ 
+ 	<target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init">
 @@ -41,7 +41,7 @@
- 			<fileset file="${basedir}/lib/log4j.properties" />
- 		</copy>
- 		<copy todir="${build.dir}/lib">
--			<fileset file="../../../build/zookeeper-3.3.0.jar" />
-+			<fileset file="../../../build/zookeeper.jar" />
- 		</copy>
- 		<copy todir="${build.dir}">
- 			<fileset dir="${basedir}" includes="*.*" excludes="build.xml,ivy.xml" />
+ 			<fileset file="${basedir}/lib/log4j.properties" />
+ 		</copy>
+ 		<copy todir="${build.dir}/lib">
+-			<fileset file="../../../build/zookeeper-3.3.0.jar" />
++			<fileset file="../../../build/zookeeper.jar" />
+ 		</copy>
+ 		<copy todir="${build.dir}">
+ 			<fileset dir="${basedir}" includes="*.*" excludes="build.xml,ivy.xml" />
 @@ -55,7 +55,6 @@
- 		<jar jarfile="${jarname}">
- 			<manifest>
- 				<attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
--				<attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.0.jar lib/jToaster-1.0.4.jar lib" />
- 				<attribute name="Built-By" value="${user.name}" />
- 				<attribute name="Built-At" value="${build.time}" />
- 				<attribute name="Built-On" value="${host.name}" />
+ 		<jar jarfile="${jarname}">
+ 			<manifest>
+ 				<attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
+-				<attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.0.jar lib/jToaster-1.0.4.jar lib" />
+ 				<attribute name="Built-By" value="${user.name}" />
+ 				<attribute name="Built-At" value="${build.time}" />
+ 				<attribute name="Built-On" value="${host.name}" />

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