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

[Olivier Sallou]

Author: osallou
Date: 2012-10-08 09:32:02 +0000 (Mon, 08 Oct 2012)
New Revision: 12327

Added:
   trunk/packages/biomaj-watcher/trunk/debian/patches/prevent_jobs_file_move
Modified:
   trunk/packages/biomaj-watcher/trunk/debian/changelog
   trunk/packages/biomaj-watcher/trunk/debian/patches/series
   trunk/packages/biomaj-watcher/trunk/debian/postinst
Log:
Add patch to prevent package file deletion by upstream code

Modified: trunk/packages/biomaj-watcher/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/changelog	2012-10-08 07:03:43 UTC (rev 12326)
+++ trunk/packages/biomaj-watcher/trunk/debian/changelog	2012-10-08 09:32:02 UTC (rev 12327)
@@ -1,3 +1,10 @@
+biomaj-watcher (1.2.0-10) UNRELEASED; urgency=low
+
+  * debian/postinst, debian/patches/prevent_jobs_file_move:
+      Prevent file deletion (Closes: #689812).
+
+ -- Olivier Sallou <osallou at debian.org>  Wed, 15 Aug 2012 11:10:47 +0200
+
 biomaj-watcher (1.2.0-9) unstable; urgency=low
 
   [ Olivier Sallou ]

Added: trunk/packages/biomaj-watcher/trunk/debian/patches/prevent_jobs_file_move
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/patches/prevent_jobs_file_move	                        (rev 0)
+++ trunk/packages/biomaj-watcher/trunk/debian/patches/prevent_jobs_file_move	2012-10-08 09:32:02 UTC (rev 12327)
@@ -0,0 +1,31 @@
+Subject: Upstream code remove files from package
+Description: At package install, the upstream code moves some
+ files to config directory instead of copying them. This result
+ in package file deletion.
+ Patch removes the file deletion
+Last-Updated: 2012-10-08
+Author: Olivier Sallou <osallou at debian.org>
+Forwarded: not-needed
+Bug: 689812
+--- a/usr/share/biomaj-watcher/bin/UpdateToBiomaj1_2.java
++++ b/usr/share/biomaj-watcher/bin/UpdateToBiomaj1_2.java
+@@ -65,15 +65,19 @@
+ 				pw.close();
+ 				
+ 				// Delete old jobs.xml
++				/*
+ 				if (!new File(root + "/jobs.xml").delete()) {
+ 					System.err.println("Could not delete " + root + "/jobs.xml");
+ 				}
++				*/	
+ 				
+ 				// Move jobs.xsd
++				/*
+ 				if (!new File(root + "/jobs.xsd").renameTo(new File("/etc/biomaj-watcher/jobs.xsd"))) {
+ 					System.err.println("Could not move " + root + "/jobs.xsd to /etc/biomaj-watcher/jobs.xsd");
+ 					System.exit(3);
+ 				}
++				*/
+ 				
+ 			} catch (FileNotFoundException e) {
+ 				e.printStackTrace();

Modified: trunk/packages/biomaj-watcher/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/patches/series	2012-10-08 07:03:43 UTC (rev 12326)
+++ trunk/packages/biomaj-watcher/trunk/debian/patches/series	2012-10-08 09:32:02 UTC (rev 12327)
@@ -1,2 +1,3 @@
 fix_config_load
 add_missing_lib
+prevent_jobs_file_move

Modified: trunk/packages/biomaj-watcher/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postinst	2012-10-08 07:03:43 UTC (rev 12326)
+++ trunk/packages/biomaj-watcher/trunk/debian/postinst	2012-10-08 09:32:02 UTC (rev 12327)
@@ -51,6 +51,8 @@
       #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
+      # Install latest definition
+      cp /usr/share/java/webapps/biomaj-watcher/jobs.xsd /etc/biomaj-watcher/jobs.xsd
 
 
       # Update configuration files