[excalibur-logkit] 21/32: 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 excalibur-logkit.

commit 9d491af771fa96eb3ee7f60b2ff53b73941b8633
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 22 09:01:10 2014 +0000

    Depend on libmail-java instead of libgnumail-java
---
 debian/changelog                          | 1 +
 debian/control                            | 4 ++--
 debian/libexcalibur-logkit-java.classpath | 2 +-
 debian/patches/02_fix_build_xml.patch     | 2 +-
 debian/rules                              | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adb933d..62c2b52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ excalibur-logkit (2.0-11) UNRELEASED; urgency=medium
 
   * debian/control:
     - Updated the dependency on the Servlet API (3.0 -> 3.1)
+    - Depend on libmail-java instead of libgnumail-java
     - Updated standards version to 3.9.6 (no changes)
     - Use canonical URLs for the Vcs-* fields
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index 71b4310..4780176 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 9), cdbs, javahelper, ant
 Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, junit,
- libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java, libservlet3.1-java,
- libgnumail-java-doc, liblog4j1.2-java-doc, libservlet3.1-java-doc, maven-repo-helper
+ libgeronimo-jms-1.1-spec-java, libmail-java, liblog4j1.2-java, libservlet3.1-java,
+ libmail-java-doc, liblog4j1.2-java-doc, libservlet3.1-java-doc, maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/excalibur-logkit/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/excalibur-logkit/
diff --git a/debian/libexcalibur-logkit-java.classpath b/debian/libexcalibur-logkit-java.classpath
index c3ad65c..bdf3c77 100644
--- a/debian/libexcalibur-logkit-java.classpath
+++ b/debian/libexcalibur-logkit-java.classpath
@@ -1 +1 @@
-usr/share/java/excalibur-logkit.jar geronimo-jms-1.1-spec.jar gnumail.jar log4j-1.2.jar
+usr/share/java/excalibur-logkit.jar geronimo-jms-1.1-spec.jar javax.mail.jar log4j-1.2.jar
diff --git a/debian/patches/02_fix_build_xml.patch b/debian/patches/02_fix_build_xml.patch
index 9bd53ee..7313ff2 100644
--- a/debian/patches/02_fix_build_xml.patch
+++ b/debian/patches/02_fix_build_xml.patch
@@ -33,7 +33,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
          </pathelement>
        </classpath>
 +      <link offline="true" packagelistLoc="/usr/share/doc/default-jdk-doc/api/" href="/usr/share/doc/default-jdk-doc/api/" />
-+      <link offline="true" packagelistLoc="/usr/share/doc/libgnumail-java/api/" href="/usr/share/doc/libgnumail-java/api/" />
++      <link offline="true" packagelistLoc="/usr/share/doc/libmail-java/api/" href="/usr/share/doc/libmail-java/api/" />
 +      <link offline="true" packagelistLoc="/usr/share/doc/liblog4j1.2-java/api/" href="/usr/share/doc/liblog4j1.2-java/api/" />
 +      <link offline="true" packagelistLoc="/usr/share/doc/libservlet3.1-java/api/" href="/usr/share/doc/libservlet3.1-java/api/" />
      </javadoc>
diff --git a/debian/rules b/debian/rules
index 89a2123..5888cfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME_DIRS		:= /usr/lib/jvm/default-java
-DEB_JARS		:= ant-junit geronimo-jms-1.1-spec gnumail.jar junit log4j-1.2 servlet-api-3.1
+DEB_JARS		:= ant-junit geronimo-jms-1.1-spec javax.mail junit log4j-1.2 servlet-api-3.1
 DEB_ANT_BUILD_TARGET	:= dist
 DEB_ANT_ARGS		:= -Dnoget=true -Dfinal.name=excalibur-logkit -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dlibdir=/usr/share/java
 

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