diff -Nru lame-3.98.2+debian/debian/changelog lame-3.98.2/debian/changelog
--- lame-3.98.2+debian/debian/changelog	2010-08-17 18:42:26.000000000 -0500
+++ lame-3.98.2/debian/changelog	2010-08-17 19:49:39.000000000 -0500
@@ -1,65 +1,175 @@
-lame (3.98.2+debian-0ubuntu3) lenny; urgency=low
+lame (3.98.2-0.4) lenny; urgency=low
 
-  [ Fabian Greffrath ]
-  * Prefer my d-u.o address for "official" packages.
-  * Ported from debhelper (>= 7.2) to cdbs.
-  * Remove redundant DEB_DH_INSTALL_SOURCEDIR.
-
-  [ Reinhard Tartler ]
-  * update debian/changelog
-
-  [ Fabian Greffrath ]
-  * Revert "update config.guess and config.sub with more recent
-    versions"
-  * debian/copyright: Vastly improved.
-  * cosmetic cleanup
-  * Bumped Standards-Version to 3.8.2.
-  * Update debian/copyright.
-  * Really update debian/changelog.
-
-  [ Reinhard Tartler ]
-  * patches taken from the marillat package:
-    - fix the ffmpeg 'buffer too small' bug. LP: #401406
-    - disable executable stack
-    - buggy optimization for single-precision floats when 
-      -ffinite-math-only
-  * reconvert to dh7
-
- -- Reinhard Tartler <siretart@tauware.de>  Thu, 22 Oct 2009 22:35:30 +0200
-
-lame (3.98.2+debian-0ubuntu1) karmic; urgency=low
-
-  * New upstream version
-  * Import the package prepared by Fabian Greffrath in the pkg-multimedia
-    repository.
-  * This replaces the former marillat packaging completely.
-  * target karmic.
-
- -- Reinhard Tartler <siretart@tauware.de>  Tue, 09 Jun 2009 22:14:50 +0200
-
-lame (3.98.2+debian-1) unstable; urgency=low
-
-  [ Fabian Greffrath ]
-  * Prefer my d-u.o address for "official" packages.
-  * Ported from debhelper (>= 7.2) to cdbs.
-  * Remove redundant DEB_DH_INSTALL_SOURCEDIR.
-
-  [ Reinhard Tartler ]
-  * New upstream version
-  * Import the package prepared by Fabian Greffrath in the pkg-multimedia
-    repository.
-  * This replaces the former marillat packaging completely.
-  * update config.guess and config.sub with more recent versions
-  * update maintainer field
-  * prefer multiline fields in debian/control
-  * fix typo in description of libmp3lame-dev
-
- -- Reinhard Tartler <siretart@tauware.de>  Thu, 25 Jun 2009 09:55:01 +0200
-
-lame (3.98.2+debian-0fab1) unstable; urgency=low
-
-  * Initial release.
-  * Rebuilt upstream tarball without debian/ directory.
-  * Linked frontend against shared libraries.
+  * Added a patch from Martin Guy to fix a silent output file on armel arch.
 
