shithub: sox

Download patch

ref: 78b68b6bb2f2648fb41e37883b7f0a00befd9b23
parent: afcffe8c62bad72afdd41ce01278c57edc3d1ff4
author: evilynux <evilynux>
date: Fri Apr 10 10:51:00 EDT 2009

Synch'd with latest Debian release.
Note that libmagic is disabled for now.

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,26 @@
 sox (14.2.0+cvs-1) UNRELEASED; urgency=low
 
-  * CVS version (closes: #479557, #484562, #499041).
+  * CVS version.
+
+ -- Pascal Giard <evilynux@gmail.com>  Fri, 10 Apr 2009 10:48:03 -0400
+
+sox (14.2.0-2) unstable; urgency=low
+
+  * [debian/rules]: Disabled libmagic (closes: #521639, #522241).
   * [debian/control]:
+    - Added misc-Depends to all packages.
+    - Updated version of build depend on debhelper to 7.
+    - Updated standard version to 3.8.1, no changes required.
+  * [debian/watch]: Use sourceforge.net redirector.
+  * [debian/compat]: Bumped debhelper compat version to 7.
+  * [debian/copyright]: Refer to versioned GPL-2 and LGPL-2 files.
+
+ -- Pascal Giard <pascal@debian.org>  Thu, 09 Apr 2009 23:37:14 -0400
+
+sox (14.2.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #479557, #484562, #499041).
+  * [debian/control]:
     - libsox1 replaces libsox0a.
     - Improved libsox1 short and long descriptions (closes: #493483).
     - Moved Homepage field to source.
@@ -9,7 +28,7 @@
     - Improved libsox-fmt-base description by giving format examples.
     - Added Build-Dep on libmagic-dev.
 
- -- Pascal Giard <evilynux@gmail.com>  Sun, 02 Nov 2008 22:49:34 -0500
+ -- Pascal Giard <pascal@debian.org>  Tue, 25 Nov 2008 21:29:26 -0500
 
 sox (14.1.0-1) unstable; urgency=medium
 
--- a/debian/compat
+++ b/debian/compat
@@ -1,1 +1,1 @@
-4
+7
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@
 Priority: optional
 Maintainer: Pascal Giard <pascal@debian.org>
 Uploaders: Guenter Geiger (Debian/GNU) <geiger@debian.org>
-Build-Depends: debhelper (>= 1.2.64), cdbs, libltdl3-dev, libvorbis-dev, libmad0-dev, libgsm1-dev, libsndfile1-dev (>= 1.0.12), libsamplerate0-dev, libavcodec-dev (>= 0.cvs20070301), libavformat-dev, libavutil-dev, libwavpack-dev, libao-dev, libid3tag0-dev, ladspa-sdk, libpng12-dev, libmagic-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), cdbs, libltdl3-dev, libvorbis-dev, libmad0-dev, libgsm1-dev, libsndfile1-dev (>= 1.0.12), libsamplerate0-dev, libavcodec-dev (>= 0.cvs20070301), libavformat-dev, libavutil-dev, libwavpack-dev, libao-dev, libid3tag0-dev, ladspa-sdk, libpng12-dev, libmagic-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Standards-Version: 3.8.1
 
 Package: sox
 Section: sound
 Architecture: any
-Depends: ${shlibs:Depends}, libsox-fmt-base, libsox-fmt-alsa | libsox-fmt-ao | libsox-fmt-oss
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsox-fmt-base, libsox-fmt-alsa | libsox-fmt-ao | libsox-fmt-oss
 Suggests: libsox-fmt-all
 Description: Swiss army knife of sound processing
  SoX is a command line utility that can convert various formats of computer 
@@ -30,7 +30,7 @@
 Package: libsox1
 Architecture: any
 Section: sound
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libsox-fmt-base, libsox-fmt-alsa | libsox-fmt-ao | libsox-fmt-oss
 Conflicts: libsox0, libsox0a
 Suggests: libsox-fmt-all
@@ -47,7 +47,7 @@
 Package: libsox-fmt-base
 Architecture: any
 Section: sound
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libsox-fmt-flac, libsox-fmt-gsm, libsox-fmt-libsndfile, libsox-fmt-ogg
 Description: Minimal set of SoX format libraries
  SoX is the swiss army knife of sound processing.
@@ -59,7 +59,7 @@
 Package: libsox-fmt-alsa
 Architecture: alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc armeb lpia m32r ppc64 s390x sh3 sh3eb sh4 sh4eb
 Section: sound
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SoX alsa format I/O library
  SoX is the swiss army knife of sound processing.
  .
@@ -70,7 +70,7 @@
 Package: libsox-fmt-ao
 Architecture: any
 Section: sound
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SoX Libao format I/O library
  SoX is the swiss army knife of sound processing.
  .
@@ -81,7 +81,7 @@
 Package: libsox-fmt-ffmpeg
 Architecture: any
 Section: sound
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SoX ffmpeg format library
  SoX is the swiss army knife of sound processing.
  .
@@ -92,7 +92,7 @@
 Package: libsox-fmt-mp3
 Architecture: any
 Section: sound
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SoX MP3 format library
  SoX is the swiss army knife of sound processing.
  .
@@ -104,7 +104,7 @@
 Package: libsox-fmt-oss
 Architecture: any
 Section: sound
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SoX OSS format I/O library
  SoX is the swiss army knife of sound processing.
  .
@@ -113,7 +113,7 @@
 Package: libsox-fmt-all
 Architecture: any
 Section: sound
-Depends: libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-mp3, libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss
+Depends: ${misc:Depends}, libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-mp3, libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss
 Description: All SoX format libraries
  SoX is the swiss army knife of sound processing.
  .
@@ -122,7 +122,7 @@
 Package: libsox-dev
 Architecture: any
 Section: libdevel
-Depends: libsox1 (=${binary:Version}), libsox-fmt-all (=${binary:Version}), ${shlibs:Depends}
+Depends: libsox1 (=${binary:Version}), ${misc:Depends}, libsox-fmt-all (=${binary:Version}), ${shlibs:Depends}
 Description: Development files for the SoX library
  SoX is the swiss army knife of sound processing.
  .
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,9 +27,9 @@
 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' file.
+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' file.
+'/usr/share/common-licenses/LGPL-2' file.
 
 The original copyright owner was Lance Norskog.
 Current upstream development is being made by Chris Bagwell and others.
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,6 @@
 
 CFLAGS += -D_REENTRANT
 CPPFLAGS += -I/usr/include/ffmpeg
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath --disable-lame
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath --disable-lame --without-magic
 # Takes care of postinst-has-useless-call-to-ldconfig for libsox-fmt-*
 DEB_DH_MAKESHLIBS_ARGS := -Xfmt