[apache-log4j1.2] 22/40: 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 apache-log4j1.2.

commit 88333ee4e86f6c549c08bf1bb58fb5a6a3560f92
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 30 08:42:54 2014 +0000

    Depend on libmail-java instead of libgnumail-java
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 debian/rules     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19dae10..f2e129e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apache-log4j1.2 (1.2.17-5) UNRELEASED; urgency=medium
     + Remove Kumar Appaiah from uploaders
 
   [ Emmanuel Bourg ]
+  * Depend on libmail-java instead of libgnumail-java
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
 
diff --git a/debian/control b/debian/control
index 87fc40b..1eb2a14 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: ant,
                debhelper (>= 9),
                default-jdk,
                default-jdk-doc,
-               libgnumail-java,
+               libmail-java,
                maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/apache-log4j1.2
@@ -23,7 +23,7 @@ Homepage: http://logging.apache.org/log4j/1.2/
 Package: liblog4j1.2-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libgnumail-java, liblog4j1.2-java-doc
+Suggests: libmail-java, liblog4j1.2-java-doc
 Description: Logging library for java
  log4j is a tool to help the programmer output log statements to a variety of
  output targets.
diff --git a/debian/rules b/debian/rules
index c2fa38f..ee29cd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ PACKAGE   := $(DEB_SOURCE_PACKAGE)
 VERSION   := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME  := /usr/share/ant
-DEB_JARS  := gnumail
+DEB_JARS  := javax.mail
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_ARGS := -Dversion=$(VERSION)
 
@@ -22,7 +22,7 @@ common-build-indep::
 	cat debian/log4j.bnd | sed s/VERSION/$(VERSION)/ > debian/.log4j-versioned.bnd
 	java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
 	java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd \
-		-classpath /usr/share/java/gnumail.jar \
+		-classpath /usr/share/java/javax.mail.jar \
 		-output log4j.jar dist/lib/log4j-$(VERSION).jar
 	rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
 	mv log4j.jar dist/lib/log4j-$(VERSION).jar

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