[pkg-java] r18560 - in trunk/excalibur-logkit/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-10-22 09:01:10 +0000 (Wed, 22 Oct 2014)
New Revision: 18560

Modified:
   trunk/excalibur-logkit/debian/changelog
   trunk/excalibur-logkit/debian/control
   trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath
   trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch
   trunk/excalibur-logkit/debian/rules
Log:
Depend on libmail-java instead of libgnumail-java



Modified: trunk/excalibur-logkit/debian/changelog
===================================================================
--- trunk/excalibur-logkit/debian/changelog	2014-10-22 08:27:18 UTC (rev 18559)
+++ trunk/excalibur-logkit/debian/changelog	2014-10-22 09:01:10 UTC (rev 18560)
@@ -2,6 +2,7 @@
 
   * 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

Modified: trunk/excalibur-logkit/debian/control
===================================================================
--- trunk/excalibur-logkit/debian/control	2014-10-22 08:27:18 UTC (rev 18559)
+++ trunk/excalibur-logkit/debian/control	2014-10-22 09:01:10 UTC (rev 18560)
@@ -5,8 +5,8 @@
 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/

Modified: trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath
===================================================================
--- trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath	2014-10-22 08:27:18 UTC (rev 18559)
+++ trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath	2014-10-22 09:01:10 UTC (rev 18560)
@@ -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

Modified: trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch
===================================================================
--- trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch	2014-10-22 08:27:18 UTC (rev 18559)
+++ trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch	2014-10-22 09:01:10 UTC (rev 18560)
@@ -33,7 +33,7 @@
          </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>

Modified: trunk/excalibur-logkit/debian/rules
===================================================================
--- trunk/excalibur-logkit/debian/rules	2014-10-22 08:27:18 UTC (rev 18559)
+++ trunk/excalibur-logkit/debian/rules	2014-10-22 09:01:10 UTC (rev 18560)
@@ -4,7 +4,7 @@
 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