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

[Olivier Sallou]

Author: osallou
Date: 2012-10-04 16:25:46 +0000 (Thu, 04 Oct 2012)
New Revision: 12310

Added:
   trunk/packages/biomaj/trunk/debian/patches/set_env_file_for_debian
Modified:
   trunk/packages/biomaj/trunk/debian/changelog
   trunk/packages/biomaj/trunk/debian/patches/series
Log:
Add patch to prevent shipped file update by program

Modified: trunk/packages/biomaj/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj/trunk/debian/changelog	2012-10-03 11:54:42 UTC (rev 12309)
+++ trunk/packages/biomaj/trunk/debian/changelog	2012-10-04 16:25:46 UTC (rev 12310)
@@ -1,3 +1,11 @@
+biomaj (1.2.0-9) UNRELEASED; urgency=low
+
+  * debian/patches/set_env_file_for_debian:
+    Prevent env.sh file update by program at install
+    (Closes: #688433)
+
+ -- Olivier Sallou <osallou at debian.org>  Wed, 03 Oct 2012 13:54:44 +0200
+
 biomaj (1.2.0-8) unstable; urgency=low
 
   [ Olivier Sallou ]
@@ -2,3 +10,3 @@
   * debian/copyright: Fix copyright URL
-  * dbeian/control: Switch to Standards 3.9.4
+  * debian/control: Switch to Standards 3.9.4
   * debian/rules, debian/postinst, debian/postrm: fix conffile update

Modified: trunk/packages/biomaj/trunk/debian/patches/series
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/series	2012-10-03 11:54:42 UTC (rev 12309)
+++ trunk/packages/biomaj/trunk/debian/patches/series	2012-10-04 16:25:46 UTC (rev 12310)
@@ -1 +1,2 @@
 removeSqlToolDependency
+set_env_file_for_debian

Added: trunk/packages/biomaj/trunk/debian/patches/set_env_file_for_debian
===================================================================
--- trunk/packages/biomaj/trunk/debian/patches/set_env_file_for_debian	                        (rev 0)
+++ trunk/packages/biomaj/trunk/debian/patches/set_env_file_for_debian	2012-10-04 16:25:46 UTC (rev 12310)
@@ -0,0 +1,28 @@
+Subject: Prevent shipped file modification
+Description: Program updates a shipped file at install
+ and upgrades. Patch sets the file once and prevent 
+ program update.
+Forwarded: not-needed
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2012-10-04
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688433
+--- a/usr/share/biomaj/bin/Configurator.java
++++ b/usr/share/biomaj/bin/Configurator.java
+@@ -117,7 +117,7 @@
+ 		/*
+ 		 * Creer env.sh
+ 		 */
+-		createEnv(params.get("ant_home"), params.get("java_home"));
++		//createEnv(params.get("ant_home"), params.get("java_home"));
+ 		
+ 				
+ 		log("Configuration complete");
+--- a/usr/share/biomaj/bin/env.sh
++++ b/usr/share/biomaj/bin/env.sh
+@@ -1 +1,4 @@
+-#!/bin/sh
+\ No newline at end of file
++#!/bin/sh
++export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
++export ANT_HOME=/usr/share/ant
++export BIOMAJ_ROOT=/usr/share/biomaj