[med-svn] r15859 - in trunk/packages/staden/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Mon Jan 27 07:52:09 UTC 2014
Author: tille
Date: 2014-01-27 07:52:09 +0000 (Mon, 27 Jan 2014)
New Revision: 15859
Added:
trunk/packages/staden/trunk/debian/staden-common.lintian-override
Modified:
trunk/packages/staden/trunk/debian/changelog
trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch
trunk/packages/staden/trunk/debian/patches/make_help_menus_work
trunk/packages/staden/trunk/debian/patches/series
trunk/packages/staden/trunk/debian/watch
Log:
Adapted to latest upstream version
Modified: trunk/packages/staden/trunk/debian/changelog
===================================================================
--- trunk/packages/staden/trunk/debian/changelog 2014-01-27 07:36:37 UTC (rev 15858)
+++ trunk/packages/staden/trunk/debian/changelog 2014-01-27 07:52:09 UTC (rev 15859)
@@ -1,4 +1,4 @@
-staden (2.0.0b9-1) UNRELEASED; urgency=low
+staden (2.0.0~b10-1) UNRELEASED; urgency=low
FIXME: TODO
it seems gap[45], pregap4, spin (not sure about trev) are the main
@@ -20,6 +20,7 @@
* Port some changes from other attempt to package staden by
Jonas Smedegaard
* Fix several lintian issues
+ * fix watch file
-- Andreas Tille <tille at debian.org> Mon, 20 Jan 2014 11:21:17 +0100
Modified: trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch
===================================================================
--- trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch 2014-01-27 07:36:37 UTC (rev 15858)
+++ trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch 2014-01-27 07:52:09 UTC (rev 15859)
@@ -43,42 +43,3 @@
vmessage("%25d %8d %15d %8d\n",contigs[i].contig,
clen, cleft, cright);
---- a/gap5/tg_gio.c
-+++ b/gap5/tg_gio.c
-@@ -20,11 +20,11 @@
- /* Open/close/commit */
-
- void xperror_fatal(char *name, char *str) {
-- verror(ERR_FATAL, name, str);
-+ verror(ERR_FATAL, name, "%s", str);
- }
-
- void xperror_warn(char *name, char *str) {
-- verror(ERR_WARN, name, str);
-+ verror(ERR_WARN, name, "%s", str);
- }
-
- static int db_version = DB_VERSION;
---- a/gap5/gap-error.c
-+++ b/gap5/gap-error.c
-@@ -89,7 +89,7 @@ void error_sig(int sig) {
- }
-
- static void xperror_out_func(char *name, char *str) {
-- verror(ERR_FATAL, name, str);
-+ verror(ERR_FATAL, name, "%s", str);
- }
-
- /* NOT FATAL */
---- a/gap5/tk-io-reg.c
-+++ b/gap5/tk-io-reg.c
-@@ -1169,7 +1169,8 @@ int str2reg_data(Tcl_Interp *interp, Gap
- break;
-
- default:
-- verror(ERR_WARN, "str2reg_data: unsupported event type '%s'", type);
-+ /* Debian fix might be not reasonable */
-+ verror(ERR_WARN, "str2reg_data", "str2reg_data: unsupported event type '%s'", type);
- return -1;
- }
-
Modified: trunk/packages/staden/trunk/debian/patches/make_help_menus_work
===================================================================
--- trunk/packages/staden/trunk/debian/patches/make_help_menus_work 2014-01-27 07:36:37 UTC (rev 15858)
+++ trunk/packages/staden/trunk/debian/patches/make_help_menus_work 2014-01-27 07:52:09 UTC (rev 15859)
@@ -4,7 +4,7 @@
--- a/gap5/gap5rc_menu_full
+++ b/gap5/gap5rc_menu_full
-@@ -196,12 +196,12 @@
+@@ -212,12 +212,12 @@ add_command {Assembly.Map Reads.Bwa bwas
add_command {Help.Contents} 1 0 {show_help gap5 Contents}
@@ -21,7 +21,7 @@
#add_command {File.Busy On} 1 2 {SetBusy}
--- a/gap4/gaprc_menu_full
+++ b/gap4/gaprc_menu_full
-@@ -200,7 +200,7 @@
+@@ -200,7 +200,7 @@ add_command {Help.Output Window} 1 0 {sh
add_separator {Help.S1}
add_command {Help.Index} 1 0 {show_help gap4 Index}
add_separator {Help.S2}
@@ -32,7 +32,7 @@
#add_command {File.Busy On} 1 2 {SetBusy}
--- a/gap4/gaprc_menu_mito
+++ b/gap4/gaprc_menu_mito
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ add_command {Help.Output Window} 1 0 {sh
add_separator {Help.S1}
add_command {Help.Index} 1 0 {show_help gap4 Index}
add_separator {Help.S2}
@@ -43,7 +43,7 @@
#add_command {File.Busy On} 1 2 {SetBusy}
--- a/pregap4/pregap4rc
+++ b/pregap4/pregap4rc
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ add_command {Help.Files} 1
add_command {Help.Configuring Modules} 1 0 \
{show_help pregap4 {Pregap4-Modules}}
add_separator {Help.S2}
Modified: trunk/packages/staden/trunk/debian/patches/series
===================================================================
--- trunk/packages/staden/trunk/debian/patches/series 2014-01-27 07:36:37 UTC (rev 15858)
+++ trunk/packages/staden/trunk/debian/patches/series 2014-01-27 07:52:09 UTC (rev 15859)
@@ -1,5 +1,5 @@
-1001_fix_zlib_linkage.patch
-remove_svnversion_dep
+# 1001_fix_zlib_linkage.patch
+# remove_svnversion_dep
make_help_menus_work
hardening_format-security.patch
fix_tcl_path.patch
Added: trunk/packages/staden/trunk/debian/staden-common.lintian-override
===================================================================
--- trunk/packages/staden/trunk/debian/staden-common.lintian-override (rev 0)
+++ trunk/packages/staden/trunk/debian/staden-common.lintian-override 2014-01-27 07:52:09 UTC (rev 15859)
@@ -0,0 +1,3 @@
+# This is actually no license file but a script showing the license text
+staden-common: extra-license-file usr/share/staden/tcl/tk_utils/licence.tcl
+
Modified: trunk/packages/staden/trunk/debian/watch
===================================================================
--- trunk/packages/staden/trunk/debian/watch 2014-01-27 07:36:37 UTC (rev 15858)
+++ trunk/packages/staden/trunk/debian/watch 2014-01-27 07:52:09 UTC (rev 15859)
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/~b/b/ \
- http://sf.net/staden/staden-([0-9ab.]*).tar.(?:bz2|gz)
+ http://sf.net/staden/staden-([0-9ab.]*)[-src]*\.tar\.(?:bz2|gz)
More information about the debian-med-commit
mailing list