[netty-3.9] 06/18: New dependency on libnetty-tcnative-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 b8f9a84aa116e73ad99321d7734a1a838cdec83b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:11:28 2017 +0100

    New dependency on libnetty-tcnative-java
---
 debian/changelog                                     |  2 +-
 debian/control                                       |  1 +
 debian/maven.ignoreRules                             |  1 +
 debian/patches/0003-remove-tcnative-classifier.patch | 10 ++++++++++
 debian/patches/series                                |  1 +
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 68f9aa9..d339134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ netty-3.9 (3.9.2.Final-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patch
-    - New dependency on libbcpkix-java
+    - New dependencies on 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 db41f6c..de53f39 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends-Indep: default-jdk,
  libcommons-logging-java,
  libeasymock-java,
  liblog4j1.2-java,
+ libnetty-tcnative-java,
  libservlet3.1-java,
  libslf4j-java,
  maven-debian-helper (>= 2.0.3~),
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 7d189d3..1dd9f2d 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,6 +1,7 @@
 
 javax.activation activation * * * *
 junit junit * * * *
+kr.motd.maven os-maven-plugin * * * *
 org.apache.felix org.osgi.compendium * * * *
 org.apache.felix org.osgi.core * * * *
 org.apache.maven.plugins maven-antrun-plugin * * * *
diff --git a/debian/patches/0003-remove-tcnative-classifier.patch b/debian/patches/0003-remove-tcnative-classifier.patch
new file mode 100644
index 0000000..578c34e
--- /dev/null
+++ b/debian/patches/0003-remove-tcnative-classifier.patch
@@ -0,0 +1,10 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -75,7 +75,6 @@
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-tcnative</artifactId>
+       <version>1.1.30.Fork2</version>
+-      <classifier>${os.detected.classifier}</classifier>
+       <scope>compile</scope>
+       <optional>true</optional>
+     </dependency>
diff --git a/debian/patches/series b/debian/patches/series
index 461d05e..bee44e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Exclude-some-source-files.patch
 0002-ignore-npn.patch
+0003-remove-tcnative-classifier.patch

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