[jetty9] 01/01: Depend on libgnumail-java instead of libmail-java

[Jakub Adam]

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

xhaakon-guest pushed a commit to annotated tag debian/8.1.16-4_bpo70+1
in repository jetty9.

commit 8f7db0155b6e26c3915b10b67643e8574343deaf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 15 15:10:36 2014 +0100

    Depend on libgnumail-java instead of libmail-java
---
 debian/changelog                  | 7 +++++++
 debian/control                    | 6 +++---
 debian/libjetty8-extra-java.links | 2 +-
 debian/maven.rules                | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8184349..0338191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jetty8 (8.1.16-4~bpo70+1) wheezy-backports; urgency=low
+
+  * Rebuild for wheezy-backports.
+    - Depend on libgnumail-java instead of libmail-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 15 Dec 2014 14:25:07 +0100
+
 jetty8 (8.1.16-4) unstable; urgency=medium
 
   * Fixed an error on purging jetty8 when authbind is not installed
diff --git a/debian/control b/debian/control
index 947a193..c8f0a43 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: ant-optional,
                junit,
                libbuild-helper-maven-plugin-java,
                libgeronimo-jta-1.1-spec-java,
-               libmail-java,
+               libgnumail-java,
                libjstl1.1-java,
                libmaven-bundle-plugin-java,
                libmaven-javadoc-plugin-java,
@@ -43,7 +43,7 @@ Package: libjetty8-java-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: default-jdk-doc, libmail-java-doc, libservlet3.0-java-doc
+Recommends: default-jdk-doc, libgnumail-java-doc, libservlet3.0-java-doc
 Suggests: libjetty8-java
 Description: Javadoc for the Jetty API
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
@@ -56,7 +56,7 @@ Description: Javadoc for the Jetty API
 Package: libjetty8-extra-java
 Architecture: all
 Depends: libasm3-java,
-         libmail-java,
+         libgnumail-java,
          libjakarta-taglibs-standard-java,
          libjetty8-java (>= ${source:Version}),
          libjstl1.1-java,
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
index 52a6f60..b98ccdf 100644
--- a/debian/libjetty8-extra-java.links
+++ b/debian/libjetty8-extra-java.links
@@ -1,7 +1,7 @@
 usr/share/tomcat7/lib/annotations-api.jar    usr/share/jetty8/lib/annotations/javax.annotation.jar
 usr/share/java/asm3.jar                      usr/share/jetty8/lib/annotations/org.objectweb.asm.jar
 usr/share/java/asm3-commons.jar              usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar
-usr/share/java/javax.mail.jar                usr/share/jetty8/lib/jndi/javax.mail.jar
+usr/share/java/gnumail.jar                   usr/share/jetty8/lib/jndi/javax.mail.jar
 usr/share/java/jsp-api-2.2.jar               usr/share/jetty8/lib/jsp/javax.servlet.jsp.jar
 usr/share/tomcat7/lib/jasper.jar             usr/share/jetty8/lib/jsp/jasper.jar
 usr/share/tomcat7/lib/jasper-el.jar          usr/share/jetty8/lib/jsp/jasper-el.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index c1d1686..45ac601 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,7 +8,7 @@ javax.el el-api jar s/.*/2.2/ * *
 junit junit * s/4\..*/4.x/ * *
 org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * *
 s/org.eclipse.jetty.orbit/asm/ s/org.objectweb.asm/asm/ jar s/.*/3.x/ * *
-s/org.eclipse.jetty.orbit/com.sun.mail/ s/javax.mail.glassfish/javax.mail/ jar s/.*/debian/ * *
+s/org.eclipse.jetty.orbit/javax.mail/ s/javax.mail.glassfish/gnumail/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/javax.security.auth.message/ s/javax.security.auth.message/jmac-api/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/org.apache.geronimo.specs/ s/javax.transaction/geronimo-jta_1.1_spec/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.annotation/tomcat-annotations-api/ jar s/.*/debian/ * *

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