--- wavesurfer-1.8.8p4.orig/debian/changelog +++ wavesurfer-1.8.8p4/debian/changelog @@ -0,0 +1,216 @@ +wavesurfer (1.8.8p4-3) unstable; urgency=medium + + * Fix broken initialisation of (Prefs,PrintCmd). This appears to have been + silently broken since at least since 1.8.5, but now explodes with the new + tk 8.5.15-4 when the Preferences Dialog is opened. + + * Remove the 'Defaults' and 'Apply' buttons from the Preferences Dialog. + The SetDefaultPrefs function was 'obsoleted' between 1.8.5 and 1.8.8, so + pressing that button just throws an error. The ApplyPreferences function + was changed some time before 1.8.8 to clear the Info(Prefs,t,*) keys, so + pressing it clears all the current values from the dialog, and it doesn't + actually save them to the config file until you press Ok anyway, so avoid + the disturbing visual and just simplify it to the choice of Ok or Cancel. + + * Fix the operation of "Make this the default configuration" when the Ogg + plugin is present. That option is offered if no configuration file is + present, and before the wsurf::ogg option 't' keys have been set, so it + fails trying to write out the preferences when Info(t,quality) is read. + Info(quality) et al. are initialised when the plugin is first loaded + though, so just test if the 't' keys are set before using them. + This would silently fail "successfully" with older tk, but now it throws + an error with more recent versions. Closes: #738703 + + * Drop some debug verbiage that ordinary users don't care to see on the + console. + + * Make the "no drag and drop support" message explain that you can get it + if you install tkdnd, which we now also Suggest. + + * Drop wish as an alternative to tk8.5, this doesn't currently work with + tk8.6 and I haven't yet looked at what will be needed to make it do so. + + -- Ron Lee Tue, 03 Jun 2014 04:37:04 +0930 + +wavesurfer (1.8.8p4-2) unstable; urgency=low + + * Catch the error thrown from 'canvas lower top topmost' when no items with + that tag exist yet, that tk versions after 8.5.11-2 now want to barf up. + Closes: #720397 Hopefully even correctly, there's been no other feedback. + + -- Ron Lee Sat, 07 Sep 2013 22:37:48 +0930 + +wavesurfer (1.8.8p4-1) unstable; urgency=low + + * Fixes bugs with waveform scaling, the config dialog, and "selection start + out of bounds" errors. + * Include the Ogg Vorbis plugin in the package too. + * Drop the version for the libsnack2 dependency now. Closes: #659974 + + -- Ron Lee Sun, 12 May 2013 10:24:22 +0930 + +wavesurfer (1.8.8p3-1) unstable; urgency=low + + * Rearrange things for the new upstream source tree layout. + + -- Ron Lee Sun, 08 May 2011 00:35:42 +0930 + +wavesurfer (1.8.5+unpacked-1) unstable; urgency=low + + * Really adopt the package this time, and decdBS it. + + -- Ron Lee Sat, 07 May 2011 20:00:48 +0930 + +wavesurfer (1.8.5-4) unstable; urgency=low + + * New maintainer. No changes, just reuploaded after pointless RoQA removal. + + -- Ron Lee Mon, 02 May 2011 09:56:25 +0930 + +wavesurfer (1.8.5-3) unstable; urgency=high + + * QA upload. + * Add 03_do_not_use_tile.patch with suggested workaround from upstream to + start wavesurfer in any case in non-tile mode (Closes: #606281). + + -- Salvatore Bonaccorso Wed, 29 Dec 2010 09:18:37 +0100 + +wavesurfer (1.8.5-2) unstable; urgency=low + + * Fixed multi channel mode for n-waveform (closes: #410276) + + -- Guenter Geiger (Debian/GNU) Mon, 12 Feb 2007 12:32:15 +0100 + +wavesurfer (1.8.5-1) unstable; urgency=low + + * New upstream version + + -- Guenter Geiger (Debian/GNU) Mon, 19 Dec 2005 17:01:46 +0100 + +wavesurfer (1.8.4-1) unstable; urgency=low + + * New upstream version + + -- Guenter Geiger (Debian/GNU) Wed, 5 Oct 2005 19:43:54 +0200 + +wavesurfer (1.8.3-1) unstable; urgency=low + + * New upstream version + + -- Guenter Geiger (Debian/GNU) Tue, 7 Jun 2005 11:24:06 +0200 + +wavesurfer (1.8.1-2) unstable; urgency=low + + * adjusted doc-base file to point to man18.html instead of man17.html + (closes: #30323) + * The pitch contour problems is resolved (closes: #287065) + * Added 32x32 xpm (closes: #299371) + + -- Guenter Geiger (Debian/GNU) Tue, 19 Apr 2005 11:30:40 +0200 + +wavesurfer (1.8.1-1) unstable; urgency=low + + * New upstream version + + -- Guenter Geiger (Debian/GNU) Wed, 16 Mar 2005 19:32:42 +0100 + +wavesurfer (1.7.3-2) unstable; urgency=low + + * Fixed wrong index in doc-base (closes: 285667) + + -- Guenter Geiger (Debian/GNU) Tue, 4 Jan 2005 10:56:12 +0100 + +wavesurfer (1.7.3-1) unstable; urgency=low + + * New upstream version + + -- Guenter Geiger (Debian/GNU) Wed, 27 Oct 2004 11:17:16 +0200 + +wavesurfer (1.7.1-2) unstable; urgency=low + + * Fixed the problem with ALt-W (close window) shortcut (closes: 266441) + * Moved to cdbs build system + + -- Guenter Geiger (Debian/GNU) Thu, 19 Aug 2004 16:01:38 +0200 + +wavesurfer (1.7.1-1) unstable; urgency=low + + * New upstream version + * Versioned build depends on debhelper 4 + * bumped standards version to 3.6.1 + * Added homepage to control file + + -- Guenter Geiger (Debian/GNU) Wed, 18 Aug 2004 17:24:03 +0200 + +wavesurfer (1.6.4-2) unstable; urgency=low + + * Removed duplicated dh_installdocs call (closes: 256586) + + -- Guenter Geiger (Debian/GNU) Mon, 28 Jun 2004 11:28:11 +0200 + +wavesurfer (1.6.4-1) unstable; urgency=low + + * New upstream release + * Quoted strings in menu file + + -- Guenter Geiger (Debian/GNU) Tue, 25 May 2004 22:14:32 +0200 + +wavesurfer (1.6.2-1) unstable; urgency=low + + * New upstream version + * reorganized manpage and fixed some typos + + -- Guenter Geiger (Debian/GNU) Tue, 24 Feb 2004 10:05:23 +0100 + +wavesurfer (1.6.0-2) unstable; urgency=low + + * fixed documentation index file in debian/doc-base (closes: #229582) + + -- Guenter Geiger (Debian/GNU) Sun, 25 Jan 2004 14:37:57 +0100 + +wavesurfer (1.6.0-1) unstable; urgency=low + + * New upstream release + + -- Guenter Geiger (Debian/GNU) Fri, 23 Jan 2004 12:36:50 +0100 + +wavesurfer (1.5.4-2) unstable; urgency=low + + * added tk8.4 depends (closes: #218247) (closes: #220453) + * fixed doc-base reference (closes: #220700) + + -- Guenter Geiger (Debian/GNU) Fri, 14 Nov 2003 06:05:45 +0100 + +wavesurfer (1.5.4-1) unstable; urgency=low + + * New upstream + + -- Guenter Geiger (Debian/GNU) Mon, 20 Oct 2003 15:41:09 +0200 + +wavesurfer (1.5.2-1) unstable; urgency=low + + * new upstream + + -- Guenter Geiger (Debian/GNU) Sun, 27 Jul 2003 14:37:34 +0200 + +wavesurfer (1.4.4-1) unstable; urgency=low + + * new upstream + + -- Guenter Geiger (Debian/GNU) Mon, 30 Sep 2002 11:19:02 +0200 + +wavesurfer (1.2.1-1) unstable; urgency=low + + * new upstream + + -- Guenter Geiger (Debian/GNU) Mon, 4 Mar 2002 13:11:13 +0100 + +wavesurfer (1.0.4-1) unstable; urgency=low + + * Initial Release. + + -- Guenter Geiger (Debian/GNU) Tue, 7 Aug 2001 19:54:17 +0200 + +Local variables: +mode: debian-changelog +End: --- wavesurfer-1.8.8p4.orig/debian/compat +++ wavesurfer-1.8.8p4/debian/compat @@ -0,0 +1 @@ +5 --- wavesurfer-1.8.8p4.orig/debian/control +++ wavesurfer-1.8.8p4/debian/control @@ -0,0 +1,20 @@ +Source: wavesurfer +Section: sound +Priority: optional +Maintainer: Ron Lee +Build-Depends: debhelper (>= 5) +Standards-Version: 3.9.5.0 +Homepage: http://www.speech.kth.se/wavesurfer +Vcs-Git: git://git.debian.org/users/ron/wavesurfer.git +Vcs-Browser: http://git.debian.org/?p=users/ron/wavesurfer.git;a=summary + +Package: wavesurfer +Architecture: all +Depends: libsnack2, tk8.5 +Suggests: tkdnd +Description: Sound Manipulation Program + Wavesurfer is a sound manipulation program, it has been designed to suit both + novice and advanced users. WaveSurfer has a simple and logical user interface + that provides functionality in an intuitive way and which can be adapted to + different tasks. + --- wavesurfer-1.8.8p4.orig/debian/copyright +++ wavesurfer-1.8.8p4/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Guenter Geiger (Debian/GNU) +Then again in 2011 by Ron + +Homepage: http://www.speech.kth.se/wavesurfer +Author: Kare Solander + + Copyright (c) 2000-2011 Jonas Beskow and Kare Sjolander + + The following terms apply to all files associated + with the software unless explicitly disclaimed in individual files. + + The authors hereby grant permission to use, copy, modify, distribute, + and license this software and its documentation for any purpose, provided + that existing copyright notices are retained in all copies and that this + notice is included verbatim in any distributions. No written agreement, + license, or royalty fee is required for any of the authorized uses. + Modifications to this software may be copyrighted by their authors + and need not follow the licensing terms described here, provided that + the new terms are clearly indicated on the first page of each file where + they apply. + + IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY + FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY + DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE + IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE + NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR + MODIFICATIONS. + + +The Debian packaging is licenced under the same terms as wavesurfer itself. --- wavesurfer-1.8.8p4.orig/debian/doc-base +++ wavesurfer-1.8.8p4/debian/doc-base @@ -0,0 +1,11 @@ +Document: wavesurfer +Title: Wavesurfer manual +Author: Jonas Beskow +Abstract: This manual describes wavesurfer, a versatile + soundfile editor, with unique features for speech processing. +Section: Sound + +Format: HTML +Index: /usr/share/doc/wavesurfer/doc/wsurf.html +Files: /usr/share/doc/wavesurfer/doc/*.html + --- wavesurfer-1.8.8p4.orig/debian/menu +++ wavesurfer-1.8.8p4/debian/menu @@ -0,0 +1,6 @@ +?package(wavesurfer):\ + needs="X11"\ + section="Applications/Sound"\ + title="wavesurfer" \ + command="/usr/bin/wavesurfer"\ + icon="/usr/share/pixmaps/ws32.xpm" --- wavesurfer-1.8.8p4.orig/debian/rules +++ wavesurfer-1.8.8p4/debian/rules @@ -0,0 +1,39 @@ +#!/usr/bin/make -f +# +# Copyright 2003 - 2011, Ron Lee. + +clean: + dh_testdir + dh_testroot + dh_clean + + +build: +build-arch: +build-indep: + +binary: binary-indep + +binary-arch: + +binary-indep: + dh_testdir + dh_testroot + dh_install -XREADME.txt -Xexample1.plug -Xexample2.plug \ + src/* usr/share/tcltk/wavesurfer + dh_install debian/ws32.xpm usr/share/pixmaps + dh_install wavesurfer usr/bin + dh_installman debian/wavesurfer.1 + dh_installdocs doc + dh_installmenu + dh_installchangelogs + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + + +.PHONY: clean build build-arch build-indep binary binary-arch binary-indep + --- wavesurfer-1.8.8p4.orig/debian/wavesurfer.1 +++ wavesurfer-1.8.8p4/debian/wavesurfer.1 @@ -0,0 +1,55 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH WAVESURFER 1 "October 20, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +wavesurfer \- soundfile editor +.SH SYNOPSIS +.br +.B wavesurfer +.RI [options] " soundfile" +.SH DESCRIPTION + +Wavesurfer is a tool for sound visualization and manipulation. It can be used +as a stand-alone tool for a wide range of tasks in speech research and +education. Typical applications are speech/sound analysis and sound annotation/transcription. + +The documentation for wavesurfer can be accessed online via +www.speech.kth.se/wavesurfer or through the wavesurfer help menu. + +.SH OPTIONS + +WaveSurfer recognizes the following command line switches + +\-play + +start playing as soon as the sound is loaded. + +\-config configuration + +use the configuration and do not query the user for one. WaveSurfer uses the first matching configuration of the available. If none matches, a wavebar will be displayed. + +\-master filename + +when loading several sound files at once, specify which sound's wavebar will control the rest. For example, wavesurfer.tcl -config Waveform -master ex1.wav ex1.wav ex2.wav, will make the first sound's wavebar control the second one as well. Same function can be had by choosing View | Master Widget | ex1.wav. + +\-mlf filename + +search the specified HTK Master Label File (only for HTK format transcription panes). Several options can be specified and they will apply to the corresponding transcription pane counting from the top. + +.SH AUTHOR +This manual page was written by Guenter Geiger , +for the Debian project (but may be used by others). --- wavesurfer-1.8.8p4.orig/debian/ws32.xpm +++ wavesurfer-1.8.8p4/debian/ws32.xpm @@ -0,0 +1,384 @@ +/* XPM */ +static char * ws32_xpm[] = { +"32 32 349 2", +" c None", +". c #111026", +"+ c #2D3053", +"@ c #706E6C", +"# c #9FA0AB", +"$ c #272537", +"% c #14142A", +"& c #55524D", +"* c #979696", +"= c #CACDD1", +"- c #C2C5CD", +"; c #706F80", +"> c #77777F", +", c #635F5C", +"' c #9E9A95", +") c #D2D1D0", +"! c #E5EBEF", +"~ c #E4F2FC", +"{ c #757C98", +"] c #A5A4B6", +"^ c #444041", +"/ c #A29E97", +"( c #DAD7D6", +"_ c #ECF2F4", +": c #E9F4FB", +"< c #BCC9DC", +"[ c #636987", +"} c #B3BECD", +"| c #A0A2AD", +"1 c #878481", +"2 c #BCBAB6", +"3 c #E9EEEF", +"4 c #ECF5FA", +"5 c #E5F3FE", +"6 c #E4F3FE", +"7 c #75829D", +"8 c #B4C0D7", +"9 c #D2D7DB", +"0 c #625F61", +"a c #5E5856", +"b c #A29B99", +"c c #E3E3E2", +"d c #F1F6F9", +"e c #EBF7FD", +"f c #E6F4FE", +"g c #B1BFD4", +"h c #8290A9", +"i c #A1AFC5", +"j c #DCE9F7", +"k c #A3A09F", +"l c #B6B0AF", +"m c #948F9A", +"n c #C8CDD7", +"o c #B1BDCA", +"p c #AEBBCB", +"q c #ADBBCB", +"r c #737F9C", +"s c #B0C0D8", +"t c #DEEAF7", +"u c #CED5E0", +"v c #86817E", +"w c #756C5D", +"x c #CAC2B7", +"y c #ECF0F2", +"z c #A2ABBA", +"A c #454C75", +"B c #5D6494", +"C c #444E78", +"D c #667192", +"E c #AEBED3", +"F c #DCEDFF", +"G c #D8DFE6", +"H c #ABA7A5", +"I c #847A63", +"J c #CDC5B6", +"K c #E7E7E1", +"L c #D0DBE9", +"M c #7A84A2", +"N c #6C74A4", +"O c #7B83B1", +"P c #4E577C", +"Q c #BBCAE0", +"R c #DBE8F7", +"S c #C0C2C4", +"T c #5C5852", +"U c #9D917A", +"V c #D2C2A8", +"W c #E9EAE5", +"X c #E2F0FE", +"Y c #8691B4", +"Z c #444C7C", +"` c #404A73", +" . c #D9EAFD", +".. c #DBECFE", +"+. c #DAEAFA", +"@. c #D0D3DA", +"#. c #8D8681", +"$. c #A79B7A", +"%. c #CFBEA4", +"&. c #DBD0CB", +"*. c #BCC0CE", +"=. c #C5D3E1", +"-. c #BCC6DB", +";. c #68749A", +">. c #545E88", +",. c #8B97B9", +"'. c #D4E5FD", +"). c #D7E9FC", +"!. c #D0DBE7", +"~. c #B3AFAF", +"{. c #473E37", +"]. c #AEA283", +"^. c #C6B297", +"/. c #9E9098", +"(. c #464B73", +"_. c #8E98B8", +":. c #444D78", +"<. c #A4ACCC", +"[. c #575F87", +"}. c #4E5587", +"|. c #7582A8", +"1. c #D4E5FC", +"2. c #D4DFEE", +"3. c #B3ADA7", +"4. c #6C645B", +"5. c #9F9378", +"6. c #D0C3B1", +"7. c #A9A0A2", +"8. c #7A7A98", +"9. c #838AB9", +"0. c #464F80", +"a. c #6972A5", +"b. c #485080", +"c. c #656D9B", +"d. c #6770A5", +"e. c #A6B4D6", +"f. c #D7E2F1", +"g. c #BFBDC0", +"h. c #7A716B", +"i. c #928978", +"j. c #CFC6B3", +"k. c #9797A3", +"l. c #7F83A5", +"m. c #5D6696", +"n. c #454C7D", +"o. c #595E8E", +"p. c #434B7B", +"q. c #4C5484", +"r. c #4B5385", +"s. c #505D87", +"t. c #A0AAC2", +"u. c #BCB8BA", +"v. c #8E847A", +"w. c #847A6C", +"x. c #CCC8BD", +"y. c #E2E6E8", +"z. c #B8C1DB", +"A. c #59618D", +"B. c #626CA1", +"C. c #4F578A", +"D. c #525B8B", +"E. c #636B9F", +"F. c #444B7E", +"G. c #848FA8", +"H. c #AEACB0", +"I. c #968C82", +"J. c #5B544C", +"K. c #7D776C", +"L. c #C9C8C2", +"M. c #E5EEF5", +"N. c #D7E7FB", +"O. c #495483", +"P. c #4E578E", +"Q. c #434C80", +"R. c #5F6894", +"S. c #4B5487", +"T. c #6971A6", +"U. c #54598B", +"V. c #898AA7", +"W. c #785F5C", +"X. c #9A8879", +"Y. c #6F6E6D", +"Z. c #C5C5C1", +"`. c #DDE6EB", +" + c #D8E9FB", +".+ c #C6DAF3", +"++ c #828EBE", +"@+ c #565F92", +"#+ c #5D6897", +"$+ c #97A8C9", +"%+ c #525F8B", +"&+ c #535B8F", +"*+ c #8884A5", +"=+ c #695255", +"-+ c #A68D79", +";+ c #8E7F67", +">+ c #7F7A77", +",+ c #B6B3B5", +"'+ c #ADB6CB", +")+ c #CADBF5", +"!+ c #CDE2FE", +"~+ c #99ABCB", +"{+ c #444E7E", +"]+ c #3E487B", +"^+ c #9AABD4", +"/+ c #C7E0FD", +"(+ c #C0D2F5", +"_+ c #838AB0", +":+ c #6D5C64", +"<+ c #A58B78", +"[+ c #574B35", +"}+ c #A19EA1", +"|+ c #CBCFE3", +"1+ c #5B6693", +"2+ c #6978A1", +"3+ c #CBE2FE", +"4+ c #9FB1D6", +"5+ c #747EB0", +"6+ c #737DB2", +"7+ c #6B7AA7", +"8+ c #C4DDFC", +"9+ c #C7D9F3", +"0+ c #BFBFC8", +"a+ c #907D72", +"b+ c #635343", +"c+ c #7B797B", +"d+ c #919BB4", +"e+ c #7582B2", +"f+ c #455082", +"g+ c #5A6496", +"h+ c #6976A5", +"i+ c #3E487C", +"j+ c #3E477C", +"k+ c #AEC0E8", +"l+ c #C6D7F4", +"m+ c #BBBDC6", +"n+ c #998B83", +"o+ c #594A3C", +"p+ c #7B7773", +"q+ c #ABAFBD", +"r+ c #515C86", +"s+ c #828BC1", +"t+ c #3A4479", +"u+ c #515C8F", +"v+ c #4C548A", +"w+ c #596396", +"x+ c #464E86", +"y+ c #6B7CAA", +"z+ c #96A4C7", +"A+ c #C0C6D8", +"B+ c #938987", +"C+ c #61534A", +"D+ c #4A443F", +"E+ c #B4BAC4", +"F+ c #C9DBF7", +"G+ c #8194BC", +"H+ c #3B457A", +"I+ c #646CA1", +"J+ c #495080", +"K+ c #454F83", +"L+ c #646DA4", +"M+ c #555E95", +"N+ c #56608D", +"O+ c #B6B9CC", +"P+ c #918990", +"Q+ c #51453E", +"R+ c #8B8887", +"S+ c #BFCEE4", +"T+ c #BCD7F6", +"U+ c #B8CEEC", +"V+ c #63719D", +"W+ c #434C7E", +"X+ c #40497B", +"Y+ c #566096", +"Z+ c #4A548C", +"`+ c #727CAA", +" @ c #8E91AE", +".@ c #8C858D", +"+@ c #514744", +"@@ c #555259", +"#@ c #B3B8C7", +"$@ c #B9D3EF", +"%@ c #B8D5F5", +"&@ c #8EA5CB", +"*@ c #4E598C", +"=@ c #40497E", +"-@ c #566195", +";@ c #454E86", +">@ c #828ABA", +",@ c #5F607C", +"'@ c #787782", +")@ c #979AA2", +"!@ c #B8C9E1", +"~@ c #B4CEF2", +"{@ c #7B95BD", +"]@ c #6178A2", +"^@ c #8499C5", +"/@ c #6176A5", +"(@ c #455088", +"_@ c #7C86B3", +":@ c #696B86", +"<@ c #746F77", +"[@ c #474346", +"}@ c #787679", +"|@ c #ADB8CD", +"1@ c #B0CBED", +"2@ c #90AAD1", +"3@ c #566C95", +"4@ c #A2B8E1", +"5@ c #A8C5EB", +"6@ c #A8BEE5", +"7@ c #6D77A0", +"8@ c #555970", +"9@ c #6D6C73", +"0@ c #858792", +"a@ c #B3C4E0", +"b@ c #88A2CA", +"c@ c #475F8A", +"d@ c #7D97BF", +"e@ c #A2C1E7", +"f@ c #A5C0E3", +"g@ c #9BA9C3", +"h@ c #87899A", +"i@ c #474240", +"j@ c #5C575B", +"k@ c #9EA1B6", +"l@ c #89A2CB", +"m@ c #596C9A", +"n@ c #A0BFE6", +"o@ c #9DBBE1", +"p@ c #9DAFCE", +"q@ c #8D94A7", +"r@ c #666266", +"s@ c #403C3E", +"t@ c #A0A5C3", +"u@ c #566797", +"v@ c #889DC6", +"w@ c #A1B5D7", +"x@ c #92A0BF", +"y@ c #7A7E8B", +"z@ c #6A686D", +"A@ c #1D1B32", +"B@ c #2A2C47", +"C@ c #9097B7", +"D@ c #858DA2", +"E@ c #6F6F7B", +"F@ c #59575E", +"G@ c #282845", +"H@ c #19172E", +" . + ", +" @ # $ % ", +" & * = - ; > ", +" , ' ) ! ~ { ] ^ ", +" / ( _ : < [ } | ", +" 1 2 3 4 5 6 7 8 9 0 ", +" a b c d e f g h i j k ", +" l m n o p q r s t u v ", +" w x y z A B C D E F G H ", +" I J K L M N O P Q F R S T ", +" U V W : X Y Z ` ...+.@.#. ", +" $.%.&.*.=.-.;.>.,.'.).!.~.{. ", +" ].^./.(._.:.<.[.}.|.1.2.3.4. ", +" 5.6.7.8.9.0.a.b.c.d.e.f.g.h. ", +" i.j.k.l.m.n.o.p.q.r.s.t.u.v. ", +" w.x.y.z.A.B.C.D.n.E.F.G.H.I.J. ", +" K.L.M.N.O.P.Q.R.S.T.U.V.W.X. ", +" Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+ ", +" >+,+'+)+!+~+{+]+^+/+(+_+:+<+[+ ", +" }+|+1+2+3+4+5+6+7+8+9+0+a+b+ ", +" c+d+b.e+f+g+h+i+j+k+l+m+n+o+ ", +" p+q+r+s+t+u+v+w+x+y+z+A+B+C+ ", +" D+E+F+G+H+I+J+K+L+M+N+O+P+Q+ ", +" R+S+T+U+V+W+X+Y+Z+`+ @.@+@ ", +" @@#@$@%@&@*@=@-@;@>@,@'@ ", +" )@!@~@{@]@^@/@(@_@:@<@[@ ", +" }@|@1@2@3@4@5@6@7@8@9@ ", +" 0@a@b@c@d@e@f@g@h@i@ ", +"j@k@l@m@n@o@p@q@r@ ", +"s@t@u@v@w@x@y@z@ ", +"A@B@C@D@E@F@ ", +"G@H@ "}; --- wavesurfer-1.8.8p4.orig/src/app-wavesurfer/wavesurfer.tcl +++ wavesurfer-1.8.8p4/src/app-wavesurfer/wavesurfer.tcl @@ -439,8 +439,8 @@ proc OpenFile {args} { - puts [info level 0] - puts defaultConfig=$::wsurf::Info(Prefs,defaultConfig) +# puts [info level 0] +# puts defaultConfig=$::wsurf::Info(Prefs,defaultConfig) global surf variable Info @@ -2252,10 +2252,10 @@ -command "destroy .prefs;SavePreferences"] -side $::ocdir -padx 3 -expand true pack [ttk::button .prefs.f.b2 -text [::util::mc Cancel] -width 8 \ -command "destroy .prefs"] -side $::ocdir -padx 3 -expand true - pack [ttk::button .prefs.f.b3 -text [::util::mc Defaults] \ - -command SetDefaultPrefs] -side left -padx 3 -expand true - pack [ttk::button .prefs.f.b4 -text [::util::mc Apply] -width 8 \ - -command ApplyPreferences] -side left -padx 3 -expand true +#pack [ttk::button .prefs.f.b3 -text [::util::mc Defaults] \ +# -command SetDefaultPrefs] -side left -padx 3 -expand true +#pack [ttk::button .prefs.f.b4 -text [::util::mc Apply] -width 8 \ +# -command ApplyPreferences] -side left -padx 3 -expand true set notebook .prefs.nb set pages {} --- wavesurfer-1.8.8p4.orig/src/plugins/ogg.plug +++ wavesurfer-1.8.8p4/src/plugins/ogg.plug @@ -181,7 +181,8 @@ variable Info foreach var [list quality nombr maxbr minbr com query] { - if {[string compare $Info($var) $Info(t,$var)] != 0} { + if {[info exists Info(t,$var)] \ + && [string compare $Info($var) $Info(t,$var)] != 0} { set Info($var) $Info(t,$var) } } --- wavesurfer-1.8.8p4.orig/src/wsurf/vtcanvas.tcl +++ wavesurfer-1.8.8p4/src/wsurf/vtcanvas.tcl @@ -471,7 +471,7 @@ $c coords leftbar $x0 0 $x0 $height $c coords rightbar $x1 0 $x1 $height $c raise top - $c lower top topmost + catch {$c lower top topmost} $c raise selbg $c raise sellen $c lower bottom --- wavesurfer-1.8.8p4.orig/src/wsurf/wsurf.tcl +++ wavesurfer-1.8.8p4/src/wsurf/wsurf.tcl @@ -234,7 +234,7 @@ # drag-and-drop bindings if [catch {package require tkdnd}] { - puts "no drag and drop support" + puts "tkdnd not found, no drag and drop support" } else { bind Wsurf [namespace code [list InitDnDBindings %W]] bind Vtcanvas [namespace code [list InitDnDBindings %W]] @@ -259,11 +259,11 @@ if {[string match unix $::tcl_platform(platform)]} { if {[string match Darwin $::tcl_platform(os)]} { - set Info(Prefs,t,PrintCmd) {lpr $FILE} - set Info(Prefs,t,PrintPVCmd) {open -a Preview $FILE} + set Info(Prefs,PrintCmd) {lpr $FILE} + set Info(Prefs,PrintPVCmd) {open -a Preview $FILE} } else { - set Info(Prefs,t,PrintCmd) {lpr $FILE} - set Info(Prefs,t,PrintPVCmd) {ghostview $FILE} + set Info(Prefs,PrintCmd) {lpr $FILE} + set Info(Prefs,PrintPVCmd) {ghostview $FILE} } } elseif {[string match windows $::tcl_platform(platform)]} { set Info(Prefs,PrintCmd) {"C:/Program Files/PrintFile/prfile32.exe" /q $FILE} @@ -2998,12 +2998,12 @@ timeFormat yaxisWidth prefsWithConf theme beg play playall \ playloop pause \ stop record close end print zoomin zoomout zoomall zoomsel] { - puts var=$var +# puts var=$var if [info exists Info(Prefs,$var)] { - puts "set Info(Prefs,t,$var) $Info(Prefs,$var)" +# puts "set Info(Prefs,t,$var) $Info(Prefs,$var)" set Info(Prefs,t,$var) $Info(Prefs,$var) } else { - puts "no Info(Prefs,$var)" +# puts "no Info(Prefs,$var)" } } if {$Info(Prefs,t,defaultConfig)==""} { --- wavesurfer-1.8.8p4.orig/wavesurfer +++ wavesurfer-1.8.8p4/wavesurfer @@ -0,0 +1,4 @@ +#!/bin/sh + +exec /usr/share/tcltk/wavesurfer/app-wavesurfer/wavesurfer.tcl "$@" +