[SCM] lame/master: normalize fields in debian/control with 'wrap-and-sort(1)'

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e389d95a8a176ee3aa09e450c4820309f301afa1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 30 12:51:02 2011 +0200

    normalize fields in debian/control with 'wrap-and-sort(1)'

diff --git a/debian/control b/debian/control
index cf514ac..5d3a2a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: lame
 Section: sound
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Fabian Greffrath <fabian+debian at greffrath.com>,
-           Reinhard Tartler <siretart at tauware.de>,
-           Andres Mejia <amejia at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
-               libncurses5-dev,
-               nasm [i386],
+Uploaders:
+ Fabian Greffrath <fabian+debian at greffrath.com>,
+ Reinhard Tartler <siretart at tauware.de>,
+ Andres Mejia <amejia at debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ libncurses5-dev,
+ nasm [i386]
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Homepage: http://lame.sourceforge.net/
@@ -16,64 +18,58 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/lame.git
 
 Package: lame
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: 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.
  .
- 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}
+Depends:
+ ${misc:Depends}
 Description: 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}
-Conflicts: liblame0
-Replaces: liblame0
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ liblame0
+Replaces:
+ liblame0
 Description: 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.
 
 Package: libmp3lame-dev
 Section: libdevel
 Architecture: any
-Depends: libmp3lame0 (= ${binary:Version}),
-         ${misc:Depends}
+Depends:
+ libmp3lame0 (= ${binary:Version}),
+ ${misc:Depends}
 Description: 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.
  .
- 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 development files.
diff --git a/debian/copyright b/debian/copyright
index cef29fb..d6c22db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -105,33 +105,7 @@ Copyright: © 1988-1993, Ron Mayer
            © 1999-2000, Takehiro Tominaga
 License: GPL-1+
 Comment:
- No version of the GPL is explicitly given. A note about the licensing of this
- file is given, and repeated verbatim below.
- .
- 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 at acuson.com
- and added some optimization by
-           Mather    - idea of using lookup table
-           Takehiro  - some dirty hack for speed up
+ No version of the GPL is explicitly given.
 
 Files: debian/*
 Copyright: © 2005-2009, Fabian Greffrath <fabian+debian at greffrath.com>

-- 
lame packaging