Update to 0.2.13.4

Changelog is long, but I feel this should be included.

Changelog:
mpg321 (0.2.13-4) unstable; urgency=low

  * Fixed bug when trying to "load file" from a remote instance and
    an error was raised repeatdly until mpg321 process died with
    "too many open files". (Closes: Bug#128676)
  * Added '-3' or '--restart' option that handles non existent or
    corrupted files more elegantly when in remote mode. When option
    is enabled the remote shell does not die and is restarted waiting
    for a new command.
  * Fixed FTBFS for mpg321 by removing debian_changes patch file in
    debian/patches directory. (Closes: Bug#643222).

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Thu, 29 Sep 2011 19:33:24 +0300

mpg321 (0.2.13-3) unstable; urgency=low

   * Fixed the really annoying bug which didn't restore the TTY
     when mpg321 exited.
   * Updated S-V to 3.9.2
   	- debian/copyright file has been revised.
   	- debian/rules file has been revised.
   * Fixed '-a' option to conform with ALSA's uniform device naming. Also
     changed man to conform with this change. Now you can use alsa driver
     by setting the name of the audio device using the hw:x,y syntax,
     where x and y are numbers. For example, if there is only one device
     installed, in most cases, the device should be named hw:0,0.
     When there is only one device, the device should always have the
     same name and numbers. Finally if the default driver which mpg321
     is compiled is ALSA then you don't have to specify it with the '-o'
     option and you can use '-a' only to specify the audio device.
     (Closes: Bug#623941).

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Sun, 24 Jul 2011 15:08:09 +0300

mpg321 (0.2.13-2) unstable; urgency=low

  * Added '-K' option so the user can enable/disable the Basic Keys
    functionality. This also resolves the 100% CPU problem when mpg321
    is run by asterisk for music hold on.
    Thanks to James Bottomley for pointing that out. (Closes: Bug#619773).
  * Added new algorithm when playing files randomly until interrupted. The
    advertised behavior is much better than the previous one.Patch from
    Peter Selinger.Thanks.

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Tue, 05 Apr 2011 23:23:54 +0200

mpg321 (0.2.13-1) unstable; urgency=low

  * Added uClinux support for embedded systems (Blackfin, Atmel and others).
  * Added some Basic Control Keys, Volume Up/Down & Skip, for the moment.
  * Updated S-V to 3.9.1
       - debian/copyright file has been revised.
  * If mmap() fails we fall back to read(). (Closes: Bug#148971).
    (Closes: Bug#196787)
  * Removed built-in getopt function.
  * Problem solved when -x option was invoked and mpg321 couldn't obtain the
    current terminal file. If none is forthcoming (e.g. xterm window ops are
    disabled) then mpg321 does not block.
  * Removed the dependency for the libaudio-scrobbler-perl package from
    debian/control file. (Closes: Bug#588051).
  * Added LDFLAGS += -Wl,-z,defs -Wl,--as-needed in debian/rules file
    to limit the dependencies a bit. Dropped '-c' option from 'install'
    command. Thanks to Sven Hoexter <sven@timegate.de>.

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Sun, 20 Feb 2011 15:35:00 +0300

mpg321 (0.2.12-1) unstable; urgency=high

  * New upstream release.
  * Added AudioScrobbler support.
  * Added FFT analysis support on PCM data for Remote mode play.
  * mpg123 has been relicensed under the LGPL/GPL. Changed man page
    accordingly. (Closes: Bug#533674).
  * mpg321 now exits code 1 after failing to play music. (Closes: Bug#501334).
  * Fixed ID3v2 tag problem which resulted in a splat-sound at the start of
    the file. Patch from Martin Wellard. Thanks.
  * Added support for recursive reading of directories. Patch from Giuseppe
    Scrivano <gscrivano@gnu.org> and Michal Cihar <nijel@debian.org>.
    (Closes: Bug#266887).
  * Updated S-V to 3.9.0
        - debian/copyright file is now UTF-8 encoded.

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Tue, 29 Jun 2010 21:44:36 +0300

mpg321 (0.2.11-3) unstable; urgency=high

  * Now mpg321 displays the right MPEG version. (Closes: Bug#197726).
  * New function added for restoring the correct xterm title.
  * New troubleshooting information added for the resources that mpg321
    uses for xterm control.
  * Bug #182122 should close now because in this version of Debian we don't
    face such problems. So i am closing this bug. (Closes: Bug#182122).
  * Man page now includes the new "-l" option. (Closes: Bug#575836).
    Thanks to Memnon Anon.
  * Tried to reproduce the same experiment as Bug #388587 and
    i don't see any problem.
    If someone else can simulate the same problem, please report the bug
    and the way to simulate it again.So i am closing thsi bug also.
    (Closes: Bug#388587)
  * Anyone who wants to use the "-a" option can follow the information from
    the manpage. To give an example: "mpg321 -a /dev/dsp song.mp3".
    So Bug #286176 should close.The "-a" option seems to work fine.
    (Closes: Bug#286176).
  * Properly added DM-Upload-Allowed: yes to source section of control file.
  * Adjusted watch file properly to eliminate errors of uscan.
  * Bumped debhelper versioned Build-Depends to 7, and updated
    debian/compat.
  * Bumped libao-dev versioned Build-Depends to 1.0.0.
  * Fixed libao-dev problem with the new structure option
    in ao_format_sample structure. In a near future version
    mpg321 will utilise the power of this new libao option.
    (Closes: Bug#580062, Bug#580193)

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Sun, 24 May 2010 12:45:08 +0200

mpg321 (0.2.11-2) unstable; urgency=high

  * Fixed PATH_MAX POSIX constant needed for GNU/Hurd compilation.
  * Fixed compilation errors for MIPS and MIPSEL architectures
    by reporting the libmad bug to the pkg-maintainers.Bug fixed and
    closed. Thanks.
  * Changed to Quilt patch maintenance system.
  * Added xterm title setting option so to enable/disable the feature.
    Also gmusicbrowser doesn't crash anymore.
    (Closes: Bug#566544),(Closes: Bug#567104).
  * mpg321 can stream a URL from 0.2.10.1 version. Bug#166512 should
    have already been closed. (Closes: Bug#166512).
  * mpg321 has already been adopted. (Closes: Bug#533671).

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Sun, 21 Feb 2010 12:51:08 +0200

mpg321 (0.2.11-1) unstable; urgency=low

  * New upstream release.
  * New maintainer (Closes: Bug#471770).
  * Updated S-V to 3.8.3.
  * Added HTTP Proxy support with Basic Authentication mechanism
    from Chrysostomos Nanakos <nanakos@wired-net.gr>.
  * ID3 tags now display on all files when playing a list of files and
    you haven't pressed CTRL-C to switch between them.
  * Make volume scaling work entirely within fixed point. This is the
    way it should have been to begin with.
  * Add patch to support IPv6 from Carlos Jesus Bernandos Cano.
    This is now the default in the Debian packages.
    (Closes: Bug#182480).
  * Fix up maintainer scripts to not quit on unknown arguments.
  * Add GAIN option to remote control mode.
    Patch from Ralf Engels <ralf-engels@gmx.de>.
  * Improve shuffling/randomizing code. Patch from Bas Zoetekouw - thanks!
    (Closes: Bug#153594).
  * Moritz Jodeit <moritz@jodeit.org>:
     * Make http://some.server.name (no trailing slash) work.
     * Fix other networking issues.
     * Fix some format string issues.
  * Change use of random() to rand() because random() on Solaris
    doesn't return up to RAND_MAX, but 2**31.
  * Add patch from Mario <diverses@univecom.ch> to better
    support HTTP and Shoutcast streams.

  * Nanakos Chrysostomos <nanakos@wired-net.gr>:
     * Run autoreconf to update the buildsystem to
       current versions of autotools.
     * [debian/ruls] Use dh_installman instead of dh_installmanpages
     * Add debian/mime and call dh_installmime.
       (Closes: Bug#207871).
     * Use ifneq and not ifeq to set options for INSTALL when
       DEB_BUILD_OPTIONS has nostrip.
       (Closes: Bug#163399).
     * Acknowledge NMU (Thanks Mario Lang).
       (Closes: Bug#186968).
     * Print the current frame number of the current file when playing
       multiple files in verbose mode. Patch from Piotr Sulecki - thanks.
       (Closes: Bug#269118).
     * Patch from Gergely Szasz to fix crash when GAIN is
       set in remote mode without an argument.
     * Add support for winamp playlists.
       (Filter out line with # at the beginning).
       Patch from Manolis Stamatogiannakis.
     * Patch from David G. Andersen to check return value of read and only
       decode the right number of bytes.
     * Fix off-by-one in networking code parsing ftp reply.
     * Add loop option. Patch from Nicolas Bonifas.
       (Closes: Bug#158950).
     * Add output remote mode to distinguish between stopping playback and
       the song finishing. Patch from Nicolas Bonifas.
     * Reinitialise the current playback time when rewinding.
       Another patch from Nicolas Bonifas.
     * Only show the verbose option once in the usage text.
       (Closes: Bug#285959).
     * Add xterm title support.Patch from Chrysostomos Nanakos.

 -- Nanakos Chrysostomos <nanakos@wired-net.gr>  Tue, 11 Jan 2010 19:17:42 +0200

mpg321 (0.2.10.6) unstable; urgency=low

  * QA upload.
  * Don't use update-alternatives --auto in prerm. (Closes: #506892).

 -- Barry deFreese <bdefreese@debian.org>  Wed, 26 Nov 2008 13:10:23 -0500

mpg321 (0.2.10.5) unstable; urgency=low

  * QA upload.
    + Set maintainer to Debian QA Group <packages@qa.debian.org>.
  * Add large file support. (Closes: #152392).
    + Thanks to Clint Adams for the patch.
  * Avoid crashing on non mp3 files. (Closes: #458035).
    + Thanks to Justin Pryzby for the patch.
  * Don't scan file before playback. (Closes: #500102).
    + Thanks to Mikko Rapeli for the patch.
  * Don't leave dangling symlink. (Closes: #227713).
    + Thanks to Donggyoo Lee for the patch.
  * README.remote should use @P not @S. (Closes: #153596).
    + Add STOP comments.
  * Make AM_PATH_AO XIPH_PATH_AO in configure.ac.
  * Escape hyphens in manpage.
  * Bump debhelper build-dep to 5.
  * Move DH_COMPAT to debian/compat and set to 5.
  * Make distclean not ignore errors.
  * Bump Standards Version to 3.8.0.

 -- Barry deFreese <bdefreese@debian.org>  Tue, 11 Nov 2008 14:25:12 -0500

mpg321 (0.2.10.4) unstable; urgency=low

  * NMU
  * Update description: mpg123 is now free. Closes: #390358

 -- Joey Hess <joeyh@debian.org>  Mon, 10 Sep 2007 16:22:35 -0400

mpg321 (0.2.10.3) unstable; urgency=high

  * Non-maintainer upload by the Security Team
  * Fix format string vulnerabilities (CAN-2003-0969)

 -- Matt Zimmerman <mdz@debian.org>  Sun,  4 Jan 2004 11:50:39 -0800

mpg321 (0.2.10.1-1.1) unstable; urgency=low

  * NMU
  * Apply patch to close fd (Closes: Bug#178948)

 -- Mario Lang <mlang@debian.org>  Mon, 31 Mar 2003 10:56:12 +0200

mpg321 (0.2.10.1) unstable; urgency=low

  * Check both for file existing and link existing in fix-mistake code in
    postinst (Closes: Bug#140622)

 -- Joe Drew <drew@debian.org>  Wed,  3 Apr 2002 23:12:22 -0500

4 files changed, 11 insertions, 43 deletions

diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 48c3b74f1c7..5e8e956e012 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/05/19 18:25:19 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2011/10/18 11:13:56 ryoon Exp $
 
-DISTNAME=	mpg321-0.2.10
-PKGREVISION=	8
+DISTNAME=	mpg321-0.2.13-4
+PKGNAME=	mpg321-0.2.13.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpg321/}
 
diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo
index 81425a10c0b..a2c417cde9a 100644
--- a/audio/mpg321/distinfo
+++ b/audio/mpg321/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/05/19 18:25:19 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/10/18 11:13:56 ryoon Exp $
 
-SHA1 (mpg321-0.2.10.tar.gz) = 90268d0d187ddd7625d143b95791cb39a1630b79
-RMD160 (mpg321-0.2.10.tar.gz) = c0867e6ca7c0a5e2ff006e0c3aa866d2fde529ba
-Size (mpg321-0.2.10.tar.gz) = 113449 bytes
-SHA1 (patch-aa) = d91d4af6219517fcb95da37b1a7abc05a3e312b2
-SHA1 (patch-ab) = b409e5feb618bed1a85d17df22e01cebfa62e8b1
+SHA1 (mpg321-0.2.13-4.tar.gz) = 08ca707bbf1ff88d401ff2a3625fb242d445bfd2
+RMD160 (mpg321-0.2.13-4.tar.gz) = 5c1d50de0bae66381702ed3f238bfdc0f7b8f2d2
+Size (mpg321-0.2.13-4.tar.gz) = 144542 bytes
+SHA1 (patch-ab) = 3ec9382e50e03e25522a961aa52c29660a8564f9
diff --git a/audio/mpg321/patches/patch-aa b/audio/mpg321/patches/patch-aa
deleted file mode 100644
index f46788aef38..00000000000
--- a/audio/mpg321/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/08/13 06:31:37 rillig Exp $
-
---- mpg321.c.orig	2002-03-24 06:49:20.000000000 +0100
-+++ mpg321.c	2007-06-15 14:26:24.000000000 +0200
-@@ -188,7 +188,7 @@ static int show_id3(struct id3_tag const
-             
-             else
-             {
--                printf(names[i]);
-+                printf("%s", names[i]);
-                 free(names[i]);
-             }
-         }
-@@ -203,7 +203,7 @@ static int show_id3(struct id3_tag const
-             if (!names[i])  {
-                 fprintf (stderr, emptystring);
-             }   else    {
--                fprintf (stderr, names[i]);
-+                fprintf (stderr, "%s", names[i]);
-                 free (names[i]);
-             }
-             if (i%2) fprintf (stderr, "\n");
-@@ -435,6 +435,8 @@ int main(int argc, char *argv[])
-                 mpg321_error(currentfile);
-                 continue;
-             }
-+
-+	    (void)close(fd);
-             
-             playbuf.frames[0] = playbuf.buf;
-             
diff --git a/audio/mpg321/patches/patch-ab b/audio/mpg321/patches/patch-ab
index eabbf2fa711..251aa1de8ac 100644
--- a/audio/mpg321/patches/patch-ab
+++ b/audio/mpg321/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2010/05/19 18:25:19 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2011/10/18 11:13:56 ryoon Exp $
 
---- ao.c.orig	2010-05-19 15:45:33.000000000 +0000
+--- ao.c.orig	2011-10-01 09:50:12.000000000 +0000
 +++ ao.c
-@@ -229,6 +229,7 @@ void open_ao_playdevice(struct mad_heade
+@@ -234,6 +234,7 @@ void open_ao_playdevice(struct mad_heade
             and restore it afterwards */
          signal(SIGINT, SIG_DFL);