[bookkeeper] 11/12: Fixed the compatibility with protoc >= 2.6

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository bookkeeper.

commit 7cbc49113cd53d5e42f15005f09e0a857c176c54
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 16 10:59:16 2017 +0100

    Fixed the compatibility with protoc >= 2.6
---
 debian/changelog                             |  1 +
 debian/patches/03-protoc-compatibility.patch | 12 ++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1f77660..0e1d2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ bookkeeper (4.4.0-1) UNRELEASED; urgency=medium
     - New dependency on libjna-java
     - Build the new bookkeeper-stats module
     - Patched around a pom parsing bug in maven-repo-helper
+    - Fixed the compatibility with protoc >= 2.6
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/debian/patches/03-protoc-compatibility.patch b/debian/patches/03-protoc-compatibility.patch
new file mode 100644
index 0000000..6717d40
--- /dev/null
+++ b/debian/patches/03-protoc-compatibility.patch
@@ -0,0 +1,12 @@
+Description: Fixes the compatibility with the latest version of protoc
+Origin: backport
+Bug: https://issues.apache.org/jira/browse/BOOKKEEPER-937
+--- a/bookkeeper-server/src/test/proto/TestDataFormats.proto
++++ b/bookkeeper-server/src/test/proto/TestDataFormats.proto
+@@ -30,5 +30,5 @@
+  *
+  */
+ extend AuthMessage {
+-    required AuthMessageType messageType = 1000;
++    optional AuthMessageType messageType = 1000;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 0aa0dfb..7bf7880 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-add-commons-collections-dependency.patch
 02-ignore-xlint-settings.patch
+03-protoc-compatibility.patch

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