[netty] 04/07: 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 cb2bd38cb69335c6f22c71706ec6c24093953dbf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Mar 27 01:18:41 2016 +0100

    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 7978c67..26a9b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-netty (1:4.0.34-2) UNRELEASED; urgency=medium
+netty (1:4.0.35-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 3.9.7 (no changes)
   * Use secure Vcs-* fields
 
diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
index f240485..ff5a8fd 100644
--- a/debian/patches/01-ignore-npn.patch
+++ b/debian/patches/01-ignore-npn.patch
@@ -3,15 +3,15 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1053,6 +1053,7 @@
-         </dependencies>
+@@ -697,6 +697,7 @@
+         </configuration>
        </plugin>
        <!-- Download the npn-boot.jar in advance to add it to the boot classpath. -->
 +<!--
        <plugin>
          <artifactId>maven-dependency-plugin</artifactId>
          <executions>
-@@ -1082,6 +1083,7 @@
+@@ -714,6 +715,7 @@
            </execution>
          </executions>
        </plugin>
@@ -21,7 +21,7 @@ Forwarded: not-needed
          <configuration>
 --- a/handler/pom.xml
 +++ b/handler/pom.xml
-@@ -78,5 +78,21 @@
+@@ -66,5 +66,21 @@
        <optional>true</optional>
      </dependency>
    </dependencies>
diff --git a/debian/patches/02-ignore-enforcer-rules.patch b/debian/patches/02-ignore-enforcer-rules.patch
index e8a2335..c614e60 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
-@@ -1327,18 +1327,6 @@
+@@ -965,18 +965,6 @@
  
      <pluginManagement>
        <plugins>
diff --git a/debian/patches/05-reproducible-versions-properties.patch b/debian/patches/05-reproducible-versions-properties.patch
index 3875878..a708b50 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
-@@ -874,11 +874,11 @@
+@@ -927,11 +927,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