[libshib-common-java] 05/10: Build depend on libmail-java instead of libgnumail-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 libshib-common-java.

commit fd83bb2404620c92006f9183141f1e7200094871
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 17 16:12:04 2014 +0200

    Build depend on libmail-java instead of libgnumail-java
---
 debian/changelog   | 1 +
 debian/control     | 2 +-
 debian/maven.rules | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5801c5e..42ca39a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libshib-common-java (1.4.0-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build depend on libsvnkit-java >= 1.8.6-1~ (Closes: #752964)
+  * Build depend on libmail-java instead of libgnumail-java
   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 17 Oct 2014 15:12:50 +0200
diff --git a/debian/control b/debian/control
index dadbefa..0816fd4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep: ant,
                      libc3p0-java,
                      libcommons-codec-java,
                      libehcache-java,
-                     libgnumail-java,
+                     libmail-java,
                      libhsqldb-java (>= 2.2.8),
                      libjanino-java (>= 2.7.0),
                      libjargs-java (>= 1.0.0-4),
diff --git a/debian/maven.rules b/debian/maven.rules
index 5b6282b..e66790d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,7 +5,7 @@ ant-contrib ant-contrib jar s/1\..*/debian/ * *
 edu.internet2.middleware shibboleth-common jar s/.*/debian/ * *
 edu.vt.middleware vt-ldap jar s/.*/debian/ * *
 s/hsqldb/org.hsqldb/ hsqldb jar s/.*/debian/ * *
-javax.mail s/mail/gnumail jar s/.*/debian/ * *
+s/javax.mail/com.sun.mail/ s/mail/javax.mail/ jar s/.*/debian/ * *
 joda-time joda-time jar s/.*/debian/ * *
 junit junit jar s/3\..*/3.x/ * *
 org.apache.ant s/ant-nodeps/ant/ jar s/1.7.1/debian/ * *

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