[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-2-10-g753a0f1

James Page james.page at ubuntu.com
Wed Mar 21 22:35:02 UTC 2012 

The following commit has been merged in the master branch:
commit 3dc0a3ba114195d124cb9180122ba484e7577d17
Author: James Page <james.page at ubuntu.com>
Date:   Wed Mar 21 21:22:17 2012 +0000

    New upstream bugfix release.
    
    * New upstream bugfix release.
      - d/fix-broken-c-client-unittest.patch: Dropped - accepted upstream.
      - Refreshed all other patches.

diff --git a/debian/changelog b/debian/changelog
index da74532..0cf7b5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-zookeeper (3.3.4+dfsg1-4) UNRELEASED; urgency=low
+zookeeper (3.3.5+dfsg1-1) unstable; urgency=low
 
+  * New upstream bugfix release.
+    - d/fix-broken-c-client-unittest.patch: Dropped - accepted upstream.
+    - Refreshed all other patches.
   * Fix issue with quoting of parameters in zkCli.sh (Closes: #661837):
     - d/patches/fixes/ZOOKEEPER-1403: Ensure parameters are correctly
       quoted - thanks to John Eikenberry for this fix.
 
- -- James Page <james.page at ubuntu.com>  Fri, 02 Mar 2012 11:15:45 +0000
+ -- James Page <james.page at ubuntu.com>  Wed, 21 Mar 2012 21:20:30 +0000
 
 zookeeper (3.3.4+dfsg1-3) unstable; urgency=low
 
diff --git a/debian/patches/debian/disable-cygwin-detection b/debian/patches/debian/disable-cygwin-detection
index e12bae7..0ee9c3a 100644
--- a/debian/patches/debian/disable-cygwin-detection
+++ b/debian/patches/debian/disable-cygwin-detection
@@ -7,8 +7,10 @@ Description: Disable detection of cygwin under Debian installs
 Author: Akira Kitada <akitada at gmail.com>
 Forwarded: not-needed
 
---- a/bin/zkServer.sh   2011-11-30 19:50:33.000000000 +0900
-+++ b/bin/zkServer.sh   2011-12-04 18:12:56.000000000 +0900
+Index: zookeeper/bin/zkServer.sh
+===================================================================
+--- zookeeper.orig/bin/zkServer.sh	2012-03-21 21:14:50.620574500 +0000
++++ zookeeper/bin/zkServer.sh	2012-03-21 21:17:22.472936041 +0000
 @@ -70,15 +70,6 @@
      echo "Using config:$2" >&2
  fi
@@ -25,7 +27,7 @@ Forwarded: not-needed
  echo "Using config: $ZOOCFG" >&2
  
  if [ -z $ZOOPIDFILE ]
-@@ -126,7 +117,7 @@
+@@ -130,7 +121,7 @@
      then
        echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
      else
diff --git a/debian/patches/debian/patch-build-system b/debian/patches/debian/patch-build-system
index e4f47f7..1561634 100644
--- a/debian/patches/debian/patch-build-system
+++ b/debian/patches/debian/patch-build-system
@@ -6,12 +6,12 @@ Forwarded: not-needed
 
 Index: zookeeper/build.xml
 ===================================================================
---- zookeeper.orig/build.xml	2011-11-30 10:50:46.000000000 +0000
-+++ zookeeper/build.xml	2011-11-30 10:51:59.469098290 +0000
+--- zookeeper.orig/build.xml	2012-03-21 21:14:50.000000000 +0000
++++ zookeeper/build.xml	2012-03-21 21:17:09.456905785 +0000
 @@ -25,7 +25,7 @@
      <property environment="env"/>
      
-     <property name="version" value="3.3.4" />
+     <property name="version" value="3.3.5" />
 -    <property name="final.name" value="${name}-${version}"/>
 +    <property name="final.name" value="${name}"/>
      <property name="revision.dir" value="${basedir}/.revision" />
@@ -112,8 +112,8 @@ Index: zookeeper/build.xml
            <batchtest todir="${test.log.dir}" if="testcase">
 Index: zookeeper/src/contrib/bookkeeper/build.xml
 ===================================================================
---- zookeeper.orig/src/contrib/bookkeeper/build.xml	2011-11-23 15:16:05.000000000 +0000
-+++ zookeeper/src/contrib/bookkeeper/build.xml	2011-11-30 10:51:34.325184751 +0000
+--- zookeeper.orig/src/contrib/bookkeeper/build.xml	2012-03-21 21:14:35.000000000 +0000
++++ zookeeper/src/contrib/bookkeeper/build.xml	2012-03-21 21:16:42.916844204 +0000
 @@ -34,7 +34,7 @@
  
    <target name="setjarname">
@@ -125,8 +125,8 @@ Index: zookeeper/src/contrib/bookkeeper/build.xml
    <target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init"/>
 Index: zookeeper/src/contrib/build-contrib.xml
 ===================================================================
---- zookeeper.orig/src/contrib/build-contrib.xml	2011-11-23 15:16:05.000000000 +0000
-+++ zookeeper/src/contrib/build-contrib.xml	2011-11-30 10:51:34.325184751 +0000
+--- zookeeper.orig/src/contrib/build-contrib.xml	2012-03-21 21:14:35.000000000 +0000
++++ zookeeper/src/contrib/build-contrib.xml	2012-03-21 21:16:42.916844204 +0000
 @@ -70,25 +70,14 @@
  
    <path id="classpath">
@@ -186,8 +186,8 @@ Index: zookeeper/src/contrib/build-contrib.xml
  
 Index: zookeeper/src/contrib/zooinspector/build.xml
 ===================================================================
---- zookeeper.orig/src/contrib/zooinspector/build.xml	2011-11-23 15:16:05.000000000 +0000
-+++ zookeeper/src/contrib/zooinspector/build.xml	2011-11-30 10:51:34.325184751 +0000
+--- zookeeper.orig/src/contrib/zooinspector/build.xml	2012-03-21 21:14:35.000000000 +0000
++++ zookeeper/src/contrib/zooinspector/build.xml	2012-03-21 21:16:42.920844213 +0000
 @@ -20,7 +20,7 @@
  
  
diff --git a/debian/patches/fix-broken-c-client-unittest.patch b/debian/patches/fix-broken-c-client-unittest.patch
deleted file mode 100644
index 3f8afd9..0000000
--- a/debian/patches/fix-broken-c-client-unittest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Loosens C client unit test to allow multiple errors
- The test incorrectly assumes that ENOENT will eb returned on a clearly
- incorrectly formatted hostname. Some other C library implementations
- may do this, so we accept ENOENT or EINVAL.
-Author: Clint Byrum <clint at ubuntu.com>
-Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-1353
-Bug-Ubuntu: http://pad.lv/912935
-Forwarded: yes
-
---- zookeeper-3.3.4+dfsg1.orig/src/c/tests/TestZookeeperInit.cc
-+++ zookeeper-3.3.4+dfsg1/src/c/tests/TestZookeeperInit.cc
-@@ -230,7 +230,7 @@ public:
-         const string INVALID_HOST("host1:1111+host:123");
-         zh=zookeeper_init(INVALID_HOST.c_str(),0,0,0,0,0);
-         CPPUNIT_ASSERT(zh==0);
--        CPPUNIT_ASSERT_EQUAL(ENOENT,errno);
-+        CPPUNIT_ASSERT((ENOENT|EINVAL) & errno);
-     }
-     void testNonexistentHost()
-     {
diff --git a/debian/patches/fixes/ZOOKEEPER-1033 b/debian/patches/fixes/ZOOKEEPER-1033
index d2c9673..82976a7 100644
--- a/debian/patches/fixes/ZOOKEEPER-1033
+++ b/debian/patches/fixes/ZOOKEEPER-1033
@@ -5,14 +5,14 @@ Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-1033
 
 Index: zookeeper/src/c/configure.ac
 ===================================================================
---- zookeeper.orig/src/c/configure.ac	2011-11-30 10:50:46.000000000 +0000
-+++ zookeeper/src/c/configure.ac	2011-11-30 10:53:26.220804575 +0000
+--- zookeeper.orig/src/c/configure.ac	2012-03-21 21:14:50.000000000 +0000
++++ zookeeper/src/c/configure.ac	2012-03-21 21:18:13.509055030 +0000
 @@ -3,7 +3,7 @@
  
  AC_PREREQ(2.59)
  
--AC_INIT([zookeeper C client],3.3.4,[zookeeper-user at hadoop.apache.org],[c-client-src])
-+AC_INIT([zookeeper C client],3.3.4,[zookeeper-user at hadoop.apache.org],[zookeeper])
+-AC_INIT([zookeeper C client],3.3.5,[zookeeper-user at hadoop.apache.org],[c-client-src])
++AC_INIT([zookeeper C client],3.3.5,[zookeeper-user at hadoop.apache.org],[zookeeper])
  AC_CONFIG_SRCDIR([src/zookeeper.c])
  
  # initialize Doxygen support
diff --git a/debian/patches/series b/debian/patches/series
index f49a570..bd2f785 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@ debian/patch-build-system
 debian/disable-cygwin-detection
 fixes/ZOOKEEPER-705
 fixes/ZOOKEEPER-1033
-fix-broken-c-client-unittest.patch
 fixes/ZOOKEEPER-1374
 fixes/ZOOKEEPER-1403

-- 
Apache ZooKeeper

More information about the pkg-java-commits mailing list