[Demudi-commits] r1170 - in timidity/trunk: debian doc/C timidity

Wed Mar 28 06:48:31 CET 2007

Author: andete-guest
Date: 2007-03-28 05:48:30 +0000 (Wed, 28 Mar 2007)
New Revision: 1170

Modified:
   timidity/trunk/debian/README.Debian
   timidity/trunk/debian/changelog
   timidity/trunk/debian/timidity.cfg
   timidity/trunk/debian/timidity.init
   timidity/trunk/doc/C/timidity.1
   timidity/trunk/doc/C/timidity.cfg.5
   timidity/trunk/timidity/common.c
   timidity/trunk/timidity/timidity.c
Log:
A set of bugfixes


Modified: timidity/trunk/debian/README.Debian
===================================================================

--- timidity/trunk/debian/README.Debian	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/debian/README.Debian	2007-03-28 05:48:30 UTC (rev 1170)
@@ -13,12 +13,13 @@
 only DFSG-compliant set of patches available, and the default minimal config
 file will try to use that.  See the freepats package for more details.
 
-You have to find a sound font or patch set, and configure /etc/timidity.cfg
+You have to find a sound font or patch set, and configure /etc/timidity/timidity.cfg
 for that patchset.
 
 Good soundfonts in .sf2 format are often available from sound-card makers.
-TiMidity can use those.  There are also patchsets available for download in the
-Internet, that TiMidity can use.
+For example the Soundblaster Live! driver CD contains the 8MBGMSFX.SF2 file.
+TiMidity can use those.  There are also patchsets available for download on the
+Internet that are usable for TiMidity.
 
 You can find more information about patchsets and soundfonts in the
 TiMidity homepage and mailinglist.  The homepage is at
@@ -36,7 +37,7 @@
 by prefixing them with "opt".  Thus, you could use the following, to 
 reduce CPU usage to a minimum:
 
-opt no-anti-alias
+opt anti-alias=d
 opt ext WPVSETOZ
 opt fast-decay
 opt interpolation linear

Modified: timidity/trunk/debian/changelog
===================================================================
--- timidity/trunk/debian/changelog	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/debian/changelog	2007-03-28 05:48:30 UTC (rev 1170)
@@ -1,3 +1,15 @@
+timidity (2.13.2-10) UNRELEASED; urgency=low
+
+  * fix error message (Closes: #335295)
+  * fix typos in manpages (Closes: #409588, #409590)
+  * fix location of configfile in manpage (Closes: #360403)
+  * use opt anti-alias=d instead of opt no-anti-alias (Closes: #396004)
+  * mention 8MBGMSFX.SF2 in README.Debian (Closes: #350984)
+  * don't url_unexpand_home_dir when opening a file with
+    common.c:open_file (Closes: #327042)
+
+ -- Joost Yervante Damad <andete at debian.org>  Sat, 24 Mar 2007 08:09:43 +0100
+
 timidity (2.13.2-9) unstable; urgency=low
 
   * Apply patch from version 2.13.2-7.3 which crossed my upload and

Modified: timidity/trunk/debian/timidity.cfg
===================================================================
--- timidity/trunk/debian/timidity.cfg	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/debian/timidity.cfg	2007-03-28 05:48:30 UTC (rev 1170)
@@ -11,7 +11,7 @@
 #opt EFreverb=d		#disable reverb
 #opt EFchorus=d		#disable chorus
 #opt EFdelay=d		#disable delay
-#opt no-anti-alias	#disable sample anti-aliasing
+#opt anti-alias=d	#disable sample anti-aliasing
 #opt EWPVSETOZ		#disable all Midi Controls
 #opt p32a		#default to 32 voices with auto reduction
 #opt s32kHz		#default sample frequency to 32kHz

Modified: timidity/trunk/debian/timidity.init
===================================================================
--- timidity/trunk/debian/timidity.init	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/debian/timidity.init	2007-03-28 05:48:30 UTC (rev 1170)
@@ -7,6 +7,9 @@
 #               Distributed under the GPL version 2
 #
 
+# use lsb-base
+# . /lib/lsb/init-functions
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/timidity
 DESC="TiMidity++ ALSA midi emulation"

Modified: timidity/trunk/doc/C/timidity.1
===================================================================
--- timidity/trunk/doc/C/timidity.1	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/doc/C/timidity.1	2007-03-28 05:48:30 UTC (rev 1170)
@@ -516,10 +516,10 @@
 Launch \fBTiMidity++\fP as ALSA sequencer client.
 .TP
 .B \-iW
-Windodws synthesizer interface
+Windows synthesizer interface
 .TP
 .B \-iw
-Windodws GUI interface
+Windows GUI interface
 .TP
 .B \-iP
 PortMIDI synthesizer interface

Modified: timidity/trunk/doc/C/timidity.cfg.5
===================================================================
--- timidity/trunk/doc/C/timidity.cfg.5	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/doc/C/timidity.cfg.5	2007-03-28 05:48:30 UTC (rev 1170)
@@ -95,7 +95,7 @@
 .BI "drumset " "[MapID2] number"
 Selects the drum set to modify.  Patch mappings that follow will
 affect this drum set.  You can indicate specific map as a target, by
-specifing any ofthe following to \fIMapID2\fP: \fBgm2drum\fP,
+specifying any ofthe following to \fIMapID2\fP: \fBgm2drum\fP,
 \fBsc55drum\fP, \fBsc88drum\fP, \fBsc88prodrum\fP, \fBsc8850drum\fP,
 \fBxgdrum\fP and \fBxgsfx126\fP.
 .TP
@@ -470,7 +470,7 @@
 will read from the output of cat fild.mid.
 .SH FILES
 .TP
-.B /etc/timidity.cfg
+.B /etc/timidity/timidity.cfg
 .SH SEE ALSO
 timidity(1), lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1)
 .SH COPYRIGHT

Modified: timidity/trunk/timidity/common.c
===================================================================
--- timidity/trunk/timidity/common.c	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/timidity/common.c	2007-03-28 05:48:30 UTC (rev 1170)
@@ -411,7 +411,8 @@
     }
 
   /* First try the given name */
-  strncpy(current_filename, url_unexpand_home_dir(name), 1023);
+  /* strncpy(current_filename, url_unexpand_home_dir(name), 1023); */
+  strncpy(current_filename, name, 1023);
   current_filename[1023]='\0';
 
   if(noise_mode)

Modified: timidity/trunk/timidity/timidity.c
===================================================================
--- timidity/trunk/timidity/timidity.c	2007-03-28 00:21:09 UTC (rev 1169)
+++ timidity/trunk/timidity/timidity.c	2007-03-28 05:48:30 UTC (rev 1170)
@@ -5639,11 +5639,11 @@
 	    }
 
 	    ctl->cmsg(CMSG_FATAL, VERB_NORMAL,
-		      "%s: Can't read any configuration file.\nPlease check "
+		      "%s: Error reading configuration file.\nPlease check "
 		      "%s or %s", program_name, config1, config2);
 #else
 	    ctl->cmsg(CMSG_FATAL, VERB_NORMAL,
-		      "%s: Can't read any configuration file.\nPlease check "
+		      "%s: Error reading configuration file.\nPlease check "
 		      CONFIG_FILE, program_name);
 #endif /* __W32__ */
 	}


