[med-svn] r773 - trunk/packages/seaview/trunk/debian/patches

[charles-guest at alioth.debian.org]

Author: charles-guest
Date: 2007-11-08 15:10:03 +0000 (Thu, 08 Nov 2007)
New Revision: 773

Modified:
   trunk/packages/seaview/trunk/debian/patches/xterm_to_x-terminal-emulator.patch
Log:
Hardcoding the path to seaview_align.sh.


Modified: trunk/packages/seaview/trunk/debian/patches/xterm_to_x-terminal-emulator.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/xterm_to_x-terminal-emulator.patch	2007-11-08 14:48:12 UTC (rev 772)
+++ trunk/packages/seaview/trunk/debian/patches/xterm_to_x-terminal-emulator.patch	2007-11-08 15:10:03 UTC (rev 773)
@@ -1,3 +1,6 @@
+This patch replaces xterm by the default terminal in Debian,
+x-terminal-emulator. It also gives the full path to seaview_align.sh, in
+/usr/share/seaview.
 Index: seaview-2.2/align.cxx
 ===================================================================
 --- seaview-2.2.orig/align.cxx
@@ -2,3 +5,3 @@
 +++ seaview-2.2/align.cxx
-@@ -127,14 +127,14 @@
+@@ -127,15 +127,12 @@
  static char base_fname[100], commande[300];
@@ -8,19 +11,21 @@
  #if ! ( defined(WIN32)  ||  defined(__APPLE__) )
 -/* check for presence of xterm + seaview_align.sh */
 -	status = get_full_path("xterm") == NULL;
-+/* check for presence of x-terminal-emulator + seaview_align.sh */
+-	if(status == 0) {
+-		status = get_full_path("seaview_align.sh") == NULL;
+-		}
++/* check for presence of x-terminal-emulator.
++ * We know that seaview_align.sh is in /usr/lib/seaview */
 +	status = get_full_path("x-terminal-emulator") == NULL;
- 	if(status == 0) {
- 		status = get_full_path("seaview_align.sh") == NULL;
- 		}
  	if(status != 0) {
  		fl_message("Alignment operation is impossible because\n"
 -		  "one of the programs xterm, seaview_align.sh\n"
-+		  "one of the programs x-terminal-emulator, seaview_align.sh\n"
- 		  "is missing");
+-		  "is missing");
++		  "The program x-terminal-emulator is missing");
  		((Fl_Menu_ *)view->menu_edit)->mode(ALIGN_ALL_SEQS, FL_MENU_INACTIVE);
  		((Fl_Menu_ *)view->menu_edit)->mode(ALIGN_SELECTION, FL_MENU_INACTIVE);
-@@ -577,12 +577,12 @@
+ 		return;
+@@ -577,12 +574,12 @@
  #elif defined(WIN32)
  sprintf(command, "cmd.exe /c \"%s\" %s ", w32path, local);
  #else