[protobuf-java-format] 02/07: Removed 01-protobuf-compatibility.patch (fixed upstream)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository protobuf-java-format.

commit 7adf7a84b95da03012e3d8126d889a00a968a12a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 3 22:13:00 2016 +0200

    Removed 01-protobuf-compatibility.patch (fixed upstream)
---
 debian/changelog                               |  7 +++++++
 debian/patches/01-protobuf-compatibility.patch | 12 ------------
 debian/patches/series                          |  1 -
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aad9e68..81f784b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+protobuf-java-format (1.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Removed 01-protobuf-compatibility.patch (fixed upstream)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Aug 2016 22:09:26 +0200
+
 protobuf-java-format (1.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #825459)
diff --git a/debian/patches/01-protobuf-compatibility.patch b/debian/patches/01-protobuf-compatibility.patch
deleted file mode 100644
index ee599d4..0000000
--- a/debian/patches/01-protobuf-compatibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Fix the compatibility with the recent versions of protoc
-Origin: backport, https://github.com/bivas/protobuf-java-format/commit/cb3f550
---- a/src/test/resources/proto/unittest.proto
-+++ b/src/test/resources/proto/unittest.proto
-@@ -410,6 +410,7 @@
- 
- // Test an enum that has multiple values with the same number.
- enum TestEnumWithDupValue {
-+  option allow_alias=true;
-   FOO1 = 1;
-   BAR1 = 2;
-   BAZ = 3;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b8d57bd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-protobuf-compatibility.patch

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