[netty-3.9] 14/18: 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-3.9.

commit 719bec07f487b17da6f714e2e4b56a3fc6936c39
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:26:22 2017 +0100

    Refreshed the patches
---
 debian/changelog                                     | 4 ++--
 debian/patches/0001-Exclude-some-source-files.patch  | 2 +-
 debian/patches/0002-ignore-npn.patch                 | 4 ++--
 debian/patches/0003-remove-tcnative-classifier.patch | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab0ffc8..9291eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-netty-3.9 (3.9.3.Final-1) UNRELEASED; urgency=medium
+netty-3.9 (3.9.6.Final-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
-    - Refreshed the patch
+    - Refreshed the patches
     - New dependencies on libjboss-logging-java, libbcpkix-java
       and libnetty-tcnative-java
     - Disabled NPN support (obsolete and missing dependencies)
diff --git a/debian/patches/0001-Exclude-some-source-files.patch b/debian/patches/0001-Exclude-some-source-files.patch
index 58fc1b4..8a3b55f 100644
--- a/debian/patches/0001-Exclude-some-source-files.patch
+++ b/debian/patches/0001-Exclude-some-source-files.patch
@@ -8,7 +8,7 @@ Subject: Exclude some source files
 
 --- a/pom.xml
 +++ b/pom.xml
-@@ -358,6 +358,12 @@
+@@ -370,6 +370,12 @@
            <optimize>true</optimize>
            <showDeprecation>true</showDeprecation>
            <showWarnings>true</showWarnings>
diff --git a/debian/patches/0002-ignore-npn.patch b/debian/patches/0002-ignore-npn.patch
index c16ffcf..91b3275 100644
--- a/debian/patches/0002-ignore-npn.patch
+++ b/debian/patches/0002-ignore-npn.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java
 +++ b/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java
-@@ -165,7 +165,7 @@
+@@ -167,7 +167,7 @@
          if (nextProtocols().isEmpty()) {
              return engine;
          } else {
@@ -14,7 +14,7 @@ Forwarded: not-needed
  
 --- a/pom.xml
 +++ b/pom.xml
-@@ -363,6 +363,7 @@
+@@ -375,6 +375,7 @@
              <exclude>org/jboss/netty/example/**</exclude>
              <exclude>org/jboss/netty/handler/codec/marshalling/**</exclude>
              <exclude>org/jboss/netty/logging/OsgiLogger*.java</exclude>
diff --git a/debian/patches/0003-remove-tcnative-classifier.patch b/debian/patches/0003-remove-tcnative-classifier.patch
index 578c34e..c91f565 100644
--- a/debian/patches/0003-remove-tcnative-classifier.patch
+++ b/debian/patches/0003-remove-tcnative-classifier.patch
@@ -4,7 +4,7 @@
        <groupId>${project.groupId}</groupId>
        <artifactId>netty-tcnative</artifactId>
        <version>1.1.30.Fork2</version>
--      <classifier>${os.detected.classifier}</classifier>
-       <scope>compile</scope>
+-      <classifier>windows-x86_64</classifier>
        <optional>true</optional>
      </dependency>
+ 

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