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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-11-08 13:17:30 +0000 (Tue, 08 Nov 2016)
New Revision: 23018

Added:
   trunk/packages/biomaj-watcher/trunk/debian/patches/use_javamail
Modified:
   trunk/packages/biomaj-watcher/trunk/debian/changelog
   trunk/packages/biomaj-watcher/trunk/debian/control
   trunk/packages/biomaj-watcher/trunk/debian/patches/series
   trunk/packages/biomaj-watcher/trunk/debian/postinst
Log:
Depend on libmail-java instead of libgnumail-java



Modified: trunk/packages/biomaj-watcher/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/changelog	2016-11-08 11:33:26 UTC (rev 23017)
+++ trunk/packages/biomaj-watcher/trunk/debian/changelog	2016-11-08 13:17:30 UTC (rev 23018)
@@ -1,3 +1,10 @@
+biomaj-watcher (1.2.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libmail-java instead of libgnumail-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 08 Nov 2016 14:17:13 +0100
+
 biomaj-watcher (1.2.2-3) unstable; urgency=medium
 
   * Add Turkish translation (Thanks to Mert Dirik <mertdirik at gmail.com)

Modified: trunk/packages/biomaj-watcher/trunk/debian/control
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/control	2016-11-08 11:33:26 UTC (rev 23017)
+++ trunk/packages/biomaj-watcher/trunk/debian/control	2016-11-08 13:17:30 UTC (rev 23018)
@@ -13,7 +13,7 @@
  libjsch-java,
  libjdom1-java,
  libquartz-java(>=1.6),
- libgnumail-java,
+ libmail-java,
  libxerces2-java,
  javahelper (>=0.25),
  biomaj (>= 1.2.1)
@@ -23,7 +23,7 @@
 Architecture: all
 Depends: ${misc:Depends}, default-jdk, tomcat8 , biomaj (>= 1.2.1), debconf,
  liblog4j1.2-java, libjsch-java (>= 0.1.42),libjdom1-java (>= 1.1), libcommons-lang-java (>=2.4),
- libcommons-logging-java (>=1.1),libquartz-java(>=1.6),libxerces2-java, unzip, zip, libgnumail-java
+ libcommons-logging-java (>=1.1),libquartz-java(>=1.6),libxerces2-java, unzip, zip, libmail-java
 Description: biological data-bank updater - web interface
  BioMAJ downloads remote data banks, checks their status and applies
  transformation workflows, with consistent state, to provide ready-to-use

Modified: trunk/packages/biomaj-watcher/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/patches/series	2016-11-08 11:33:26 UTC (rev 23017)
+++ trunk/packages/biomaj-watcher/trunk/debian/patches/series	2016-11-08 13:17:30 UTC (rev 23018)
@@ -1,2 +1,3 @@
 prevent_jobs_file_move
 use_tomcat8
+use_javamail

Added: trunk/packages/biomaj-watcher/trunk/debian/patches/use_javamail
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/patches/use_javamail	                        (rev 0)
+++ trunk/packages/biomaj-watcher/trunk/debian/patches/use_javamail	2016-11-08 13:17:30 UTC (rev 23018)
@@ -0,0 +1,14 @@
+Description: Replaces gnumail with javamail
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/usr/share/biomaj-watcher/src/build.xml
++++ b/usr/share/biomaj-watcher/src/build.xml
+@@ -18,7 +18,7 @@
+     <include name="jdom1.jar" />
+     <include name="log4j-1.2.jar" />
+     <include name="jsch.jar" />
+-    <include name="gnumail.jar" />
++    <include name="javax.mail.jar" />
+     </fileset>
+   </path>
+ 

Modified: trunk/packages/biomaj-watcher/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postinst	2016-11-08 11:33:26 UTC (rev 23017)
+++ trunk/packages/biomaj-watcher/trunk/debian/postinst	2016-11-08 13:17:30 UTC (rev 23018)
@@ -45,8 +45,8 @@
       ln -s /usr/share/java/log4j-1.2.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/log4j-1.2.jar
       rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/quartz.jar
       ln -s /usr/share/java/quartz.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/quartz.jar
-      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/gnumail.jar
-      ln -s /usr/share/java/gnumail.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/gnumail.jar
+      rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/*mail.jar
+      ln -s /usr/share/java/javax.mail.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/javax.mail.jar
 
       #cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
       rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar