[med-svn] r119 - in trunk/packages/seaview/trunk/debian: . patches

[Charles Plessy]

Author: charles-guest
Date: 2006-09-22 05:04:38 +0000 (Fri, 22 Sep 2006)
New Revision: 119

Added:
   trunk/packages/seaview/trunk/debian/patches/
   trunk/packages/seaview/trunk/debian/patches/00list
   trunk/packages/seaview/trunk/debian/patches/10-alternatives.dpatch
Modified:
   trunk/packages/seaview/trunk/debian/changelog
   trunk/packages/seaview/trunk/debian/control
   trunk/packages/seaview/trunk/debian/rules
Log:
using x-termnial-emulator instead of xterm

Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog	2006-09-21 01:41:46 UTC (rev 118)
+++ trunk/packages/seaview/trunk/debian/changelog	2006-09-22 05:04:38 UTC (rev 119)
@@ -3,11 +3,12 @@
   * New upstream release (Closes: #357585)
   * Uses muscle instead of clustalw, therefore moving to main (Closes: #357587)
   * Update debian/copyright: the current licence of seaview is GPL (Closes: #357581)
-  * Conforms to Standards version 3.7.2.
-  * Collective maintainance: Debian-Med Packaging Team is the new
-    Maintainer, Brian R Furry and Charles Plessy are uploaders.
+  * Conforms to Standards version 3.7.2 and debhelper compatibility level 5.
+  * Collective maintainance: Debian-Med Packaging Team is the new Maintainer.
+  * Uses x-terminal-emulator instead of xterm.
+  * Support for freedesktop menus, and nice new icon.
 
- -- Charles Plessy <charles-debian-nospam at plessy.org>  Tue, 19 Sep 2006 23:41:57 +0900
+ -- Charles Plessy <charles-debian-nospam at plessy.org>  Fri, 22 Sep 2006 13:52:03 +0900
 
 seaview (20021127-4.1) unstable; urgency=medium
 

Modified: trunk/packages/seaview/trunk/debian/control
===================================================================
--- trunk/packages/seaview/trunk/debian/control	2006-09-21 01:41:46 UTC (rev 118)
+++ trunk/packages/seaview/trunk/debian/control	2006-09-22 05:04:38 UTC (rev 119)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <pkg-emboss-devel at lists.alioth.debian.org>
 Uploaders: Charles Plessy <charles-debian-nospam at plessy.org>
-Build-Depends: debhelper ( >= 5  ), libfltk1.1-dev
+Build-Depends: debhelper ( >= 5  ), libfltk1.1-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: seaview

Added: trunk/packages/seaview/trunk/debian/patches/00list
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/00list	                        (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/00list	2006-09-22 05:04:38 UTC (rev 119)
@@ -0,0 +1 @@
+10-alternatives.dpatch

Added: trunk/packages/seaview/trunk/debian/patches/10-alternatives.dpatch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/10-alternatives.dpatch	                        (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/10-alternatives.dpatch	2006-09-22 05:04:38 UTC (rev 119)
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-alternatives.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
+## This patch is hereby released in public domain.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use x-terminal-emulator instead of xterm
+
+ at DPATCH@
+
+--- seaview/align.cxx	2006-09-22 13:25:47.000000000 +0900
++++ seaview/align.cxx.patched	2006-09-22 13:48:37.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,7 +145,7 @@
+ #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) {
+ 		status = check_path("seaview_align.sh");
+@@ -157,7 +158,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,7 +250,7 @@
+ 	base_fname, base_fname);
+ #endif
+ #else
+-sprintf(commande, "xterm -T \"%s alignment\" -n %s -sb -sl 2000 "
++sprintf(commande, "x-terminal-emulator -T \"%s alignment\" -n %s -sb -sl 2000 "
+ 	"-e seaview_align.sh %s ", algo_name[align_algorithm], algo_name[align_algorithm], 
+ 	algo_name[align_algorithm]);
+ l = strlen(commande);

Modified: trunk/packages/seaview/trunk/debian/rules
===================================================================
--- trunk/packages/seaview/trunk/debian/rules	2006-09-21 01:41:46 UTC (rev 118)
+++ trunk/packages/seaview/trunk/debian/rules	2006-09-22 05:04:38 UTC (rev 119)
@@ -19,7 +19,15 @@
         CFLAGS += -g
 endif
 
-build: build-stamp
+patch:
+	dpatch apply-all
+	dpatch cat-all --desc-only > patch-stamp
+			
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+	
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 
@@ -28,7 +36,9 @@
 
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -37,7 +47,7 @@
 
 install: build
 	dh_testdir
-	dh_testroot
+		dh_testroot
 	dh_clean -k
 	dh_installdirs