[netty] 03/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 0146861668fe20e755c441d8cfd1a22d3d99ce12
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 2 15:23:46 2016 +0200

    Refreshed the patches
---
 debian/changelog                                         | 4 +++-
 debian/patches/01-ignore-npn.patch                       | 4 ++--
 debian/patches/02-ignore-enforcer-rules.patch            | 6 +++---
 debian/patches/05-reproducible-versions-properties.patch | 2 +-
 debian/patches/06-remove-tcnative-classifier.patch       | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e394b38..092e56f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-netty (1:4.0.37-2) UNRELEASED; urgency=medium
+netty (1:4.0.40-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Build the netty-transport-native-epoll module
   * Removed the unused dependency on libbcel-java
 
diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
index 565d81c..67ce0fe 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
-@@ -719,6 +719,7 @@
+@@ -734,6 +734,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>
-@@ -736,6 +737,7 @@
+@@ -751,6 +752,7 @@
            </execution>
          </executions>
        </plugin>
diff --git a/debian/patches/02-ignore-enforcer-rules.patch b/debian/patches/02-ignore-enforcer-rules.patch
index 2b16070..316c13f 100644
--- a/debian/patches/02-ignore-enforcer-rules.patch
+++ b/debian/patches/02-ignore-enforcer-rules.patch
@@ -3,19 +3,19 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -991,18 +991,6 @@
+@@ -1007,18 +1007,6 @@
  
      <pluginManagement>
        <plugins>
 -        <plugin>
 -          <artifactId>maven-enforcer-plugin</artifactId>
--          <version>1.3.1</version>
+-          <version>1.4.1</version>
 -          <dependencies>
 -            <!-- Provides the 'requireFilesContent' enforcer rule. -->
 -            <dependency>
 -              <groupId>com.ceilfors.maven.plugin</groupId>
 -              <artifactId>enforcer-rules</artifactId>
--              <version>1.1.0</version>
+-              <version>1.2.0</version>
 -            </dependency>
 -          </dependencies>
 -        </plugin>
diff --git a/debian/patches/05-reproducible-versions-properties.patch b/debian/patches/05-reproducible-versions-properties.patch
index 6f87ca3..eb4831f 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
-@@ -953,11 +953,11 @@
+@@ -969,11 +969,11 @@
  
                  <propertyfile file="${versionPropFile}" comment="Generated by netty-parent/pom.xml">
                    <entry key="${project.artifactId}.version" value="${project.version}" />
diff --git a/debian/patches/06-remove-tcnative-classifier.patch b/debian/patches/06-remove-tcnative-classifier.patch
index 648a0e0..5fc9a11 100644
--- a/debian/patches/06-remove-tcnative-classifier.patch
+++ b/debian/patches/06-remove-tcnative-classifier.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -297,7 +297,6 @@
+@@ -298,7 +298,6 @@
          <groupId>${project.groupId}</groupId>
          <artifactId>${tcnative.artifactId}</artifactId>
          <version>${tcnative.version}</version>
@@ -24,7 +24,7 @@ Forwarded: not-needed
      <dependency>
 --- a/transport-native-epoll/pom.xml
 +++ b/transport-native-epoll/pom.xml
-@@ -51,7 +51,6 @@
+@@ -55,7 +55,6 @@
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>${tcnative.artifactId}</artifactId>

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