diff -u awesfx-0.5.1a/debian/changelog awesfx-0.5.1a/debian/changelog
--- awesfx-0.5.1a/debian/changelog
+++ awesfx-0.5.1a/debian/changelog
@@ -1,3 +1,16 @@
+awesfx (0.5.1a-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * In setfx.c, rename getline() to getline_local(), to avoid conflicting
+ with the standard C library function, thanks to Stefan Potyra
+ <sistp...@ubuntu.com>. Closes: #550484.
+ * Fix typos in manual pages, thanks to A. Costa <agco...@gis.net>.
+ Closes: #464449, #464450.
+ * Correct spelling and grammar in description. Closes: #273124.
+ * Remove obsolete references to awe-drv and awe-utils.
+
+ -- Ben Hutchings <b...@decadent.org.uk> Sun, 29 Nov 2009 18:53:11 +0000
+
awesfx (0.5.1a-1) unstable; urgency=low
* New upstream release
diff -u awesfx-0.5.1a/debian/gusload.1 awesfx-0.5.1a/debian/gusload.1
--- awesfx-0.5.1a/debian/gusload.1
+++ awesfx-0.5.1a/debian/gusload.1
@@ -16,7 +16,7 @@
.PP
.B gusload
is a program that will read a GUS-format patch file, and then upload it to
-the Linux AWE32 driver, to be used by other AWE32 utilties, e.g. drvmidi(1).
+the Linux AWE32 driver, to be used by other AWE32 utilities, e.g. drvmidi(1).
.SH OPTIONS
The program follows the usual UNIX command line syntax, but doesn't
support long options (options starting with two dashes `-').
@@ -54,3 +54,3 @@
-The AWE32 driver and utilties were written by Takashi Iwai
+The AWE32 driver and utilities were written by Takashi Iwai
<i...@dragon.mm.t.u-tokyo.ac.jp>.
diff -u awesfx-0.5.1a/debian/sfxtest.1 awesfx-0.5.1a/debian/sfxtest.1
--- awesfx-0.5.1a/debian/sfxtest.1
+++ awesfx-0.5.1a/debian/sfxtest.1
@@ -113,3 +113,3 @@
-The AWE32 driver and utilties were written by Takashi Iwai
+The AWE32 driver and utilities were written by Takashi Iwai
<i...@dragon.mm.t.u-tokyo.ac.jp>.
diff -u awesfx-0.5.1a/debian/sf2text.1 awesfx-0.5.1a/debian/sf2text.1
--- awesfx-0.5.1a/debian/sf2text.1
+++ awesfx-0.5.1a/debian/sf2text.1
@@ -75,3 +75,3 @@
-The AWE32 driver and utilties were written by Takashi Iwai
+The AWE32 driver and utilities were written by Takashi Iwai
<i...@dragon.mm.t.u-tokyo.ac.jp>.
diff -u awesfx-0.5.1a/debian/control awesfx-0.5.1a/debian/control
--- awesfx-0.5.1a/debian/control
+++ awesfx-0.5.1a/debian/control
@@ -8,8 +8,6 @@
Package: awesfx
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: awe-utils, awe-drv
-Conflicts: awe-utils, awe-drv
Suggests: aumix
Description: utility programs for AWE32/64 and Emu10k1 driver
This package contains the following programs:
@@ -21,10 +19,6 @@
- - text2sf Revert from text to SoundFont file
+ - text2sf Convert from text to SoundFont file
- gusload GUS PAT file loader
- sfxtest Example program to control AWE driver
.
- The package includes the correction of SoundFont managing routines,
- called AWElib. As default, the AWElib is installed as a static
- library.
- .
- This package replace the old awe-drv and awe-utils package because
- the driver is included in the kernel since a long time.
+ The package includes a collection of SoundFont managing routines
+ called AWElib. By default, AWElib is installed as a static library.
only in patch2:
unchanged:
--- awesfx-0.5.1a.orig/setfx.c
+++ awesfx-0.5.1a/setfx.c
@@ -37,7 +37,7 @@
/*----------------------------------------------------------------*/
static void usage(void);
-static int getline(FILE *fp);
+static int getline_local(FILE *fp);
static int nextline(FILE *fp);
static char *gettok(FILE *fp);
static char *divtok(char *src, char *divs, int only_one);
@@ -126,7 +126,7 @@
}
curline = 0;
- if (!getline(fp))
+ if (!getline_local(fp))
return 0;
seq_init(seq_devname, seq_devidx);
@@ -370,7 +370,7 @@
* read a line and parse tokens
*----------------------------------------------------------------*/
-static int getline(FILE *fp)
+static int getline_local(FILE *fp)
{
char *p;
curline++;
@@ -393,12 +393,12 @@
{
if (connected) {
do {
- if (! getline(fp))
+ if (! getline_local(fp))
return FALSE;
} while (connected);
return TRUE;
} else {
- return getline(fp);
+ return getline_local(fp);
}
}
@@ -415,7 +415,7 @@
tok = divtok(NULL, " \t\r\n", FALSE);
while (tok == NULL || *tok == 0) {
if (! connected) return NULL;
- if (! getline(fp)) return NULL;
+ if (! getline_local(fp)) return NULL;
tok = divtok(line, " \t\r\n", FALSE);
}
return tok;
only in patch2:
unchanged:
--- awesfx-0.5.1a.orig/sfxload.1
+++ awesfx-0.5.1a/sfxload.1
@@ -20,7 +20,7 @@
This program is necessary for playing MIDI samples via sequencer
programs supporting AWE driver. There is no big difference between
\fBsfxload\fP and \fBasfxload\fP except for that \fBasfxload\fP is for
-ALSA and \fBsfxload\fP is for OSS, respecitvely. The options to specify
+ALSA and \fBsfxload\fP is for OSS, respectively. The options to specify
devices are
different between them (see below).
@@ -70,7 +70,7 @@
or \fBfalse\fP can be specified as an optional argument.
.TP
.BI \-x,\ \-\-remove "\fR[=\fPbool\fR]\fP"
-Remove the optional samples previouly loaded via \fB\-b\fP option.
+Remove the optional samples previously loaded via \fB\-b\fP option.
Otherwise, all new samples are simply appended.
.TP
.BI \-N,\ \-\-increment "\fR[=\fPbool\fR]\fP"
@@ -161,7 +161,7 @@
Increase or set the verbosity level.
.TP
.BI \-q,\ \-\-quiet
-Don't show error messages, equivalen with \-\-verbose=0.
+Don't show error messages, equivalent with \-\-verbose=0.
.TP
.BI \-V,\ \-\-volume= percent
Specify the total volume of sounds, provided in percent.
@@ -275,7 +275,7 @@
.SH COPYRIGHT
Copyright (C) 1996-2003 Takashi Iwai.
.P
-The AWE32 driver and utilties are free software; you can redistribute them
+The AWE32 driver and utilities are free software; you can redistribute them
and/or modify them under the terms of the \fIGNU General Public
License\fP as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
--- END ----- Ben Hutchings Quantity is no substitute for quality, but it's the only one we've got.
signature.asc
Description: Digital signature
