[cglib] 01/01: Make the ant dependency really optional (Closes: #830204)

[Emmanuel Bourg]

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

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

commit 3540529c1f58589a52016245fb1425ad3fef126a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 7 13:36:53 2016 +0200

    Make the ant dependency really optional (Closes: #830204)
---
 debian/changelog                                |  7 +++++++
 debian/control                                  |  1 +
 debian/maven.rules                              |  1 -
 debian/patches/04-optional-ant-dependency.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7678124..88424dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cglib (3.2.3-3) unstable; urgency=medium
+
+  * Team upload.
+  * Make the ant dependency really optional (Closes: #830204)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 07 Jul 2016 13:17:44 +0200
+
 cglib (3.2.3-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f082420..99285f6 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Homepage: http://cglib.sourceforge.net
 Package: libcglib-java
 Architecture: all
 Depends: ${misc:Depends}, libasm-java (>= 5.0)
+Suggests: ${maven:OptionalDepends}
 Description: Code generation library for Java
  cglib is a powerful, high performance and quality code generation
  library. It is used to extend Java classes and implement interfaces at
diff --git a/debian/maven.rules b/debian/maven.rules
index cb10045..d6696a1 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1 @@
-s/ant/org.apache.ant/ * * s/.*/debian/ * *
 junit junit * s/.*/4.x/ * *
diff --git a/debian/patches/04-optional-ant-dependency.patch b/debian/patches/04-optional-ant-dependency.patch
new file mode 100644
index 0000000..d9577e8
--- /dev/null
+++ b/debian/patches/04-optional-ant-dependency.patch
@@ -0,0 +1,24 @@
+Description: Really make the Ant dependency optional
+Author: Emmanuel Bourg
+Bug: https://github.com/cglib/cglib/pull/87
+Bug-Debian: https://bugs.debian.org/830204
+--- a/cglib/pom.xml
++++ b/cglib/pom.xml
+@@ -64,6 +64,7 @@
+         <dependency>
+             <groupId>org.apache.ant</groupId>
+             <artifactId>ant</artifactId>
++            <optional>true</optional>
+         </dependency>
+ 
+         <dependency>
+--- a/pom.xml
++++ b/pom.xml
+@@ -214,7 +214,6 @@
+                 <groupId>org.apache.ant</groupId>
+                 <artifactId>ant</artifactId>
+                 <version>1.9.6</version>
+-                <optional>true</optional>
+             </dependency>
+ 
+             <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index 596f375..bb29dca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 03-cglib-version.patch
+04-optional-ant-dependency.patch

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