shithub: sox

Download patch

ref: 4499c21be885495c922de47ace4cef0ca02cadfe
parent: 2c3c76cd093d2329faaf1f48b26fd992a54e6788
author: evilynux <evilynux>
date: Wed May 5 15:26:12 EDT 2010 

Uploaded 14.3.1 to Debian, synch'd Debian packaging files.


--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
-sox (14.3.1-0cvs1) UNRELEASED; urgency=low
+sox (14.3.1-1cvs1) UNRELEASED; urgency=low
 
   * CVS Version.
+
+ -- Pascal Giard <evilynux@gmail.com>  Wed, 05 May 2010 15:22:01 -0400
+
+sox (14.3.1-1) unstable; urgency=medium
+
+  * New upstream candidate.
     - Single-threaded is now default (closes: #546944).
+    - Support for OpenCore-derived implementation of AMR (closes: #193348).
   * [debian/control]:
     - Improved PulseAudio integration.
     - Bumped standard version to 3.8.3, no changes required.
@@ -8,6 +15,9 @@
     - Removed duplicate section control field, inherited from source.
     - Removed Guenter Geiger from uploaders (closes: #546952).
     - Removed depend on alsa for fmt-all on non-Linux systems (closes: #539224).
+    - Added build-dep on libopencore-amrnb-dev and libopencore-amrwb-dev.
+    - Bumped Standards-Version to 3.8.4, no changes needed.
+    - Bumped libsox1a to libsox1b, interface changes.
   * [debian/changelog]:
     - Fixed to spelling errors reported by Lintian.
   * [debian/README.source]:
@@ -16,8 +26,10 @@
     - Added README.source (really fixes #522548).
   * [debian/libsox-fmt-base.install]:
     - Removed formats now in libsox.
-
- -- Pascal Giard <evilynux@gmail.com>  Fri, 18 Dec 2009 21:07:50 -0500
+  * [debian/rules]:
+    - Enable amr-nb and amr-wb as there is now an implementation in main.
+	
+ -- Pascal Giard <pascal@debian.org>  Wed, 05 May 2010 14:33:18 -0400
 
 sox (14.3.0-1.1) unstable; urgency=low
 
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@
 Section: sound
 Priority: optional
 Maintainer: Pascal Giard <pascal@debian.org>
-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, libpulse-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Standards-Version: 3.8.3
+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, libopencore-amrnb-dev, libopencore-amrwb-dev, libao-dev, libid3tag0-dev, ladspa-sdk, libpng12-dev, libmagic-dev, libpulse-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Standards-Version: 3.8.4
 
 Package: sox
 Architecture: any
@@ -25,11 +25,12 @@
  (respectively provided by libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss and
  libsox-fmt-pulse). It also supports LADSPA plugins.
 
-Package: libsox1a
+Package: libsox1b
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libsox-fmt-base, libsox-fmt-alsa | libsox-fmt-ao | libsox-fmt-oss | libsox-fmt-pulse
 Conflicts: libsox0, libsox0a, libsox1
+Replaces: libsox1a
 Suggests: libsox-fmt-all
 Description: SoX library of audio effects and processing
  SoX is the swiss army knife of sound processing.
@@ -51,7 +52,7 @@
  .
  This package contains most audio formats libraries supported by SoX.
  Among them: Ogg Vorbis, WAV, AIFF, VOC, SND, AU, GSM, WavPack, LPC10, FLAC,
- MATLAB/GNU Octave, Portable Voice Format and Sound Forge Audio Format.
+ MATLAB/GNU Octave, Portable Voice Format, AMR and Sound Forge Audio Format.
 
 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
@@ -117,7 +118,7 @@
 
 Package: libsox-fmt-all
 Architecture: any
-Depends: ${misc:Depends}, libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-mp3, libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss, libsox-fmt-pulse
+Depends: ${misc:Depends}, libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-mp3, libsox-fmt-alsa [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsox-fmt-ao, libsox-fmt-oss, libsox-fmt-pulse
 Description: All SoX format libraries
  SoX is the swiss army knife of sound processing.
  .
@@ -126,7 +127,7 @@
 Package: libsox-dev
 Architecture: any
 Section: libdevel
-Depends: libsox1a (=${binary:Version}), ${misc:Depends}, libsox-fmt-all (=${binary:Version}), ${shlibs:Depends}
+Depends: libsox1b (=${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/libsox1a.dirs
+++ /dev/null
@@ -1,1 +1,0 @@
-usr/lib
--- a/debian/libsox1a.install
+++ /dev/null
@@ -1,1 +1,0 @@
-debian/tmp/usr/lib/*.so.* usr/lib/
--- a/debian/libsox1a.shlibs
+++ /dev/null
@@ -1,1 +1,0 @@
-libsox 1 libsox1a (>= 14.3.0)
--- /dev/null
+++ b/debian/libsox1b.dirs
@@ -1,0 +1,1 @@
+usr/lib
--- /dev/null
+++ b/debian/libsox1b.install
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/*.so.* usr/lib/
--- /dev/null
+++ b/debian/libsox1b.shlibs
@@ -1,0 +1,1 @@
+libsox 1 libsox1b (>= 14.3.1)
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,6 @@
 
 CFLAGS += -D_REENTRANT
 CPPFLAGS += -I/usr/include/ffmpeg
-DEB_CONFIGURE_EXTRA_FLAGS := --without-lame --with-distro="Debian GNU/Linux" --with-dyn-default --without-amrwb --without-amrnb
+DEB_CONFIGURE_EXTRA_FLAGS := --without-lame --with-distro="Debian GNU/Linux" --with-dyn-default
 # Takes care of postinst-has-useless-call-to-ldconfig for libsox-fmt-*
 DEB_DH_MAKESHLIBS_ARGS := -Xfmt