[med-svn] r838 - in trunk/packages/seaview/trunk/debian: . patches
charles-guest at alioth.debian.org
charles-guest at alioth.debian.org
Sun Nov 18 14:40:58 UTC 2007
Author: charles-guest
Date: 2007-11-18 14:40:57 +0000 (Sun, 18 Nov 2007)
New Revision: 838
Added:
trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch
Removed:
trunk/packages/seaview/trunk/debian/patches/xterm_to_x-terminal-emulator.patch
Modified:
trunk/packages/seaview/trunk/debian/changelog
trunk/packages/seaview/trunk/debian/control
trunk/packages/seaview/trunk/debian/patches/40-seaview_align.sh-newline.patch
trunk/packages/seaview/trunk/debian/patches/series
Log:
Using xterm by default instead of x-terminal-emulator
Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog 2007-11-18 11:48:49 UTC (rev 837)
+++ trunk/packages/seaview/trunk/debian/changelog 2007-11-18 14:40:57 UTC (rev 838)
@@ -12,9 +12,14 @@
* Removed the XS- prefix of the Vcs fields in debian/control
* Building the manpage offline: added seaview.1 to the package, and
removed xsltproc, docbook-xml and docbook-xsl from the build-dependencies.
- * Refreshed patches.
+ * Patches to Seaview:
+ - Refreshed.
+ - Suppressed xterm_to_x-terminal-emulator.patch : strange communication
+ problems happen between seaview and some terminal emulators, such as
+ gnome-terminal or konsole.
+ - Hardcoded the path to seaview_align.sh.
- -- Charles Plessy <charles-debian-nospam at plessy.org> Fri, 09 Nov 2007 00:16:41 +0900
+ -- Charles Plessy <charles-debian-nospam at plessy.org> Sun, 18 Nov 2007 23:35:29 +0900
seaview (1:2.0-1) unstable; urgency=low
Modified: trunk/packages/seaview/trunk/debian/control
===================================================================
--- trunk/packages/seaview/trunk/debian/control 2007-11-18 11:48:49 UTC (rev 837)
+++ trunk/packages/seaview/trunk/debian/control 2007-11-18 14:40:57 UTC (rev 838)
@@ -12,7 +12,7 @@
Package: seaview
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: muscle, xterm | x-terminal-emulator
+Recommends: muscle, xterm
Description: Multiple sequence alignment editor
SeaView is a graphical multiple sequence alignment editor developed by Manolo
Gouy. SeaView is able to read and write various alignment formats (NEXUS, MSF,
Modified: trunk/packages/seaview/trunk/debian/patches/40-seaview_align.sh-newline.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/40-seaview_align.sh-newline.patch 2007-11-18 11:48:49 UTC (rev 837)
+++ trunk/packages/seaview/trunk/debian/patches/40-seaview_align.sh-newline.patch 2007-11-18 14:40:57 UTC (rev 838)
@@ -1,7 +1,7 @@
-Index: seaview-2.2/seaview_align.sh
+Index: seaview_2.2/seaview_align.sh
===================================================================
---- seaview-2.2.orig/seaview_align.sh
-+++ seaview-2.2/seaview_align.sh
+--- seaview_2.2.orig/seaview_align.sh
++++ seaview_2.2/seaview_align.sh
@@ -14,7 +14,7 @@
echo ' '
echo ' '
Added: trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch 2007-11-18 14:40:57 UTC (rev 838)
@@ -0,0 +1,28 @@
+Index: seaview_2.2/align.cxx
+===================================================================
+--- seaview_2.2.orig/align.cxx
++++ seaview_2.2/align.cxx
+@@ -129,13 +129,9 @@
+ #if ! ( defined(WIN32) || defined(__APPLE__) )
+ /* check for presence of xterm + seaview_align.sh */
+ status = get_full_path("xterm") == 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"
+- "is missing");
++ "The programs xterm 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);
+ return;
+@@ -582,7 +578,7 @@
+ memmove(p+3, p+1, strlen(p+1) + 1);
+ memcpy(p, "'>'", 3);
+ }
+-sprintf(command, "xterm -T \"%s alignment\" -n %s -sb -sl 2000 -e seaview_align.sh %s %s %s ",
++sprintf(command, "xterm -T \"%s alignment\" -n %s -sb -sl 2000 -e /usr/share/seaview/seaview_align.sh %s %s %s ",
+ algo_name, algo_name, algo_name, base_fname, local);
+ #endif
+ return 0;
Modified: trunk/packages/seaview/trunk/debian/patches/series
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/series 2007-11-18 11:48:49 UTC (rev 837)
+++ trunk/packages/seaview/trunk/debian/patches/series 2007-11-18 14:40:57 UTC (rev 838)
@@ -1,4 +1,4 @@
20-no-PDF-in-help.patch
21-location-of-seaview.help.patch
-xterm_to_x-terminal-emulator.patch
40-seaview_align.sh-newline.patch
+seaview_align-full_path.patch
Deleted: 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-18 11:48:49 UTC (rev 837)
+++ trunk/packages/seaview/trunk/debian/patches/xterm_to_x-terminal-emulator.patch 2007-11-18 14:40:57 UTC (rev 838)
@@ -1,42 +0,0 @@
-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
-+++ seaview-2.2/align.cxx
-@@ -127,15 +127,12 @@
- static char base_fname[100], commande[300];
-
- #if ! ( defined(WIN32) || defined(__APPLE__) )
--/* check for presence of xterm + seaview_align.sh */
-- status = get_full_path("xterm") == NULL;
-- 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) {
- fl_message("Alignment operation is impossible because\n"
-- "one of the programs xterm, seaview_align.sh\n"
-- "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);
- return;
-@@ -577,12 +574,12 @@
- #elif defined(WIN32)
- sprintf(command, "cmd.exe /c \"%s\" %s ", w32path, local);
- #else
--/* if present, > must be protected by '' before sending to xterm */
-+/* if present, > must be protected by '' before sending to x-terminal-emulator */
- if((p=strchr(local, '>')) != NULL) {
- memmove(p+3, p+1, strlen(p+1) + 1);
- memcpy(p, "'>'", 3);
- }
--sprintf(command, "xterm -T \"%s alignment\" -n %s -sb -sl 2000 -e seaview_align.sh %s %s %s ",
-+sprintf(command, "x-terminal-emulator -T \"%s alignment\" -n %s -sb -sl 2000 -e /usr/share/seaview/seaview_align.sh %s %s %s ",
- algo_name, algo_name, algo_name, base_fname, local);
- #endif
- return 0;
More information about the debian-med-commit
mailing list