[netty] 02/03: 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 netty.

commit 845178dd3d72786196fcb6eb9c08ff4446b47e75
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 3 01:08:39 2015 +0200

    Refreshed the patches
---
 debian/changelog                              | 8 ++++++++
 debian/patches/01-ignore-npn.patch            | 8 ++++----
 debian/patches/02-ignore-enforcer-rules.patch | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db70a65..3b82270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netty (1:4.0.32-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release:
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 03 Oct 2015 01:08:12 +0200
+
 netty (1:4.0.31-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
index 04dba73..f240485 100644
--- a/debian/patches/01-ignore-npn.patch
+++ b/debian/patches/01-ignore-npn.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1038,6 +1038,7 @@
+@@ -1053,6 +1053,7 @@
          </dependencies>
        </plugin>
        <!-- Download the npn-boot.jar in advance to add it to the boot classpath. -->
@@ -11,7 +11,7 @@ Forwarded: not-needed
        <plugin>
          <artifactId>maven-dependency-plugin</artifactId>
          <executions>
-@@ -1067,6 +1068,7 @@
+@@ -1082,6 +1083,7 @@
            </execution>
          </executions>
        </plugin>
@@ -45,7 +45,7 @@ Forwarded: not-needed
  
 --- a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
 +++ b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
-@@ -223,6 +223,7 @@
+@@ -228,6 +228,7 @@
          switch(config.protocol()) {
          case NONE:
              return JdkDefaultApplicationProtocolNegotiator.INSTANCE;
@@ -53,7 +53,7 @@ Forwarded: not-needed
          case ALPN:
              if (isServer) {
                  switch(config.selectorFailureBehavior()) {
-@@ -267,6 +268,7 @@
+@@ -272,6 +273,7 @@
                      .append(config.selectorFailureBehavior()).append(" failure behavior").toString());
                  }
              }
diff --git a/debian/patches/02-ignore-enforcer-rules.patch b/debian/patches/02-ignore-enforcer-rules.patch
index 4ab7a29..e8a2335 100644
--- a/debian/patches/02-ignore-enforcer-rules.patch
+++ b/debian/patches/02-ignore-enforcer-rules.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1288,18 +1288,6 @@
+@@ -1327,18 +1327,6 @@
  
      <pluginManagement>
        <plugins>

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