[med-svn] r2635 - in trunk/packages/seaview/trunk/debian: . patches
plessy at alioth.debian.org
plessy at alioth.debian.org
Sun Nov 9 10:33:55 UTC 2008
Author: plessy
Date: 2008-11-09 10:33:54 +0000 (Sun, 09 Nov 2008)
New Revision: 2635
Modified:
trunk/packages/seaview/trunk/debian/changelog
trunk/packages/seaview/trunk/debian/compat
trunk/packages/seaview/trunk/debian/control
trunk/packages/seaview/trunk/debian/copyright
trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch
trunk/packages/seaview/trunk/debian/rules
Log:
Preparing the release of 3.2, but a problem with a non-free file must be solved first.
Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog 2008-11-09 08:31:16 UTC (rev 2634)
+++ trunk/packages/seaview/trunk/debian/changelog 2008-11-09 10:33:54 UTC (rev 2635)
@@ -1,8 +1,13 @@
-seaview (1:2.4-2) UNRELEASED; urgency=low
+seaview (1:3.2-1) UNRELEASED; urgency=low
+ * New upstream version:
+ - Version 3.0
+ - Version 3.1
+ - Version 3.2
* debian/copyright, debian/seaview.1*: added year 2008 to copyright
statements.
* Updated my email address.
+ * debian/control, debian/compat: using Debhelper 7.
-- Charles Plessy <plessy at debian.org> Sun, 27 Apr 2008 17:02:54 +0900
Modified: trunk/packages/seaview/trunk/debian/compat
===================================================================
--- trunk/packages/seaview/trunk/debian/compat 2008-11-09 08:31:16 UTC (rev 2634)
+++ trunk/packages/seaview/trunk/debian/compat 2008-11-09 10:33:54 UTC (rev 2635)
@@ -1 +1 @@
-5
+7
Modified: trunk/packages/seaview/trunk/debian/control
===================================================================
--- trunk/packages/seaview/trunk/debian/control 2008-11-09 08:31:16 UTC (rev 2634)
+++ trunk/packages/seaview/trunk/debian/control 2008-11-09 10:33:54 UTC (rev 2635)
@@ -4,7 +4,7 @@
Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper ( >= 5 ), libfltk1.1-dev, quilt
+Build-Depends: debhelper ( >= 7 ), libfltk1.1-dev, libjpeg62-dev, quilt
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/seaview/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/seaview/trunk/
Modified: trunk/packages/seaview/trunk/debian/copyright
===================================================================
--- trunk/packages/seaview/trunk/debian/copyright 2008-11-09 08:31:16 UTC (rev 2634)
+++ trunk/packages/seaview/trunk/debian/copyright 2008-11-09 10:33:54 UTC (rev 2635)
@@ -1,3 +1,5 @@
+NOW CONTAINS A NON-FREE FILE (md5.c); DO NOT UPLOAD UNTIL PROBLEM IS SOLVED.
+
X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
X-Debianized-By: Stephane Bortzmeyer <bortzmeyer at debian.org>
X-Debinized-Date: Mon, 1 Mar 1999 16:41:51 +0100
Modified: trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch 2008-11-09 08:31:16 UTC (rev 2634)
+++ trunk/packages/seaview/trunk/debian/patches/seaview_align-full_path.patch 2008-11-09 10:33:54 UTC (rev 2635)
@@ -1,28 +1,30 @@
-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;
-- }
+diff --git a/align.cxx b/align.cxx
+index 349470c..f4b3a17 100644
+--- a/align.cxx
++++ b/align.cxx
+@@ -139,9 +139,9 @@ FILE *in;
+ status = get_full_path("seaview_align.sh") == NULL;
+ }
if(status != 0) {
- fl_message("Alignment operation is impossible because\n"
+- fl_message("Alignment operation is impossible because\n"
- "one of the programs xterm, seaview_align.sh\n"
-- "is missing");
-+ "The programs xterm is missing");
+- "is missing from PATH or seaview's directory");
++ fl_message("Alignment operation is impossible\n"
++ "because the program xterm is missing\n"
++ "from PATH or seaview's directory");
((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 @@
+@@ -597,9 +597,10 @@ 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, "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);
+-p = strdup(get_full_path("seaview_align.sh"));
++/* Hardcoded in Debian
++ p = strdup(get_full_path("seaview_align.sh")); */
+ sprintf(command, "xterm -T \"%s alignment\" -n %s -sb -sl 2000 -e %s %s %s %s ",
+- algo_name, algo_name, p, get_full_path(algo_name), base_fname, local);
++ algo_name, algo_name, "/usr/share/seaview/seaview_align.sh", get_full_path(algo_name), base_fname, local);
+ free(p);
#endif
return 0;
Modified: trunk/packages/seaview/trunk/debian/rules
===================================================================
--- trunk/packages/seaview/trunk/debian/rules 2008-11-09 08:31:16 UTC (rev 2634)
+++ trunk/packages/seaview/trunk/debian/rules 2008-11-09 10:33:54 UTC (rev 2635)
@@ -26,7 +26,8 @@
build: patch build-stamp
build-stamp:
dh_testdir
- $(MAKE) OPT="$(CFLAGS)" seaviewps
+ $(MAKE) OPT="$(CFLAGS)" seaviewps PNGJPEGLIBS='-lpng -ljpeg' FLTKLIBS='-lfltk -lfltk_images'
+ mv seaviewps seaview
touch build-stamp
clean: clean-patched unpatch
@@ -35,7 +36,7 @@
dh_testdir
dh_testroot
rm -f build-stamp
- rm -f *.o seaview
+ rm -f *.o seaview seaviewps
install: build
dh_testdir
More information about the debian-med-commit
mailing list