ref: 8b10857d6b5ca7374d74904e3033d8e3bd5baf38
parent: cdbeca9f3decdd73b1547cf5ae462e08cada3ab4
author: evilynux <evilynux>
date: Fri Feb 11 23:24:19 EST 2011
Merged modifications from Debian's 14.3.1-2; see debian/changelog. TODO: Move to quilt 3.0 format.
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,31 @@
-sox (14.3.1-1cvs1) UNRELEASED; urgency=low
+sox (14.3.1-2cvs1) UNRELEASED; urgency=low
* CVS Version.
- -- Pascal Giard <evilynux@gmail.com> Wed, 05 May 2010 15:22:01 -0400
+ -- Pascal Giard <evilynux@gmail.com> Fri, 11 Feb 2011 23:22:03 -0500
+sox (14.3.1-2) unstable; urgency=low
+
+ * [debian/patches/01_fix_ffmpeg_alignment.patch]:
+ - Fixed ffmpeg segfault caused by alignment requirements, thanks to
+ Reuben Thomas (closes: #537511).
+ * [debian/rules]:
+ - Set distro based on the build distribution, thanks to Benjamin Drung
+ <bdrung@debian.org> for the patch (closes: #612409).
+ - Removed -D_REENTRANT from CFLAGS.
+ * [debian/control, debian/copyright, debian/libsox-dev.install]:
+ - Executed wrap-and-sort from ubuntu-dev-tools as suggested by
+ Benjamin Drung <bdrung@debian.org>, thanks! (closes: #612410).
+ * [debian/control]:
+ - Bumped standard version to 3.9.1.
+ * [debian/source/format]:
+ - Specified format 1.0 (TODO: move to quilt 3.0).
+
+ -- Pascal Giard <pascal@debian.org> Fri, 11 Feb 2011 21:13:57 -0500
+
sox (14.3.1-1) unstable; urgency=medium
- * New upstream candidate.
+ * New upstream release.
- Single-threaded is now default (closes: #546944).
- Support for OpenCore-derived implementation of AMR (closes: #193348).
* [debian/control]:
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,40 @@
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, 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
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ ladspa-sdk,
+ libao-dev,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libavcodec-dev (>= 0.cvs20070301),
+ libavformat-dev,
+ libavutil-dev,
+ libgsm1-dev,
+ libid3tag0-dev,
+ libltdl3-dev,
+ libmad0-dev,
+ libmagic-dev,
+ libopencore-amrnb-dev,
+ libopencore-amrwb-dev,
+ libpng12-dev,
+ libpulse-dev,
+ libsamplerate0-dev,
+ libsndfile1-dev (>= 1.0.12),
+ libvorbis-dev,
+ libwavpack-dev
+Standards-Version: 3.9.1
Package: sox
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsox-fmt-base, libsox-fmt-alsa [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] | libsox-fmt-ao | libsox-fmt-oss | libsox-fmt-pulse+Depends: libsox-fmt-alsa [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] | libsox-fmt-ao | libsox-fmt-oss | libsox-fmt-pulse,
+ libsox-fmt-base,
+ ${misc:Depends},+ ${shlibs:Depends}Suggests: libsox-fmt-all
Description: Swiss army knife of sound processing
- SoX is a command line utility that can convert various formats of computer
- audio files in to other formats. It can also apply various effects to these
- sound files during the conversion. As an added bonus, SoX can play and record
+ SoX is a command line utility that can convert various formats of computer
+ audio files in to other formats. It can also apply various effects to these
+ sound files during the conversion. As an added bonus, SoX can play and record
audio files on several unix-style platforms.
.
SoX is able to handle formats like Ogg Vorbis, MP3, WAV, AIFF, VOC, SND, AU,
@@ -27,8 +50,9 @@
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
+Depends: ${misc:Depends}, ${shlibs:Depends}+Recommends: libsox-fmt-alsa | libsox-fmt-ao | libsox-fmt-oss | libsox-fmt-pulse,
+ libsox-fmt-base
Conflicts: libsox0, libsox0a, libsox1
Replaces: libsox1a
Suggests: libsox-fmt-all
@@ -45,8 +69,12 @@
Package: libsox-fmt-base
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}-Replaces: libsox-fmt-flac, libsox-fmt-gsm, libsox-fmt-libsndfile, libsox-fmt-ogg, libsox-fmt-sndfile
+Depends: ${misc:Depends}, ${shlibs:Depends}+Replaces: libsox-fmt-flac,
+ libsox-fmt-gsm,
+ libsox-fmt-libsndfile,
+ libsox-fmt-ogg,
+ libsox-fmt-sndfile
Description: Minimal set of SoX format libraries
SoX is the swiss army knife of sound processing.
.
@@ -55,8 +83,8 @@
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
-Depends: ${shlibs:Depends}, ${misc:Depends}+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
+Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX alsa format I/O library
SoX is the swiss army knife of sound processing.
.
@@ -66,7 +94,7 @@
Package: libsox-fmt-ao
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}+Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX Libao format I/O library
SoX is the swiss army knife of sound processing.
.
@@ -76,7 +104,7 @@
Package: libsox-fmt-ffmpeg
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}+Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX ffmpeg format library
SoX is the swiss army knife of sound processing.
.
@@ -86,7 +114,7 @@
Package: libsox-fmt-mp3
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}+Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX MP3 format library
SoX is the swiss army knife of sound processing.
.
@@ -97,7 +125,7 @@
Package: libsox-fmt-oss
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}+Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX OSS format I/O library
SoX is the swiss army knife of sound processing.
.
@@ -108,7 +136,7 @@
Package: libsox-fmt-pulse
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}+Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX PulseAudio format I/O library
SoX is the swiss army knife of sound processing.
.
@@ -118,7 +146,14 @@
Package: libsox-fmt-all
Architecture: any
-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+Depends: libsox-fmt-alsa [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libsox-fmt-ao,
+ libsox-fmt-base,
+ libsox-fmt-ffmpeg,
+ libsox-fmt-mp3,
+ libsox-fmt-oss,
+ libsox-fmt-pulse,
+ ${misc:Depends}Description: All SoX format libraries
SoX is the swiss army knife of sound processing.
.
@@ -127,7 +162,10 @@
Package: libsox-dev
Architecture: any
Section: libdevel
-Depends: libsox1b (=${binary:Version}), ${misc:Depends}, libsox-fmt-all (=${binary:Version}), ${shlibs:Depends}+Depends: libsox-fmt-all (=${binary:Version}),+ libsox1b (=${binary:Version}),+ ${misc:Depends},+ ${shlibs:Depends}Description: Development files for the SoX library
SoX is the swiss army knife of sound processing.
.
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,8 +9,8 @@
Copyright 1991 Lance Norskog And Sundry Contributors
This source code is freely redistributable and may be used for
- any purpose. This copyright notice must be maintained.
- Lance Norskog And Sundry Contributors are not responsible for
+ any purpose. This copyright notice must be maintained.
+ Lance Norskog And Sundry Contributors are not responsible for
the consequences of using this software.
Version 12.16 and above of sox is available from http://sox.sourceforge.net.
@@ -28,9 +28,8 @@
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
+The complete text of the GNU Lesser General Public License can be found in the
'/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/libsox-dev.install
+++ b/debian/libsox-dev.install
@@ -1,5 +1,5 @@
+debian/tmp/usr/include/* usr/include/
debian/tmp/usr/lib/lib*.{a,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/include/* usr/include/
debian/tmp/usr/share/man/man3 usr/share/man/
-debian/tmp/usr/lib/pkgconfig/sox.pc usr/lib/pkgconfig/
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,7 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-CFLAGS += -D_REENTRANT
CPPFLAGS += -I/usr/include/ffmpeg
-DEB_CONFIGURE_EXTRA_FLAGS := --without-lame --with-distro="Debian GNU/Linux" --with-dyn-default
+DEB_CONFIGURE_EXTRA_FLAGS := --without-lame --with-distro="$(shell dpkg-vendor --query vendor)" --with-dyn-default
# Takes care of postinst-has-useless-call-to-ldconfig for libsox-fmt-*
DEB_DH_MAKESHLIBS_ARGS := -Xfmt
--- /dev/null
+++ b/debian/source/format
@@ -1,0 +1,1 @@
+1.0