[med-svn] r18326 - in trunk/packages/biomaj/trunk/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-10-17 10:17:58 +0000 (Fri, 17 Oct 2014)
New Revision: 18326

Added:
   trunk/packages/biomaj/trunk/debian/patches/javamail.patch
Modified:
   trunk/packages/biomaj/trunk/debian/changelog
   trunk/packages/biomaj/trunk/debian/control
   trunk/packages/biomaj/trunk/debian/patches/series
Log:
Replaced the dependency on libgnumail-java with libmail-java



Modified: trunk/packages/biomaj/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj/trunk/debian/changelog	2014-10-17 10:12:06 UTC (rev 18325)
+++ trunk/packages/biomaj/trunk/debian/changelog	2014-10-17 10:17:58 UTC (rev 18326)
@@ -1,6 +1,7 @@
 biomaj (1.2.3-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Replaced the dependency on libgnumail-java with libmail-java
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
   * debian/copyright:

Modified: trunk/packages/biomaj/trunk/debian/control
===================================================================
--- trunk/packages/biomaj/trunk/debian/control	2014-10-17 10:12:06 UTC (rev 18325)
+++ trunk/packages/biomaj/trunk/debian/control	2014-10-17 10:17:58 UTC (rev 18326)
@@ -17,8 +17,7 @@
                      libcommons-logging-java,
                      libcommons-net2-java,
                      libcommons-pool-java,
-                     libgnujaf-java,
-                     libgnumail-java,
+                     libmail-java,
                      libhsqldb-java,
                      libjcommon-java,
                      libjdepend-java,
@@ -50,8 +49,7 @@
          libcommons-logging-java,
          libcommons-net2-java (>= 2.2),
          libcommons-pool-java (>= 1.5),
-         libgnujaf-java,
-         libgnumail-java,
+         libmail-java,
          libhsqldb-java,
          libjcommon-java (>= 1.0),
          libjdom1-java (>= 1.1),

Added: trunk/packages/biomaj/trunk/debian/patches/javamail.patch
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/javamail.patch	                        (rev 0)
+++ trunk/packages/biomaj/trunk/debian/patches/javamail.patch	2014-10-17 10:17:58 UTC (rev 18326)
@@ -0,0 +1,14 @@
+Description: Replaced the dependency on gnumail with the reference implementation
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/usr/share/biomaj/build.xml
++++ b/usr/share/biomaj/build.xml
+@@ -55,7 +55,7 @@
+ 	<property name="class1.path" value="${env.ANT_HOME}/lib/ant.jar ${env.ANT_HOME}/lib/ant-nodeps.jar ${env.ANT_HOME}/lib/ant-launcher.jar ${env.ANT_HOME}/lib/ant-apache-oro.jar"/>
+ 	<property name="class2.path" value="${lib.dir}/oro.jar ${lib.dir}/commons-net2.jar ${lib.dir}/ant-contrib.jar ${lib.dir}/junit4.jar"/>
+ 	<property name="class3.path" value="${lib.dir}/forms.jar ${lib.dir}/jakarta-regexp.jar ${lib.dir}/jdom.jar ${lib.dir}/log4j-1.2.jar ${lib.dir}/mysql-connector-java.jar"/>
+-	<property name="class4.path" value="${lib.dir}/jcommon.jar ${lib.dir}/gnumail.jar ${lib.dir}/activation.jar ${lib.dir}/commons-cli.jar ${lib.dir}/jets3t.jar ${lib.dir}/sqltool.jar ${lib.dir}/commons-logging.jar ${lib.dir}/commons-codec.jar ${lib.dir}/commons-httpclient.jar"/>
++	<property name="class4.path" value="${lib.dir}/jcommon.jar ${lib.dir}/javax.mail.jar ${lib.dir}/commons-cli.jar ${lib.dir}/jets3t.jar ${lib.dir}/sqltool.jar ${lib.dir}/commons-logging.jar ${lib.dir}/commons-codec.jar ${lib.dir}/commons-httpclient.jar"/>
+ 	<property name="class5.path" value="${lib.dir}/hsqldb.jar ${lib.dir}/hsqldbutil.jar ${lib.dir}/commons-pool.jar ${lib.dir}/commons-dbcp.jar ${lib.dir}/jsch.jar" />
+ 								
+ 	<path id="compile.classpath">

Modified: trunk/packages/biomaj/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/series	2014-10-17 10:12:06 UTC (rev 18325)
+++ trunk/packages/biomaj/trunk/debian/patches/series	2014-10-17 10:17:58 UTC (rev 18326)
@@ -1,3 +1,4 @@
 removeSqlToolDependency
 set_env_file_for_debian
 useFormSpecs_from_jgoodies
+javamail.patch