[pkg-java] r18505 - trunk/apache-log4j1.2/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-30 08:42:54 +0000 (Tue, 30 Sep 2014)
New Revision: 18505

Modified:
   trunk/apache-log4j1.2/debian/changelog
   trunk/apache-log4j1.2/debian/control
   trunk/apache-log4j1.2/debian/rules
Log:
Depend on libmail-java instead of libgnumail-java



Modified: trunk/apache-log4j1.2/debian/changelog
===================================================================
--- trunk/apache-log4j1.2/debian/changelog	2014-09-30 08:02:59 UTC (rev 18504)
+++ trunk/apache-log4j1.2/debian/changelog	2014-09-30 08:42:54 UTC (rev 18505)
@@ -5,6 +5,7 @@
     + 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
 

Modified: trunk/apache-log4j1.2/debian/control
===================================================================
--- trunk/apache-log4j1.2/debian/control	2014-09-30 08:02:59 UTC (rev 18504)
+++ trunk/apache-log4j1.2/debian/control	2014-09-30 08:42:54 UTC (rev 18505)
@@ -13,7 +13,7 @@
                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 @@
 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.

Modified: trunk/apache-log4j1.2/debian/rules
===================================================================
--- trunk/apache-log4j1.2/debian/rules	2014-09-30 08:02:59 UTC (rev 18504)
+++ trunk/apache-log4j1.2/debian/rules	2014-09-30 08:42:54 UTC (rev 18505)
@@ -7,7 +7,7 @@
 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 @@
 	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