[netty] 01/01: Fixed the netty-all pom (Closes: #852255)

[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 fec724d78bbba188319cfd6dece0b1c4ec2045d6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 23 17:31:44 2017 +0100

    Fixed the netty-all pom (Closes: #852255)
---
 debian/changelog                        |   7 ++
 debian/patches/04-netty-all-light.patch | 145 +++++++++++++++++++++++++++++++-
 2 files changed, 150 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6be6d3c..1effbfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netty (1:4.1.7-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the netty-all pom (Closes: #852255)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 23 Jan 2017 09:32:14 +0100
+
 netty (1:4.1.7-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/04-netty-all-light.patch b/debian/patches/04-netty-all-light.patch
index 7a2c39e..4cb2fa6 100644
--- a/debian/patches/04-netty-all-light.patch
+++ b/debian/patches/04-netty-all-light.patch
@@ -4,7 +4,148 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/all/pom.xml
 +++ b/all/pom.xml
-@@ -435,7 +435,7 @@
+@@ -198,140 +197,120 @@
+       <artifactId>netty-codec</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-dns</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-haproxy</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-http</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-http2</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-memcache</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-mqtt</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-smtp</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-socks</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-codec-stomp</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-common</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-handler</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-handler-proxy</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-resolver</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-resolver-dns</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-transport</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-transport-rxtx</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-transport-sctp</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-transport-udt</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>netty-example</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
+-      <optional>true</optional>
+     </dependency>
+ 
+     <!-- Add optional dependencies explicitly to avoid Javadoc warnings and errors. -->
+@@ -435,7 +414,7 @@
            </execution>
            <execution>
              <id>merge-version-properties</id>
@@ -13,7 +154,7 @@ Forwarded: not-needed
              <goals>
                <goal>run</goal>
              </goals>
-@@ -463,7 +463,7 @@
+@@ -463,7 +442,7 @@
            <!-- Clean everything once finished so that IDE doesn't find the unpacked files. -->
            <execution>
              <id>clean-source-directory</id>

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