[netty] 03/04: 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 f55f58fe167789a0521ed55c81dbd785ab7a796c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 30 00:09:38 2016 +0200

    Refreshed the patches
---
 debian/changelog                                         | 4 +++-
 debian/patches/01-ignore-npn.patch                       | 8 ++++----
 debian/patches/02-ignore-enforcer-rules.patch            | 2 +-
 debian/patches/05-reproducible-versions-properties.patch | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2470e2d..570f3f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-netty (1:4.0.41-2) UNRELEASED; urgency=medium
+netty (1:4.0.42-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 30 Oct 2016 00:07:37 +0200
diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
index 923e9f4..c420b29 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
-@@ -736,6 +736,7 @@
+@@ -729,6 +729,7 @@
          </configuration>
        </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>
-@@ -753,6 +754,7 @@
+@@ -746,6 +747,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
-@@ -268,6 +268,7 @@
+@@ -270,6 +270,7 @@
          switch(config.protocol()) {
          case NONE:
              return JdkDefaultApplicationProtocolNegotiator.INSTANCE;
@@ -53,7 +53,7 @@ Forwarded: not-needed
          case ALPN:
              if (isServer) {
                  switch(config.selectorFailureBehavior()) {
-@@ -312,6 +313,7 @@
+@@ -314,6 +315,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 b89e391..7e3e9cb 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
-@@ -1009,18 +1009,6 @@
+@@ -1002,18 +1002,6 @@
  
      <pluginManagement>
        <plugins>
diff --git a/debian/patches/05-reproducible-versions-properties.patch b/debian/patches/05-reproducible-versions-properties.patch
index dd5d88c..e4b8173 100644
--- a/debian/patches/05-reproducible-versions-properties.patch
+++ b/debian/patches/05-reproducible-versions-properties.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -971,11 +971,11 @@
+@@ -964,11 +964,11 @@
  
                  <propertyfile file="${versionPropFile}" comment="Generated by netty-parent/pom.xml">
                    <entry key="${project.artifactId}.version" value="${project.version}" />

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