[zookeeper] 03/07: 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 2837f4548a5fb422ae2962520f0d98214d3010d3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 26 10:10:42 2016 +0100

    Refreshed the patches
---
 debian/changelog                               |  4 +++-
 debian/patches/debian/patch-build-system.patch |  2 +-
 debian/patches/fixes/ZOOKEEPER-770.patch       | 22 +++++++++-------------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8adf4d..6718731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-zookeeper (3.4.7-2) UNRELEASED; urgency=medium
+zookeeper (3.4.8-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 3.9.7 (no changes)
   * Use secure Vcs-* URLs
 
diff --git a/debian/patches/debian/patch-build-system.patch b/debian/patches/debian/patch-build-system.patch
index ddcbb96..461fab7 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.7" />
+     <property name="version" value="3.4.8" />
 -    <property name="final.name" value="${name}-${version}"/>
 +    <property name="final.name" value="${name}"/>
      <property name="revision.dir" value="${basedir}/.revision" />
diff --git a/debian/patches/fixes/ZOOKEEPER-770.patch b/debian/patches/fixes/ZOOKEEPER-770.patch
index 16bbef5..93ec4ec 100644
--- a/debian/patches/fixes/ZOOKEEPER-770.patch
+++ b/debian/patches/fixes/ZOOKEEPER-770.patch
@@ -1,11 +1,9 @@
 Description: Slow add_auth calls with multi-threaded client
 Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-770
 
-Index: zookeeper/src/c/tests/TestClient.cc
-===================================================================
---- zookeeper.orig/src/c/tests/TestClient.cc
-+++ zookeeper/src/c/tests/TestClient.cc
-@@ -181,6 +181,20 @@ public:
+--- a/src/c/tests/TestClient.cc
++++ b/src/c/tests/TestClient.cc
+@@ -181,6 +181,20 @@
      }
  } watchctx_t;
  
@@ -26,7 +24,7 @@ Index: zookeeper/src/c/tests/TestClient.cc
  class Zookeeper_simpleSystem : public CPPUNIT_NS::TestFixture
  {
      CPPUNIT_TEST_SUITE(Zookeeper_simpleSystem);
-@@ -432,6 +446,14 @@ public:
+@@ -432,6 +446,14 @@
          count++;
      }
  
@@ -41,7 +39,7 @@ Index: zookeeper/src/c/tests/TestClient.cc
      static void verifyCreateFails(const char *path, zhandle_t *zk) {
        CPPUNIT_ASSERT_EQUAL((int)ZBADARGUMENTS, zoo_create(zk,
            path, "", 0, &ZOO_OPEN_ACL_UNSAFE, 0, 0, 0));
-@@ -519,6 +541,8 @@ public:
+@@ -519,6 +541,8 @@
          zhandle_t *zk = createClient(&ctx1);
          struct ACL_vector nodeAcl;
          struct ACL acl_val;
@@ -50,7 +48,7 @@ Index: zookeeper/src/c/tests/TestClient.cc
          rc = zoo_add_auth(0, "", 0, 0, voidCompletion, (void*)-1);
          CPPUNIT_ASSERT_EQUAL((int) ZBADARGUMENTS, rc);
  
-@@ -552,11 +576,13 @@ public:
+@@ -552,11 +576,13 @@
          //create a new client
          zk = createClient(&ctx2);
  
@@ -65,11 +63,9 @@ Index: zookeeper/src/c/tests/TestClient.cc
  
          char buf[1024];
          int blen = sizeof(buf);
-Index: zookeeper/src/c/src/zookeeper.c
-===================================================================
---- zookeeper.orig/src/c/src/zookeeper.c
-+++ zookeeper/src/c/src/zookeeper.c
-@@ -1314,7 +1314,7 @@ static int send_info_packet(zhandle_t *z
+--- a/src/c/src/zookeeper.c
++++ b/src/c/src/zookeeper.c
+@@ -1328,7 +1328,7 @@
      /* We queued the buffer, so don't free it */
      close_buffer_oarchive(&oa, 0);
  

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