[zookeeper] 08/10: Added the missing patch descriptions

[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 8198958daec896ce5560f04ee1be7dca3f7ed1d3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 26 13:21:35 2015 +0100

    Added the missing patch descriptions
---
 debian/changelog                         | 1 +
 debian/patches/fixes/ZOOKEEPER-705.patch | 4 ++++
 debian/patches/ftbfs-gcc-4.7.patch       | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a08e04b..2d8a11a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ zookeeper (3.4.6-1) UNRELEASED; urgency=medium
     - Use XZ compression for the upstream tarball
     - Delete the non filtered upstream tarball after unpacking it
   * Added the .patch extension to the patches
+  * Added the missing patch descriptions
 
  -- James Page <james.page at ubuntu.com>  Tue, 25 Mar 2014 09:41:18 +0000
 
diff --git a/debian/patches/fixes/ZOOKEEPER-705.patch b/debian/patches/fixes/ZOOKEEPER-705.patch
index ddb4f2a..cc12928 100644
--- a/debian/patches/fixes/ZOOKEEPER-705.patch
+++ b/debian/patches/fixes/ZOOKEEPER-705.patch
@@ -1,3 +1,7 @@
+Description: Fixes a build failure due to unknown opcode 'lock' in mt_adaptor.c
+ This patch can be removed after upgrading to Zookeeper 3.5.0 or later
+Author: Thomas Koch <thomas.koch at ymc.ch>
+Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-705
 --- a/src/c/src/mt_adaptor.c
 +++ b/src/c/src/mt_adaptor.c
 @@ -484,11 +484,7 @@ int32_t fetch_and_add(volatile int32_t*
diff --git a/debian/patches/ftbfs-gcc-4.7.patch b/debian/patches/ftbfs-gcc-4.7.patch
index 915601b..6359e05 100644
--- a/debian/patches/ftbfs-gcc-4.7.patch
+++ b/debian/patches/ftbfs-gcc-4.7.patch
@@ -1,3 +1,6 @@
+Description: Fix a build failure with GCC 4.7
+Author: Matthias Klose <doko at debian.org>
+Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-2108
 Index: zookeeper-3.3.5+dfsg1/src/contrib/zktreeutil/src/ZkAdaptor.cc
 ===================================================================
 --- zookeeper-3.3.5+dfsg1.orig/src/contrib/zktreeutil/src/ZkAdaptor.cc	2012-03-15 20:09:29.000000000 +0000

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