[netty] 02/04: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Aug 30 06:56:58 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netty.

commit eaf6c6268e9dc9cd505274705c32f5361294f71d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 30 00:30:20 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 63dc78b..b4a36e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netty (1:4.0.41-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 30 Aug 2016 00:30:02 +0200
+
 netty (1:4.0.40-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
index 67ce0fe..923e9f4 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
-@@ -734,6 +734,7 @@
+@@ -736,6 +736,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>
-@@ -751,6 +752,7 @@
+@@ -753,6 +754,7 @@
            </execution>
          </executions>
        </plugin>
diff --git a/debian/patches/02-ignore-enforcer-rules.patch b/debian/patches/02-ignore-enforcer-rules.patch
index 316c13f..b89e391 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
-@@ -1007,18 +1007,6 @@
+@@ -1009,18 +1009,6 @@
  
      <pluginManagement>
        <plugins>
diff --git a/debian/patches/05-reproducible-versions-properties.patch b/debian/patches/05-reproducible-versions-properties.patch
index eb4831f..dd5d88c 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
-@@ -969,11 +969,11 @@
+@@ -971,11 +971,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



More information about the pkg-java-commits mailing list