Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-CC: debian-...@lists.debian.org
Please unblock package biomaj-watcher
biomaj-watcher depended on tomcat6. Jessie uses Tomcat8 a,d biomaj-watcher
does not work anymore. This fix release changes the package to use tomcat8
and fixes bug 769348
Here is debdiff:
diff -Nru biomaj-watcher-1.2.2/debian/changelog
biomaj-watcher-1.2.2/debian/changelog
--- biomaj-watcher-1.2.2/debian/changelog 2014-06-23 09:13:13.0
+0200
+++ biomaj-watcher-1.2.2/debian/changelog 2014-12-15 11:26:27.0
+0100
@@ -1,3 +1,9 @@
+biomaj-watcher (1.2.2-2) unstable; urgency=medium
+
+ * Switch to Tomcat 8 (Closes: #769348).
+
+ -- Olivier Sallou Mon, 15 Dec 2014 08:03:09 +0100
+
biomaj-watcher (1.2.2-1) unstable; urgency=medium
* New usptream release:
diff -Nru biomaj-watcher-1.2.2/debian/control
biomaj-watcher-1.2.2/debian/control
--- biomaj-watcher-1.2.2/debian/control 2014-06-23 09:13:56.0 +0200
+++ biomaj-watcher-1.2.2/debian/control 2014-12-15 08:04:53.0 +0100
@@ -21,7 +21,7 @@
Package: biomaj-watcher
Architecture: all
-Depends: ${misc:Depends}, default-jdk, tomcat6 (>=6.0.32-3), biomaj (>=
1.2.1), debconf,
+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
Description: biological data-bank updater - web interface
diff -Nru biomaj-watcher-1.2.2/debian/patches/series
biomaj-watcher-1.2.2/debian/patches/series
--- biomaj-watcher-1.2.2/debian/patches/series 2014-01-09
16:25:31.0 +0100
+++ biomaj-watcher-1.2.2/debian/patches/series 2014-12-15
10:37:02.0 +0100
@@ -1 +1,2 @@
prevent_jobs_file_move
+use_tomcat8
diff -Nru biomaj-watcher-1.2.2/debian/patches/use_tomcat8
biomaj-watcher-1.2.2/debian/patches/use_tomcat8
--- biomaj-watcher-1.2.2/debian/patches/use_tomcat8 1970-01-01
01:00:00.0 +0100
+++ biomaj-watcher-1.2.2/debian/patches/use_tomcat8 2014-12-15
10:40:03.0 +0100
@@ -0,0 +1,17 @@
+Subject: adapt xml for Tomcat8
+Description: use tomcat8, this impact the context descriptor
+Author: Olivier Sallou
+Last-Updated: 2014-12-15
+Forwarded: No
+--- a/usr/share/biomaj-watcher/bin/WatcherConfigurator.java
b/usr/share/biomaj-watcher/bin/WatcherConfigurator.java
+@@ -45,7 +45,8 @@
+ PrintWriter pw = new PrintWriter(biomajConf + "/BmajWatcher.xml");
+
+ pw.println("");
+- pw.println("");
++ pw.println("");
++ pw.println("");
+
+ pw.println("");
+
diff -Nru biomaj-watcher-1.2.2/debian/postinst
biomaj-watcher-1.2.2/debian/postinst
--- biomaj-watcher-1.2.2/debian/postinst 2014-01-09 16:25:31.0 +0100
+++ biomaj-watcher-1.2.2/debian/postinst 2014-12-15 11:05:48.0 +0100
@@ -49,8 +49,8 @@
ln -s /usr/share/java/gnumail.jar
/usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/gnumail.jar
#cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
- rm -f /var/lib/tomcat6/shared/biomaj.jar
- cp /usr/share/biomaj/lib/biomaj.jar
/var/lib/tomcat6/shared/biomaj.jar
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar
+ cp /usr/share/biomaj/lib/biomaj.jar
/usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar
# Install latest definition
cp /usr/share/java/webapps/biomaj-watcher/jobs.xsd
/etc/biomaj-watcher/jobs.xsd
@@ -62,24 +62,17 @@
# Update logs
set_perms /var/log/biomaj
- #chown -R tomcat6 /etc/biomaj/db_properties
- chown -R tomcat6 /usr/share/java/webapps/biomaj-watcher
- #chmod -R 775 /etc/biomaj/db_properties
- #chown -R tomcat6 /var/log/biomaj
- #chmod -R 775 /var/log/biomaj
- #chown -R tomcat6 /var/lib/biomaj
- #chmod -R 775 /var/lib/biomaj
- chown -R tomcat6 /etc/biomaj-watcher
+ chown -R tomcat8 /usr/share/java/webapps/biomaj-watcher
+ chown -R tomcat8 /etc/biomaj-watcher
# Update context
java -cp $biomajwatcher_root/bin UpdateToBiomaj1_2
/usr/share/java/webapps/biomaj-watcher admin
- chown -R tomcat6 /etc/biomaj-watcher
- #cp /etc/biomaj-watcher/BmajWatcher*.xml
/var/lib/tomcat6/conf/Catalina/localhost/
- rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher.xml
- rm -f /etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml
- ln -s /etc/biomaj-watcher/BmajWatcher.xml
/etc/tomcat6/Catalina/localhost/BmajWatcher.xml
- ln -s /etc/biomaj-watcher/BmajWatcher#logs.xml
/etc/tomcat6/Catalina/localhost/BmajWatcher#logs.xml
+ chown -R tomcat8 /etc/biomaj-watcher
+ rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher.xml
+ rm -f /etc/tomcat8/Catalina/localhost/BmajWatcher#logs.xml
+ ln -s /etc/biomaj-watcher/BmajWatcher.xml
/etc/tomcat8/Catalina/localhost/BmajWatcher.xml
+ ln -s /etc/biomaj-watcher/BmajWatcher#logs.xml
/etc/tomcat8/C
