shithub: sox

Download patch

ref: 0ac837acf779752de4c12680914ab3ce59ece20f
parent: 6d55af3999630bb0bd1a86398bb2f1d6106cb10e
author: Pascal Giard <evilynux@gmail.com>
date: Sun Mar 11 19:38:30 EDT 2012

See debian/changelog for all significant changes.

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
-sox (14.4.1-0+git20120306-1) UNRELEASED; urgency=low
+sox (14.4.1-0+git20120311-1) UNRELEASED; urgency=low
 
   * Git Version.
+  * [debian/sox.install, debian/libsox-dev.install]:
+    - Removed brace expensions fixing lintian warning
+      "brace-expansion-in-debhelper-config-file".
+  * [debian/control]:
+    - Added versioned dependency to format libraries, fixes upgrades in some
+      use cases.
+    - Added MP2 to short description of libsox-fmt-mp3.
+  * [debian/copyright]:
+    - Long due update, thanks to Ulrich Klauer <ulrich@chirlu.de> for pointing
+      this out.
+    - libst is now libsox.
+    - FFT code is no longer Audacity's GPL code.
+    - Updated link to LGPL license to 2.1.
 
- -- Pascal Giard <evilynux@gmail.com>  Sat, 06 Mar 2012 23:00:01 -0500
+ -- Pascal Giard <evilynux@gmail.com>  Sun, 11 Mar 2012 23:36:11 -0500
 
 sox (14.4.0-1) unstable; urgency=low
 
--- a/debian/control
+++ b/debian/control
@@ -30,8 +30,8 @@
 
 Package: sox
 Architecture: any
-Depends: libsox-fmt-alsa [linux-any] | libsox-fmt-ao | libsox-fmt-oss | libsox-fmt-pulse,
-         libsox-fmt-base,
+Depends: libsox-fmt-alsa [linux-any] (= ${binary:Version}) | libsox-fmt-ao (= ${binary:Version}) | libsox-fmt-oss (= ${binary:Version}) | libsox-fmt-pulse (= ${binary:Version}),
+         libsox-fmt-base (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: libsox-fmt-all
@@ -117,7 +117,7 @@
 Package: libsox-fmt-mp3
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: SoX MP3 format library
+Description: SoX MP2 and MP3 format library
  SoX is the swiss army knife of sound processing.
  .
  This package contains the SoX MP2 and MP3 format library.
@@ -150,13 +150,13 @@
 
 Package: libsox-fmt-all
 Architecture: any
-Depends: libsox-fmt-alsa [linux-any],
-         libsox-fmt-ao,
-         libsox-fmt-base,
-         libsox-fmt-ffmpeg,
-         libsox-fmt-mp3,
-         libsox-fmt-oss,
-         libsox-fmt-pulse,
+Depends: libsox-fmt-alsa [linux-any] (= ${binary:Version}),
+         libsox-fmt-ao (= ${binary:Version}),
+         libsox-fmt-base (= ${binary:Version}),
+         libsox-fmt-ffmpeg (= ${binary:Version}),
+         libsox-fmt-mp3 (= ${binary:Version}),
+         libsox-fmt-oss (= ${binary:Version}),
+         libsox-fmt-pulse (= ${binary:Version}),
          ${misc:Depends}
 Description: All SoX format libraries
  SoX is the swiss army knife of sound processing.
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,19 +17,13 @@
 
 sox.c, and thus SoX-the user application, is distributed under the GPL.
 
-The remaining files that make up libst are licensed under the less
+The remaining files that make up libsox are licensed under the less
 restrictive license LGPL.
 
-There is currently only one exception to this.  The files FFT.c and
-FFT.h are original from the Audacity program and fall under its
-license of GPL.  The noise profiling and noise reduction effects
-both make use of this FFT code and would need to be removed from
-any program that requires LGPL only software.
-
 On Debian systems, the complete text of the GNU General Public License
 can be found in the '/usr/share/common-licenses/GPL-2' file.
 The complete text of the GNU Lesser General Public License can be found in the
-'/usr/share/common-licenses/LGPL-2' file.
+'/usr/share/common-licenses/LGPL-2.1' file.
 
 The original copyright owner was Lance Norskog.
 Current upstream development is being made by Chris Bagwell and others.
--- a/debian/libsox-dev.install
+++ b/debian/libsox-dev.install
@@ -1,5 +1,6 @@
 debian/tmp/usr/include/* usr/include/
-debian/tmp/usr/lib/lib*.{a,so} usr/lib/
+debian/tmp/usr/lib/lib*.a usr/lib/
+debian/tmp/usr/lib/lib*.so usr/lib/
 debian/tmp/usr/lib/pkgconfig/sox.pc usr/lib/pkgconfig/
 debian/tmp/usr/lib/sox/lib*.a usr/lib/sox/
 debian/tmp/usr/share/man/man3 usr/share/man/
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-DEB_TAR_SRCDIR := sox-14.4.1
+DEB_TAR_SRCDIR := sox-14.4.1git
 
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
--- a/debian/sox.install
+++ b/debian/sox.install
@@ -1,2 +1,6 @@
-debian/tmp/usr/bin/{play,rec,sox,soxi} usr/bin/
-debian/tmp/usr/share/man/man{1,7} usr/share/man/
+debian/tmp/usr/bin/play usr/bin/
+debian/tmp/usr/bin/rec usr/bin/
+debian/tmp/usr/bin/sox usr/bin/
+debian/tmp/usr/bin/soxi usr/bin/
+debian/tmp/usr/share/man/man1 usr/share/man/
+debian/tmp/usr/share/man/man7 usr/share/man/