[netty-3.9] 10/18: New dependency on libjboss-logging-java

[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 130e276e939d0ec1c80a4a64f31a2b9480fb218b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:20:11 2017 +0100

    New dependency on libjboss-logging-java
---
 debian/changelog                                    | 3 ++-
 debian/control                                      | 1 +
 debian/maven.ignoreRules                            | 1 -
 debian/patches/0001-Exclude-some-source-files.patch | 3 +--
 debian/patches/0002-ignore-npn.patch                | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c53e98d..ab0ffc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ netty-3.9 (3.9.3.Final-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patch
-    - New dependencies on libbcpkix-java and libnetty-tcnative-java
+    - New dependencies on libjboss-logging-java, libbcpkix-java
+      and libnetty-tcnative-java
     - Disabled NPN support (obsolete and missing dependencies)
   * Switch to debhelper level 10
   * Modified the watch file to track the 3.9.x releases from Git
diff --git a/debian/control b/debian/control
index de53f39..331460c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends-Indep: default-jdk,
  libbcpkix-java,
  libcommons-logging-java,
  libeasymock-java,
+ libjboss-logging-java,
  liblog4j1.2-java,
  libnetty-tcnative-java,
  libservlet3.1-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index aa8937f..b636ab5 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -17,7 +17,6 @@ org.codehaus.mojo animal-sniffer-maven-plugin * * * *
 org.easymock easymock * * * *
 org.easymock easymockclassextension * * * *
 org.eclipse.jetty.npn npn-api * * * *
-org.jboss.logging jboss-logging-spi * * * *
 org.jboss.marshalling jboss-marshalling-river * * * *
 org.jboss.marshalling jboss-marshalling-serial * * * *
 org.jboss.marshalling jboss-marshalling * * * *
diff --git a/debian/patches/0001-Exclude-some-source-files.patch b/debian/patches/0001-Exclude-some-source-files.patch
index 609fdc2..58fc1b4 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,13 @@
+@@ -358,6 +358,12 @@
            <optimize>true</optimize>
            <showDeprecation>true</showDeprecation>
            <showWarnings>true</showWarnings>
@@ -16,7 +16,6 @@ Subject: Exclude some source files
 +            <exclude>org/jboss/netty/container/**</exclude>
 +            <exclude>org/jboss/netty/example/**</exclude>
 +            <exclude>org/jboss/netty/handler/codec/marshalling/**</exclude>
-+            <exclude>org/jboss/netty/logging/JBossLogger*.java</exclude>
 +            <exclude>org/jboss/netty/logging/OsgiLogger*.java</exclude>
 +          </excludes>
          </configuration>
diff --git a/debian/patches/0002-ignore-npn.patch b/debian/patches/0002-ignore-npn.patch
index d9a661b..c16ffcf 100644
--- a/debian/patches/0002-ignore-npn.patch
+++ b/debian/patches/0002-ignore-npn.patch
@@ -14,9 +14,9 @@ Forwarded: not-needed
  
 --- a/pom.xml
 +++ b/pom.xml
-@@ -364,6 +364,7 @@
+@@ -363,6 +363,7 @@
+             <exclude>org/jboss/netty/example/**</exclude>
              <exclude>org/jboss/netty/handler/codec/marshalling/**</exclude>
-             <exclude>org/jboss/netty/logging/JBossLogger*.java</exclude>
              <exclude>org/jboss/netty/logging/OsgiLogger*.java</exclude>
 +            <exclude>org/jboss/netty/handler/ssl/JettyNpnSsl*.java</exclude>
            </excludes>

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