[med-svn] r363 - trunk/packages/seaview/trunk/debian/patches
charles-guest at alioth.debian.org
charles-guest at alioth.debian.org
Sat Jul 21 02:39:35 UTC 2007
Author: charles-guest
Date: 2007-07-21 02:39:35 +0000 (Sat, 21 Jul 2007)
New Revision: 363
Added:
trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.patch
trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.patch
trunk/packages/seaview/trunk/debian/patches/30-align.cxx.patch
Removed:
trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.dpatch
trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.dpatch
trunk/packages/seaview/trunk/debian/patches/30-align.cxx.dpatch
Log:
swiching to quilt
Deleted: trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.dpatch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.dpatch 2007-07-21 02:38:40 UTC (rev 362)
+++ trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.dpatch 2007-07-21 02:39:35 UTC (rev 363)
@@ -1,12 +0,0 @@
---- seaview/seaview.help 2006-09-19 23:38:05.000000000 +0900
-+++ seaview/seaview.help.debian 2006-09-25 23:08:53.000000000 +0900
-@@ -15,9 +15,6 @@
-
- Seaview uses the FLTK project (http://www.fltk.org) for its user interface.
-
--Seaview uses the PDFlib Lite library (http://www.pdflib.com) for pdf output
--under the "Open Source Developer Exemption" of the PDFlib Lite License Agreement.
--
- >>>Alignment panel
- Mouse Use:
-
Copied: trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.patch (from rev 362, trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.dpatch)
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.patch (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/20-no-PDF-in-help.patch 2007-07-21 02:39:35 UTC (rev 363)
@@ -0,0 +1,12 @@
+--- seaview/seaview.help 2006-09-19 23:38:05.000000000 +0900
++++ seaview/seaview.help.debian 2006-09-25 23:08:53.000000000 +0900
+@@ -15,9 +15,6 @@
+
+ Seaview uses the FLTK project (http://www.fltk.org) for its user interface.
+
+-Seaview uses the PDFlib Lite library (http://www.pdflib.com) for pdf output
+-under the "Open Source Developer Exemption" of the PDFlib Lite License Agreement.
+-
+ >>>Alignment panel
+ Mouse Use:
+
Deleted: trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.dpatch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.dpatch 2007-07-21 02:38:40 UTC (rev 362)
+++ trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.dpatch 2007-07-21 02:39:35 UTC (rev 363)
@@ -1,11 +0,0 @@
---- seaview/Makefile 2006-09-19 23:38:10.000000000 +0900
-+++ seaview/Makefile.debian 2006-09-25 23:25:20.000000000 +0900
-@@ -8,7 +8,7 @@
- X11 = /usr/X11R6
-
- #comment out and customize next line to set helpfile name at compile-time
--#HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/bge/mgouy/seaview/seaview.help\"
-+HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
-
- CXX = g++
-
Copied: trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.patch (from rev 362, trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.dpatch)
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.patch (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/21-location-of-seaview.help.patch 2007-07-21 02:39:35 UTC (rev 363)
@@ -0,0 +1,11 @@
+--- seaview/Makefile 2006-09-19 23:38:10.000000000 +0900
++++ seaview/Makefile.debian 2006-09-25 23:25:20.000000000 +0900
+@@ -8,7 +8,7 @@
+ X11 = /usr/X11R6
+
+ #comment out and customize next line to set helpfile name at compile-time
+-#HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/bge/mgouy/seaview/seaview.help\"
++HELP_NOT_IN_PATH = -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.help\"
+
+ CXX = g++
+
Deleted: trunk/packages/seaview/trunk/debian/patches/30-align.cxx.dpatch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/30-align.cxx.dpatch 2007-07-21 02:38:40 UTC (rev 362)
+++ trunk/packages/seaview/trunk/debian/patches/30-align.cxx.dpatch 2007-07-21 02:39:35 UTC (rev 363)
@@ -1,47 +0,0 @@
---- seaview/align.cxx 2006-09-25 23:41:13.000000000 +0900
-+++ seaview/align.cxx.debian 2006-09-25 23:42:26.000000000 +0900
-@@ -114,7 +114,8 @@
- static char *prog_path;
- static char algo_name[2][20] = {"clustalw", "muscle"};
-
--/* check for presence of xterm + clustalw/muscle + seaview_align.sh */
-+/* Modified in Debian to take advantage of the /etc/alternatives system */
-+/* check for presence of x-terminal-emulator + clustalw/muscle + seaview_align.sh */
- #ifdef WIN32
- p = (char *)(align_algorithm == CLUSTALW ? "clustalw.exe" : "muscle.exe" );
- status = check_path( p );
-@@ -144,11 +145,12 @@
- #else
- status = check_path((char*)(align_algorithm == CLUSTALW ? "clustalw" : "muscle"));
- if(status == 0) {
-- status = check_path("xterm");
-+ status = check_path("x-terminal-emulator");
- }
-- if(status == 0) {
-+/* if(status == 0) {
- status = check_path("seaview_align.sh");
- }
-+*/
- #endif
- if(status != 0) {
- fl_message("Alignment operation is impossible because\n"
-@@ -157,7 +159,7 @@
- #elif defined(__APPLE__)
- "program clustalw/muscle\n"
- #else
-- "one of the programs xterm, clustalw, muscle, seaview_align.sh\n"
-+ "one of the programs x-terminal-emulator, clustalw, muscle, seaview_align.sh\n"
- #endif
- "is missing");
- ((Fl_Menu_ *)view->menu_edit)->mode(ALIGN_SEQS,
-@@ -249,8 +251,8 @@
- base_fname, base_fname);
- #endif
- #else
--sprintf(commande, "xterm -T \"%s alignment\" -n %s -sb -sl 2000 "
-- "-e seaview_align.sh %s ", algo_name[align_algorithm], algo_name[align_algorithm],
-+sprintf(commande, "x-terminal-emulator -T \"%s alignment\" "
-+ "-e /usr/share/seaview/seaview_align.sh %s ", algo_name[align_algorithm], algo_name[align_algorithm],
- algo_name[align_algorithm]);
- l = strlen(commande);
- switch (align_algorithm) {
Copied: trunk/packages/seaview/trunk/debian/patches/30-align.cxx.patch (from rev 362, trunk/packages/seaview/trunk/debian/patches/30-align.cxx.dpatch)
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/30-align.cxx.patch (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/30-align.cxx.patch 2007-07-21 02:39:35 UTC (rev 363)
@@ -0,0 +1,47 @@
+--- seaview/align.cxx 2006-09-25 23:41:13.000000000 +0900
++++ seaview/align.cxx.debian 2006-09-25 23:42:26.000000000 +0900
+@@ -114,7 +114,8 @@
+ static char *prog_path;
+ static char algo_name[2][20] = {"clustalw", "muscle"};
+
+-/* check for presence of xterm + clustalw/muscle + seaview_align.sh */
++/* Modified in Debian to take advantage of the /etc/alternatives system */
++/* check for presence of x-terminal-emulator + clustalw/muscle + seaview_align.sh */
+ #ifdef WIN32
+ p = (char *)(align_algorithm == CLUSTALW ? "clustalw.exe" : "muscle.exe" );
+ status = check_path( p );
+@@ -144,11 +145,12 @@
+ #else
+ status = check_path((char*)(align_algorithm == CLUSTALW ? "clustalw" : "muscle"));
+ if(status == 0) {
+- status = check_path("xterm");
++ status = check_path("x-terminal-emulator");
+ }
+- if(status == 0) {
++/* if(status == 0) {
+ status = check_path("seaview_align.sh");
+ }
++*/
+ #endif
+ if(status != 0) {
+ fl_message("Alignment operation is impossible because\n"
+@@ -157,7 +159,7 @@
+ #elif defined(__APPLE__)
+ "program clustalw/muscle\n"
+ #else
+- "one of the programs xterm, clustalw, muscle, seaview_align.sh\n"
++ "one of the programs x-terminal-emulator, clustalw, muscle, seaview_align.sh\n"
+ #endif
+ "is missing");
+ ((Fl_Menu_ *)view->menu_edit)->mode(ALIGN_SEQS,
+@@ -249,8 +251,8 @@
+ base_fname, base_fname);
+ #endif
+ #else
+-sprintf(commande, "xterm -T \"%s alignment\" -n %s -sb -sl 2000 "
+- "-e seaview_align.sh %s ", algo_name[align_algorithm], algo_name[align_algorithm],
++sprintf(commande, "x-terminal-emulator -T \"%s alignment\" "
++ "-e /usr/share/seaview/seaview_align.sh %s ", algo_name[align_algorithm], algo_name[align_algorithm],
+ algo_name[align_algorithm]);
+ l = strlen(commande);
+ switch (align_algorithm) {
More information about the debian-med-commit
mailing list