- -- Fabian Greffrath <fabian@greffrath.com>  Mon, 01 Jun 2009 00:00:00 +0200
+ -- Christian Marillat <marillat@debian.org>  Fri, 20 Mar 2009 09:30:45 +0100
+
+lame (3.98.2-0.3) unstable; urgency=low
+
+  * New patch from Russell Coker to disable executable stack.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 12 Jan 2009 15:21:07 +0100
+
+lame (3.98.2-0.2) unstable; urgency=high
+
+  * Another step backward. --with-fileio=sndfile doesn't work with
+   --mp3input, so remove this build option. A quick test :
+     cat bitrate_256.mp3 | lame  --mp3input -q 3 -b 128 - - > bitrate_128.mp3
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 05 Jan 2009 12:17:43 +0100
+
+lame (3.98.2-0.1) unstable; urgency=low
+
+  * Build without --with-fileio=lame and add libsndfile-dev in
+    Build-Depends. stdin is working with a simple test like :
+    'cat file.wav | lame - > file.mp3'
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 21 Dec 2008 10:33:26 +0100
+
+lame (3.98.2-0.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 28 Oct 2008 18:15:34 +0100
+
+lame (3.98-0.1) unstable; urgency=low
+
+  * Build with --with-fileio=lame otherwise stdin a file doesn't work.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 07 Sep 2008 09:38:11 +0200
+
+lame (3.98-0.0) unstable; urgency=low
+
+  * New upstream release.
+  * Remove libgtk1.2-dev from Build-depends
+  * Build with --disable-mp3rtp (Doesn't build) so the lame-extras package
+    is gone.
+  * Rename package to libmp3lame (was liblame).
+  * Use libsndfile for input files.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 06 Jul 2008 14:21:35 +0200
+
+lame (3.97-0.3) unstable; urgency=low
+
+  * Forgot to add ccache in Build-Depends.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 13 Apr 2008 08:41:17 +0200
+
+lame (3.97-0.2) unstable; urgency=low
+
+  * Use gcc-4.2 because 4.3 does an ICE under armel.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 12 Apr 2008 21:28:25 +0200
+
+lame (3.97-0.1) unstable; urgency=low
+
+  * Added Homepage field.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 09 Apr 2008 13:49:53 +0200
+
+lame (3.97-0.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 28 Sep 2006 10:15:05 +0200
+
+lame (3.96.1-2) unstable; urgency=low
+
+  * Fix typo in lame-extras description.
+  * Rebuild for amd64.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 13 May 2006 10:32:51 +0200
+
+lame (3.96.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  6 Sep 2004 09:39:01 +0200
+
+lame (3.96-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 29 Apr 2004 10:49:11 +0200
+
+lame (3.95.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  2 Mar 2004 02:35:12 +0100
+
+lame (3.93.1-0.2) unstable; urgency=low
+
+  * debian/rules Fix build problem if arch is not i386
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  4 Sep 2003 15:49:56 +0200
+
+lame (3.93.1-0.1) unstable; urgency=low
+
+  * Remove rpath lintian warning
+  * Add missing library for prelinking
+  * Add missing documentations in lame package and improve description for
+    liblame0 (Thanks to Hilmar Preusse)
+  * Add entry for dhelp
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 18 Jul 2003 17:48:46 +0200
+
+lame (3.93.1-0.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 10 Dec 2002 13:25:04 +0100
+
+lame (3.93-0.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 23 Nov 2002 13:09:43 +0100
+
+lame (3.92-0.0) unstable; urgency=low
+
+  * New upstream release.
+  * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and
+    DEB_BUILD_OPTIONS
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 12 Jun 2002 09:27:40 +0200
+
+lame (3.91-0.1) unstable; urgency=low
+
+  * remove the broken upstream debian directory.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 27 Jan 2002 05:16:07 +0100
+
+lame (3.91-0.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  5 Jan 2002 10:28:26 +0100
+
+lame (3.89-0.1) unstable; urgency=low
+
+  * Install libmp3lame.so in non dev package
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  9 Nov 2001 14:46:38 +0100
+
+lame (3.89-0.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 26 Jul 2001 02:55:03 +0200
+
+lame (3.88-0) unstable; urgency=low
+
+  * Updated debian/ directory to use configure.
+
+ -- Ingo Saitz <Ingo.Saitz@stud.uni-hannover.de>  Mon, 11 Dec 2000 08:43:26 +0100
+
+lame (3.86-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Stefan Karrmann <S.Karrmann@gmx.net>  Thu, 31 Aug 2000 22:15:07 +0200
+
+Local variables:
+mode: debian-changelog
+End:
diff -Nru lame-3.98.2+debian/debian/clean lame-3.98.2/debian/clean
--- lame-3.98.2+debian/debian/clean	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/clean	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-config.sub
-config.guess
diff -Nru lame-3.98.2+debian/debian/control lame-3.98.2/debian/control
--- lame-3.98.2+debian/debian/control	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/control	2010-08-17 19:49:30.000000000 -0500
@@ -1,77 +1,49 @@
 Source: lame
 Section: sound
 Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
-Uploaders: Fabian Greffrath <fabian@debian-unofficial.org>,
-           Reinhard Tartler <siretart@tauware.de>
-Build-Depends: autotools-dev,
-               debhelper (>= 7),
-               libncurses5-dev,
-               nasm [i386],
-               quilt
-Standards-Version: 3.8.2
+Maintainer: Christian Marillat <marillat@debian.org>
+Bugs: mailto:marillat@debian.org
 Homepage: http://lame.sourceforge.net/
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/lame.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/lame.git;a=shortlog;h=refs/heads/karmic
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>> 7), libncurses5-dev, nasm [i386], ccache,
+ autotools-dev, quilt
 
 Package: lame
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: An MP3 encoding library (frontend)
- LAME (LAME Ain't an MP3 Encoder) is a research project for learning about and
- improving MP3 encoding technology. LAME includes an MP3 encoding library, a
- simple frontend application, and other tools for sound analysis, as well as
- convenience tools.
+Depends: ${shlibs:Depends}
+Description: LAME Ain't an MP3 Encoder
+ Lame is a program which can be used to create compressed audio files. (Lame
+ aint MP3 encoder). These audio files can be played back by popular mp3
+ players such as mpg123. To read from stdin, use "-" for <infile>. To write
+ to stdout, use a "-" for <outfile>.
  .
- Please note that any commercial use (including distributing the LAME encoding
- engine in a free encoder) may require a patent license from Thomson Multimedia.
- .
- This package contains the frontend.
-
-Package: lame-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: An MP3 encoding library (documentation)
- LAME (LAME Ain't an MP3 Encoder) is a research project for learning about and
- improving MP3 encoding technology. LAME includes an MP3 encoding library, a
- simple frontend application, and other tools for sound analysis, as well as
- convenience tools.
- .
- Please note that any commercial use (including distributing the LAME encoding
- engine in a free encoder) may require a patent license from Thomson Multimedia.
- .
- This package contains the documentation.
-
-Package: libmp3lame0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: An MP3 encoding library
- LAME (LAME Ain't an MP3 Encoder) is a research project for learning about and
- improving MP3 encoding technology. LAME includes an MP3 encoding library, a
- simple frontend application, and other tools for sound analysis, as well as
- convenience tools.
- .
- Please note that any commercial use (including distributing the LAME encoding
- engine in a free encoder) may require a patent license from Thomson Multimedia.
- .
- This package contains the shared library.
+ This package contains the frontend encoder binary.
 
 Package: libmp3lame-dev
-Section: libdevel
 Architecture: any
-Depends: libmp3lame0 (= ${binary:Version}),
-         ${misc:Depends}
-Description: An MP3 encoding library (development)
- LAME (LAME Ain't an MP3 Encoder) is a research project for learning about and
- improving MP3 encoding technology. LAME includes an MP3 encoding library, a
- simple frontend application, and other tools for sound analysis, as well as
- convenience tools.
+Section: libdevel
+Depends: libmp3lame0 (= ${binary:Version})
+Conflicts: liblame-dev
+Replaces: liblame-dev
+Description: LAME Ain't an MP3 Encoder
+ Lame is a program which can be used to create compressed audio files. (Lame
+ aint MP3 encoder). These audio files can be played back by popular mp3
+ players such as mpg123. To read from stdin, use "-" for <infile>. To write
+ to stdout, use a "-" for <outfile>.
  .
- Please note that any commercial use (including distributing the LAME encoding
- engine in a free encoder) may require a patent license from Thomson Multimedia.
+ This package contains the static library and header files.
+ 
+Package: libmp3lame0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libmp3lame-dev (<= 3.92-0.0), liblame0
+Conflicts: liblame0
+Description: LAME Ain't an MP3 Encoder
+ Lame is a program which can be used to create compressed audio files. (Lame
+ aint MP3 encoder). These audio files can be played back by popular mp3
+ players such as mpg123. To read from stdin, use "-" for <infile>. To write
+ to stdout, use a "-" for <outfile>.
  .
- This package contains the development files.
+ This package contains the dynamic libraries, which provides the encoding
+ functionality of lame.
diff -Nru lame-3.98.2+debian/debian/copyright lame-3.98.2/debian/copyright
--- lame-3.98.2+debian/debian/copyright	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/copyright	2010-08-17 19:49:30.000000000 -0500
@@ -1,205 +1,25 @@
-Authors: Mike Cheng <http://www.uq.net.au/~zzmcheng>
-         Mark Taylor <http://www.mp3dev.org/>
-Download: http://lame.sourceforge.net/
-
-Files: *
-Copyright: © 1998, Michael Cheng
-           © 1999-2001, Mark Taylor
-           © 1999-2002, Albert L. Faber
-           © 1999-2005, Takehiro Tominaga
-           © 1999-2007, The LAME Project
-           © 2000-2005, Alexander Leidinger
-           © 2000-2005, Elecard Ltd.
-           © 2000-2005, Gabriel Bouvigne
-           © 2000-2005, Marie Orlova
-           © 2000-2005, Peter Gubanov
-           © 2000-2005, Vitaly Ivanov
-           © 2000-2008, Gabriel Bouvigne
-           © 2000-2008, Robert Hegemann
-           © 2000, Don Melton
-           © 2001-2002, Naoki Shibata
-           © 2001, John Dahlstrom
-           © 2001, Jonathan Dee
-           © 2003, Olcios
-License: LGPL-2+ | other
- This code is distributed under the GNU LESSER PUBLIC LICENSE
- (LGPL, see www.gnu.org) with the following modification:
- .
- 1. If you determine that distribution of LAME requires a patent license,
-    and you obtain a patent license, you may distribute LAME even though
-    redistribution of LAME may also require a patent license.
- .
- 2. You agree not to enforce any patent claims for any aspect of
-    MPEG audio compression, or any other techniques contained in
-    the LAME source code.
-
-Files: ACM/*,
-       libmp3lame/gain_analysis.{c,h}
-Copyright: © 2001, David Robinson
-           © 2001, Glen Sawyer
-           © 2002, Steve Lhomme <steve.lhomme at free.fr>
-           © 2003, Gabriel Bouvigne
-           © 2003, Milan Cutka
-License: LGPL-2.1+
-
-Files: ACM/tinyxml/*
-Copyright: © 2000-2002, Lee Thomason (www.grinninglizard.com)
-License: zlib/libpng
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any
- damages arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any
- purpose, including commercial applications, and to alter it and
- redistribute it freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product documentation
- would be appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and
- must not be misrepresented as being the original software.
- .
- 3. This notice may not be removed or altered from any source
- distribution.
-
-Files: ACM/ADbg/*
-Copyright: © 2001, Steve Lhomme
-License: BSD (3 clause)
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- - Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- - The name of the author may not be used to endorse or promote products derived
- from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-
-Files: frontend/portableio.{c,h}
-Copyright: © 1988-1991, Apple Computer, Inc
-License: other
- Warranty Information
- Even though Apple has reviewed this software, Apple makes no warranty
- or representation, either express or implied, with respect to this
- software, its quality, accuracy, merchantability, or fitness for a
- particular purpose.  As a result, this software is provided "as is,"
- and you, its user, are assuming the entire risk as to its quality
- and accuracy.
- .
- This code may be used and freely distributed as long as it includes
- this copyright notice and the warranty information.
-
-Files: libmp3lame/i386/nasm.h
-Copyright: © 1999, URURI
-License: n/a
-
-Files: libmp3lame/fft.c
-Copyright: © 1988-1993, Ron Mayer
-           © 1999-2000, Takehiro Tominaga
-License: GPL-2 | other
- NOTE: This routine uses at least 2 patented algorithms, and may be
-       under the restrictions of a bunch of different organizations.
-       Although I wrote it completely myself; it is kind of a derivative
-       of a routine I once authored and released under the GPL, so it
-       may fall under the free software foundation's restrictions;
-       it was worked on as a Stanford Univ project, so they claim
-       some rights to it; it was further optimized at work here, so
-       I think this company claims parts of it.  The patents are
-       held by R. Bracewell (the FHT algorithm) and O. Buneman (the
-       trig generator), both at Stanford Univ.
-       If it were up to me, I'd say go do whatever you want with it;
-       but it would be polite to give credit to the following people
-       if you use this anywhere:
-           Euler     - probable inventor of the fourier transform.
-           Gauss     - probable inventor of the FFT.
-           Hartley   - probable inventor of the hartley transform.
-           Buneman   - for a really cool trig generator
-           Mayer(me) - for authoring this particular version and
-                       including all the optimizations in one package.
-       Thanks,
-       Ron Mayer; mayer@acuson.com
- and added some optimization by
-           Mather    - idea of using lookup table
-           Takehiro  - some dirty hack for speed up
-
-Files: mpglib/*
-Copyright: © 1995-1997, Michael Hipp
-           © 2000, Albert L. Faber
-License: GPL-2+
-
-Files: debian/*
-Copyright: © 2005-2009, Fabian Greffrath <fabian@greffrath.com>
-License: GAP
- Copying and distribution of the Debian packaging, with or without modification,
- are permitted in any medium without royalty provided the copyright
- notice and this notice are preserved.
-
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+This package was debianized by Stefan Karrmann <S.Karrmann@gmx.net> on
+Thu, 31 Aug 2000 22:15:07 +0200.
+
+It was downloaded from CVS archive at sourceforge.net.
+
+Upstream Authors: see the file /usr/share/doc/*lame*/html/contributors.html
+
+© 1999-2008
+
+    LAME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    LAME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth  Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU Library
+General Public License can be found in `/usr/share/common-licenses/LGPL'.
diff -Nru lame-3.98.2+debian/debian/doc-base lame-3.98.2/debian/doc-base
--- lame-3.98.2+debian/debian/doc-base	1969-12-31 18:00:00.000000000 -0600
+++ lame-3.98.2/debian/doc-base	2010-08-17 19:49:30.000000000 -0500
@@ -0,0 +1,11 @@
+Document: lame
+Title: Lame Ain't an MP3 Encoder
+Author: Unknow
+Abstract: There is a lot of confusion surrounding the terms audio
+ compression, audio encoding, and audio decoding. This section will give you
+ an overview what audio coding (another one of these terms...) is all about.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/lame/html/index.html
+Files: /usr/share/doc/lame/html/*.html
diff -Nru lame-3.98.2+debian/debian/gbp.conf lame-3.98.2/debian/gbp.conf
--- lame-3.98.2+debian/debian/gbp.conf	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/gbp.conf	1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-[DEFAULT]
-upstream-branch = upstream
-debian-branch = karmic
-upstream-tag = upstream/%(version)s
-debian-tag = debian/%(version)s
-pristine-tar = True
diff -Nru lame-3.98.2+debian/debian/lame-doc.doc-base lame-3.98.2/debian/lame-doc.doc-base
--- lame-3.98.2+debian/debian/lame-doc.doc-base	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/lame-doc.doc-base	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-Document: lame-doc
-Title: LAME documentation
-Author: The LAME Project
-Section: Sound
-
-Format: HTML
-Index: /usr/share/doc/lame-doc/html/index.html
-Files: /usr/share/doc/lame-doc/html/*.html
diff -Nru lame-3.98.2+debian/debian/lame-doc.install lame-3.98.2/debian/lame-doc.install
--- lame-3.98.2+debian/debian/lame-doc.install	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/lame-doc.install	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-usr/share/doc/lame/* usr/share/doc/lame-doc
diff -Nru lame-3.98.2+debian/debian/lame.install lame-3.98.2/debian/lame.install
--- lame-3.98.2+debian/debian/lame.install	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/lame.install	2010-08-17 19:49:30.000000000 -0500
@@ -1,2 +1,3 @@
-usr/bin
-usr/share/man
+debian/tmp/usr/bin/lame
+debian/tmp/usr/share/doc/lame/html
+debian/tmp/usr/share/man/man1/lame.1
diff -Nru lame-3.98.2+debian/debian/libmp3lame0.install lame-3.98.2/debian/libmp3lame0.install
--- lame-3.98.2+debian/debian/libmp3lame0.install	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/libmp3lame0.install	2010-08-17 19:49:30.000000000 -0500
@@ -1 +1,2 @@
-usr/lib/*.so.*
+debian/tmp/usr/lib/libmp3lame.so.*
+
diff -Nru lame-3.98.2+debian/debian/libmp3lame-dev.docs lame-3.98.2/debian/libmp3lame-dev.docs
--- lame-3.98.2+debian/debian/libmp3lame-dev.docs	1969-12-31 18:00:00.000000000 -0600
+++ lame-3.98.2/debian/libmp3lame-dev.docs	2010-08-17 19:49:30.000000000 -0500
@@ -0,0 +1,4 @@
+API
+README
+STYLEGUIDE
+HACKING
diff -Nru lame-3.98.2+debian/debian/libmp3lame-dev.install lame-3.98.2/debian/libmp3lame-dev.install
--- lame-3.98.2+debian/debian/libmp3lame-dev.install	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/libmp3lame-dev.install	2010-08-17 19:49:30.000000000 -0500
@@ -1,4 +1,3 @@
-usr/include
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/*.la
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.{a,la}
+debian/tmp/usr/lib/libmp3lame.so
diff -Nru lame-3.98.2+debian/debian/libmp3lame-dev.preinst lame-3.98.2/debian/libmp3lame-dev.preinst
--- lame-3.98.2+debian/debian/libmp3lame-dev.preinst	1969-12-31 18:00:00.000000000 -0600
+++ lame-3.98.2/debian/libmp3lame-dev.preinst	2010-08-17 19:49:30.000000000 -0500
@@ -0,0 +1,9 @@
+#! /bin/sh -e
+
+if [ -d /usr/share/doc/liblame-dev ]; then
+ rm -rf /usr/share/doc/liblame-dev
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru lame-3.98.2+debian/debian/Makefile.am lame-3.98.2/debian/Makefile.am
--- lame-3.98.2+debian/debian/Makefile.am	1969-12-31 18:00:00.000000000 -0600
+++ lame-3.98.2/debian/Makefile.am	2010-08-17 19:49:30.000000000 -0500
@@ -0,0 +1,14 @@
+## $Id: Makefile.am,v 1.3 2002/04/15 06:57:56 markt Exp $
+
+include $(top_srcdir)/Makefile.am.global
+
+EXTRA_DIST = \
+	changelog \
+	control \
+	copyright \
+	liblame0-dev.docs \
+	liblame0-dev.files \
+	liblame0.files \
+	lame.docs \
+	lame.files \
+	rules
diff -Nru lame-3.98.2+debian/debian/Makefile.in lame-3.98.2/debian/Makefile.in
--- lame-3.98.2+debian/debian/Makefile.in	1969-12-31 18:00:00.000000000 -0600
+++ lame-3.98.2/debian/Makefile.in	2010-08-17 19:49:30.000000000 -0500
@@ -0,0 +1,247 @@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+# global section for every Makefile.am
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AMTAR = @AMTAR@
+AS = @AS@
+AWK = @AWK@
+CC = @CC@
+CONFIG_DEFS = @CONFIG_DEFS@
+CPP = @CPP@
+CPUTYPE = @CPUTYPE@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+EXEEXT = @EXEEXT@
+FRONTEND_CFLAGS = @FRONTEND_CFLAGS@
+FRONTEND_LDADD = @FRONTEND_LDADD@
+FRONTEND_LDFLAGS = @FRONTEND_LDFLAGS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CONFIG = @GTK_CONFIG@
+GTK_LIBS = @GTK_LIBS@
+INCLUDES = @INCLUDES@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDADD = @LDADD@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
+LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
+LN_S = @LN_S@
+MAINT = @MAINT@
+MAKEDEP = @MAKEDEP@
+NASM = @NASM@
+NASM_FORMAT = @NASM_FORMAT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+RM_F = @RM_F@
+U = @U@
+VERSION = @VERSION@
+WITH_FRONTEND = @WITH_FRONTEND@
+WITH_MP3RTP = @WITH_MP3RTP@
+WITH_MP3X = @WITH_MP3X@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+
+AUTOMAKE_OPTIONS = 1.5 foreign $(top_srcdir)/ansi2knr
+
+EXTRA_DIST = \
+	changelog \
+	control \
+	copyright \
+	liblame0-dev.docs \
+	liblame0-dev.files \
+	liblame0.files \
+	lame.docs \
+	lame.files \
+	rules
+
+subdir = debian
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.global $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  debian/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+# end global section
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru lame-3.98.2+debian/debian/patches/01-debian-directory.patch lame-3.98.2/debian/patches/01-debian-directory.patch
--- lame-3.98.2+debian/debian/patches/01-debian-directory.patch	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/patches/01-debian-directory.patch	1969-12-31 18:00:00.000000000 -0600
@@ -1,53 +0,0 @@
-Rebuilt upstream tarball without debian/ directory.
-
---- lame.orig/Makefile.am
-+++ lame/Makefile.am
-@@ -4,7 +4,7 @@
- 
- .PHONY: test
- 
--SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
-+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM \
- 	mac macosx
- 
- CLEANFILES = testcase.new.mp3
---- lame.orig/configure
-+++ lame/configure
-@@ -30627,7 +30627,7 @@
- 
- 
- 
--ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile"
-+ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile"
- 
- 
- cat >confcache <<\_ACEOF
-@@ -31277,7 +31277,6 @@
-     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-     "Dll/Makefile") CONFIG_FILES="$CONFIG_FILES Dll/Makefile" ;;
-     "misc/Makefile") CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
--    "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
-     "dshow/Makefile") CONFIG_FILES="$CONFIG_FILES dshow/Makefile" ;;
-     "ACM/Makefile") CONFIG_FILES="$CONFIG_FILES ACM/Makefile" ;;
-     "ACM/ADbg/Makefile") CONFIG_FILES="$CONFIG_FILES ACM/ADbg/Makefile" ;;
---- lame.orig/configure.in
-+++ lame/configure.in
-@@ -1172,6 +1172,6 @@
- 
- AC_SUBST(CONFIG_DEFS)
- 
--AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile])
-+AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile])
- 
- AC_OUTPUT
---- lame.orig/Makefile.in
-+++ lame/Makefile.in
-@@ -209,7 +209,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.9 foreign $(top_srcdir)/ansi2knr
--SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
-+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM \
- 	mac macosx
- 
- CLEANFILES = testcase.new.mp3
diff -Nru lame-3.98.2+debian/debian/patches/01_exec-stack.diff lame-3.98.2/debian/patches/01_exec-stack.diff
--- lame-3.98.2+debian/debian/patches/01_exec-stack.diff	1969-12-31 18:00:00.000000000 -0600
+++ lame-3.98.2/debian/patches/01_exec-stack.diff	2010-08-17 19:49:30.000000000 -0500
@@ -0,0 +1,13 @@
+Index: lame-3.98.2/libmp3lame/i386/nasm.h
+===================================================================
+--- lame-3.98.2.orig/libmp3lame/i386/nasm.h	2009-01-12 15:20:14.000000000 +0100
++++ lame-3.98.2/libmp3lame/i386/nasm.h	2009-01-12 15:20:32.000000000 +0100
+@@ -18,6 +18,8 @@
+ 
+ BITS 32
+ 
++section .note.GNU-stack noalloc noexec nowrite progbits
++
+ %ifdef YASM
+ 	%define segment_code segment .text align=16 use32
+ 	%define segment_data segment .data align=16 use32
diff -Nru lame-3.98.2+debian/debian/patches/02_armel-no-finite-math-only.diff lame-3.98.2/debian/patches/02_armel-no-finite-math-only.diff
--- lame-3.98.2+debian/debian/patches/02_armel-no-finite-math-only.diff	1969-12-31 18:00:00.000000000 -0600
+++ lame-3.98.2/debian/patches/02_armel-no-finite-math-only.diff	2010-08-17 19:49:30.000000000 -0500
@@ -0,0 +1,44 @@
+A bug present in gcc-4.[123] up to 4.3.3 makes a buggy optimization for
+single-precision floats when -ffinite-math-only (enabled by -ffast-math)
+
+Symptom: lame -V0 produces silent output files.
+Refs:
+https://sourceforge.net/tracker/index.php?func=detail&aid=2681646&group_id=290&atid=100290
+https://trac.xiph.org/ticket/1526
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39501
+
+	Martin Guy <martinwguy@yahoo.it> 19 March 2009
+
+--- lame-3.98.2/configure.old	2008-06-29 22:40:05.000000000 +0100
++++ lame-3.98.2/configure	2009-03-19 19:00:42.000000000 +0000
+@@ -30189,6 +30189,15 @@
+ 		CFLAGS="-Wall ${CFLAGS}"
+ 	fi
+ 
++	# Work round buggy softfloat optimization in ARM EABI compilers
++	# -gnueabi in only gcc-4.1 onwards
++	FAST_MATH="-ffast-math"
++	case "${host}" in
++	arm*-gnueabi)
++		FAST_MATH="-ffast-math -fno-finite-math-only"
++		;;
++	esac
++
+ 	# GCC version specific generic options
+ 	case "${GCC_version}" in
+ 	2.96*)
+@@ -30217,12 +30226,12 @@
+ 			;;
+ 		esac
+ 
+-		OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} -ffast-math"
++		OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} ${FAST_MATH}"
+ 		OPTIMIZATION_FULL="-fmove-all-movables -freduce-all-givs \
+ 			-fbranch-count-reg -fforce-addr -fforce-mem"
+ 		;;
+ 	4.*)
+-		OPTIMIZATION="-O3 -fomit-frame-pointer -ffast-math"
++		OPTIMIZATION="-O3 -fomit-frame-pointer ${FAST_MATH}"
+ 		OPTIMIZATION_FULL="-fbranch-count-reg -fforce-addr"
+ 		;;
+ 	*)
diff -Nru lame-3.98.2+debian/debian/patches/02-dynamic-frontends.patch lame-3.98.2/debian/patches/02-dynamic-frontends.patch
--- lame-3.98.2+debian/debian/patches/02-dynamic-frontends.patch	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/patches/02-dynamic-frontends.patch	1969-12-31 18:00:00.000000000 -0600
@@ -1,24 +0,0 @@
-Link the frontends against shared libraries.
-
---- lame.orig/frontend/Makefile.am
-+++ lame/frontend/Makefile.am
-@@ -52,7 +52,7 @@
- endif
- 
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- 
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
- 
---- lame.orig/frontend/Makefile.in
-+++ lame/frontend/Makefile.in
-@@ -152,7 +152,7 @@
- 	$(top_builddir)/libmp3lame/libmp3lame.la \
- 	@FRONTEND_LDADD@
- 
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff -Nru lame-3.98.2+debian/debian/patches/03-buffer-too-small.patch lame-3.98.2/debian/patches/03-buffer-too-small.patch
--- lame-3.98.2+debian/debian/patches/03-buffer-too-small.patch	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/patches/03-buffer-too-small.patch	1969-12-31 18:00:00.000000000 -0600
@@ -1,80 +0,0 @@
-From: Martin Storsjö <email@unknown>
-Subject: fix the ffmpeg 'buffer too small' bug.
-
-Found in the marillat lame package.
-
-
-diff --git a/libmp3lame/lame.c b/libmp3lame/lame.c
-index 5f93307..b1c89f1 100644
---- a/libmp3lame/lame.c
-+++ b/libmp3lame/lame.c
-@@ -1602,6 +1602,13 @@ lame_encode_buffer_sample_t(lame_global_flags * gfp,
-         /* update mfbuf[] counters */
-         gfc->mf_size += n_out;
-         assert(gfc->mf_size <= MFSIZE);
-+
-+        /* lame_encode_flush may have set gfc->mf_sample_to_encode to 0
-+         * so we have to reinitialize it here when that happened.
-+         */
-+        if (gfc->mf_samples_to_encode < 1) {
-+            gfc->mf_samples_to_encode = ENCDELAY + POSTDELAY;
-+        }
-         gfc->mf_samples_to_encode += n_out;
- 
- 
-@@ -1931,6 +1938,10 @@ lame_encode_flush(lame_global_flags * gfp, unsigned char *mp3buffer, int mp3buff
-     int     frames_left;
-     int     samples_to_encode = gfc->mf_samples_to_encode;
- 
-+    /* Was flush already called? */
-+    if (gfc->mf_samples_to_encode < 1) {
-+        return 0;
-+    }
-     memset(buffer, 0, sizeof(buffer));
-     mp3count = 0;
-     
-@@ -1942,7 +1953,9 @@ lame_encode_flush(lame_global_flags * gfp, unsigned char *mp3buffer, int mp3buff
-     end_padding += pad_out_samples;
- 
-     frames_left = (samples_to_encode + pad_out_samples) / gfp->framesize;
--    while (frames_left > 0) {
-+
-+    /* send in a frame of 0 padding until all internal sample buffers are flushed */
-+    while (frames_left > 0 && imp3 >= 0) {
-         int frame_num = gfp->frameNum;
- 
-         mp3buffer_size_remaining = mp3buffer_size - mp3count;
-@@ -1951,22 +1964,23 @@ lame_encode_flush(lame_global_flags * gfp, unsigned char *mp3buffer, int mp3buff
-         if (mp3buffer_size == 0)
-             mp3buffer_size_remaining = 0;
- 
--        /* send in a frame of 0 padding until all internal sample buffers
--         * are flushed
--         */
-         imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32,
-                                   mp3buffer, mp3buffer_size_remaining);
-         
--        if (frame_num != gfp->frameNum) {
--            --frames_left;
--        }
--        if (imp3 < 0) {
--            /* some type of fatal error */
--            return imp3;
--        }
-         mp3buffer += imp3;
-         mp3count += imp3;
-+        frames_left -= (frame_num != gfp->frameNum) ? 1 : 0;
-     }
-+    /* Set gfc->mf_samples_to_encode to 0, so we may detect
-+     * and break loops calling it more than once in a row.
-+     */
-+    gfc->mf_samples_to_encode = 0;
-+
-+    if (imp3 < 0) {
-+        /* some type of fatal error */
-+        return imp3;
-+    }
-+
-     mp3buffer_size_remaining = mp3buffer_size - mp3count;
-     /* if user specifed buffer size = 0, dont check size */
-     if (mp3buffer_size == 0)
diff -Nru lame-3.98.2+debian/debian/patches/04-exec-stac.patch lame-3.98.2/debian/patches/04-exec-stac.patch
--- lame-3.98.2+debian/debian/patches/04-exec-stac.patch	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/patches/04-exec-stac.patch	1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
-From: Russell Coker
-Subject: disable executable stack.
-
-Found in the marillat package. Original message:
-
-New patch from Russell Coker to disable executable stack.
-
-Index: lame-3.98.2/libmp3lame/i386/nasm.h
-===================================================================
---- lame-3.98.2.orig/libmp3lame/i386/nasm.h	2009-01-12 15:20:14.000000000 +0100
-+++ lame-3.98.2/libmp3lame/i386/nasm.h	2009-01-12 15:20:32.000000000 +0100
-@@ -18,6 +18,8 @@
- 
- BITS 32
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+
- %ifdef YASM
- 	%define segment_code segment .text align=16 use32
- 	%define segment_data segment .data align=16 use32
diff -Nru lame-3.98.2+debian/debian/patches/05-armel-no-finite-math-only.diff lame-3.98.2/debian/patches/05-armel-no-finite-math-only.diff
--- lame-3.98.2+debian/debian/patches/05-armel-no-finite-math-only.diff	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/patches/05-armel-no-finite-math-only.diff	1969-12-31 18:00:00.000000000 -0600
@@ -1,44 +0,0 @@
-A bug present in gcc-4.[123] up to 4.3.3 makes a buggy optimization for
-single-precision floats when -ffinite-math-only (enabled by -ffast-math)
-
-Symptom: lame -V0 produces silent output files.
-Refs:
-https://sourceforge.net/tracker/index.php?func=detail&aid=2681646&group_id=290&atid=100290
-https://trac.xiph.org/ticket/1526
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39501
-
-	Martin Guy <martinwguy@yahoo.it> 19 March 2009
-
---- lame-3.98.2/configure.old	2008-06-29 22:40:05.000000000 +0100
-+++ lame-3.98.2/configure	2009-03-19 19:00:42.000000000 +0000
-@@ -30189,6 +30189,15 @@
- 		CFLAGS="-Wall ${CFLAGS}"
- 	fi
- 
-+	# Work round buggy softfloat optimization in ARM EABI compilers
-+	# -gnueabi in only gcc-4.1 onwards
-+	FAST_MATH="-ffast-math"
-+	case "${host}" in
-+	arm*-gnueabi)
-+		FAST_MATH="-ffast-math -fno-finite-math-only"
-+		;;
-+	esac
-+
- 	# GCC version specific generic options
- 	case "${GCC_version}" in
- 	2.96*)
-@@ -30217,12 +30226,12 @@
- 			;;
- 		esac
- 
--		OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} -ffast-math"
-+		OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} ${FAST_MATH}"
- 		OPTIMIZATION_FULL="-fmove-all-movables -freduce-all-givs \
- 			-fbranch-count-reg -fforce-addr -fforce-mem"
- 		;;
- 	4.*)
--		OPTIMIZATION="-O3 -fomit-frame-pointer -ffast-math"
-+		OPTIMIZATION="-O3 -fomit-frame-pointer ${FAST_MATH}"
- 		OPTIMIZATION_FULL="-fbranch-count-reg -fforce-addr"
- 		;;
- 	*)
diff -Nru lame-3.98.2+debian/debian/patches/05-armel-no-finite-math-only.patch lame-3.98.2/debian/patches/05-armel-no-finite-math-only.patch
--- lame-3.98.2+debian/debian/patches/05-armel-no-finite-math-only.patch	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/patches/05-armel-no-finite-math-only.patch	1969-12-31 18:00:00.000000000 -0600
@@ -1,44 +0,0 @@
-A bug present in gcc-4.[123] up to 4.3.3 makes a buggy optimization for
-single-precision floats when -ffinite-math-only (enabled by -ffast-math)
-
-Symptom: lame -V0 produces silent output files.
-Refs:
-https://sourceforge.net/tracker/index.php?func=detail&aid=2681646&group_id=290&atid=100290
-https://trac.xiph.org/ticket/1526
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39501
-
-	Martin Guy <martinwguy@yahoo.it> 19 March 2009
-
---- lame-3.98.2/configure.old	2008-06-29 22:40:05.000000000 +0100
-+++ lame-3.98.2/configure	2009-03-19 19:00:42.000000000 +0000
-@@ -30189,6 +30189,15 @@
- 		CFLAGS="-Wall ${CFLAGS}"
- 	fi
- 
-+	# Work round buggy softfloat optimization in ARM EABI compilers
-+	# -gnueabi in only gcc-4.1 onwards
-+	FAST_MATH="-ffast-math"
-+	case "${host}" in
-+	arm*-gnueabi)
-+		FAST_MATH="-ffast-math -fno-finite-math-only"
-+		;;
-+	esac
-+
- 	# GCC version specific generic options
- 	case "${GCC_version}" in
- 	2.96*)
-@@ -30217,12 +30226,12 @@
- 			;;
- 		esac
- 
--		OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} -ffast-math"
-+		OPTIMIZATION="-O3 ${OMIT_FRAME_POINTER} ${FAST_MATH}"
- 		OPTIMIZATION_FULL="-fmove-all-movables -freduce-all-givs \
- 			-fbranch-count-reg -fforce-addr -fforce-mem"
- 		;;
- 	4.*)
--		OPTIMIZATION="-O3 -fomit-frame-pointer -ffast-math"
-+		OPTIMIZATION="-O3 -fomit-frame-pointer ${FAST_MATH}"
- 		OPTIMIZATION_FULL="-fbranch-count-reg -fforce-addr"
- 		;;
- 	*)
diff -Nru lame-3.98.2+debian/debian/patches/series lame-3.98.2/debian/patches/series
--- lame-3.98.2+debian/debian/patches/series	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/patches/series	2010-08-17 19:49:30.000000000 -0500
@@ -1,5 +1,2 @@
-01-debian-directory.patch
-02-dynamic-frontends.patch
-03-buffer-too-small.patch
-04-exec-stac.patch
-05-armel-no-finite-math-only.patch
\ No newline at end of file
+01_exec-stack.diff
+02_armel-no-finite-math-only.diff
diff -Nru lame-3.98.2+debian/debian/rules lame-3.98.2/debian/rules
--- lame-3.98.2+debian/debian/rules	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/rules	2010-08-17 19:49:30.000000000 -0500
@@ -1,9 +1,94 @@
 #!/usr/bin/make -f
 
-%:
-	dh --with quilt $@
+#export DH_VERBOSE=1
 
-override_dh_auto_configure:
-	cp -v /usr/share/misc/config.guess .
-	cp -v /usr/share/misc/config.sub .
-	dh_auto_configure -- --enable-nasm
+include /usr/share/quilt/quilt.make
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+
+ifeq ($(NCPUS),-1)
+	NCPUS:=1
+endif
+
+ifeq ($(NCPUS),0)
+	NCPUS:=1
+endif
+
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+	CROSS = --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+configure: configure-stamp
+configure-stamp: debian/stamp-patched
+	dh_testdir
+
+	cp -f /usr/share/misc/config.sub .
+	cp -f /usr/share/misc/config.guess .
+
+	./configure $(CROSS) --prefix=/usr --disable-analyzer-hooks --with-pic \
+	--mandir=/usr/share/man --without-vorbis --disable-mp3rtp --enable-decode-layer1 \
+	--disable-mp3x --enable-nasm --enable-expopt=full CC="ccache $(CC)" \
+	CXX="ccache $(CXX)" LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS)"
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+# -j doesn't work at all (07/09/2008)
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	debian/rules unpatch
+
+	dh_clean confcache libmp3lame/i386/choose_table.nas.lst \
+	libmp3lame/i386/cpu_feat.nas.lst libmp3lame/i386/scalar.nas.lst \
+	config.guess config.sub
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+
+	dh_install --fail-missing
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs TODO README USAGE
+	dh_installman
+	dh_installchangelogs
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -V
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff -Nru lame-3.98.2+debian/debian/watch lame-3.98.2/debian/watch
--- lame-3.98.2+debian/debian/watch	2010-08-14 21:16:15.000000000 -0500
+++ lame-3.98.2/debian/watch	2010-08-17 19:49:30.000000000 -0500
@@ -1,3 +1,4 @@
 version=3
-opts="dversionmangle=s/\.//;s/\./-/;s/\+debian//" \
-http://sf.net/lame/lame-(.*)\.tar\.gz
+
+opts=dversionmangle=s/\.// \
+http://sf.net/lame/lame-([\d.]*).tar.gz