ref: cc281d309747756f7ca5398c32a4d24cce5aedf3
parent: 585fb5f6ee9f116114215c3901443288482e20c5
author: Pascal Giard <evilynux@gmail.com>
date: Tue Jan 22 17:26:31 EST 2013
Sync' with latest Debian uploads plus few updates toward the next upload.
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,42 @@
-sox (14.4.2-0+git20120311-1) UNRELEASED; urgency=low
+sox (14.4.2git-0+git20130122-1) UNRELEASED; urgency=low
- * Git Version.
+ * Git Version (closes: #676143).
* [debian/control]:
- Bumped libsox2 to libsox3, interface changes.
+ - Added Vcs-Git and Vcs-Browser pointing to upstream VCS.
+ - Set Section to libs for all libsox* but libsox-dev.
+ * [debian/patches/01_default_audio_driver_fallback.patch]:
+ - Removed, fixed upstream.
+ * [debian/watch]:
+ - Updated watch file, thanks to Bart Martens <bartm@debian.org>.
- -- Pascal Giard <evilynux@gmail.com> Mon, 12 Mar 2012 00:22:05 -0500
+ -- Pascal Giard <evilynux@gmail.com> Tue, 22 Jan 2013 22:15:59 -0500
+
+sox (14.4.0-5) unstable; urgency=low
+
+ * [debian/patches/01_default_audio_driver_fallback.patch]:
+ - Updated to only use try_device() on pulseaudio. Thanks to
+ Ulrich Klauer <ulrich@chirlu.de> for the patch (closes: #676167).
+
+ -- Pascal Giard <pascal@debian.org> Fri, 18 Jan 2013 22:29:15 -0500
+
+sox (14.4.0-4) experimental; urgency=low
+
+ * [debian/rules, debian/control, debian/libsox-fmt-ffmpeg.dirs,
+ debian/libsox-fmt-ffmpeg.install]:
+ - Explicitly disabled and removed ffmpeg support as it's broken.
+ It is being depricated in the next upstream version anyway
+ (closes: #693642).
+
+ -- Pascal Giard <pascal@debian.org> Thu, 17 Jan 2013 21:18:45 -0500
+
+sox (14.4.0-3) unstable; urgency=low
+
+ * [debian/patches/01_default_audio_driver_fallback.patch]:
+ - Added default audio driver fallback. Thanks to Rob Sykes for the patch
+ (closes: #664301).
+
+ -- Pascal Giard <pascal@debian.org> Sun, 06 May 2012 22:55:25 -0400
sox (14.4.0-2) unstable; urgency=low
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,12 @@
libvorbis-dev,
libwavpack-dev
Standards-Version: 3.9.1
+Vcs-Git: git://sox.git.sourceforge.net/gitroot/sox/sox
+Vcs-Browser: http://sox.git.sourceforge.net/git/gitweb.cgi?p=sox/sox
Package: sox
Architecture: any
+Section: sound
Depends: libsox-fmt-alsa (= ${binary:Version}) [linux-any] | libsox-fmt-ao (= ${binary:Version}) | libsox-fmt-oss (= ${binary:Version}) | libsox-fmt-pulse (= ${binary:Version}), libsox-fmt-base (= ${binary:Version}), libsox3 (= ${binary:Version}),@@ -53,6 +56,7 @@
Package: libsox3
Architecture: any
+Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}Recommends: libsox-fmt-alsa [linux-any] | libsox-fmt-ao | libsox-fmt-oss | libsox-fmt-pulse,
libsox-fmt-base
@@ -72,6 +76,7 @@
Package: libsox-fmt-base
Architecture: any
+Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}Replaces: libsox-fmt-flac,
libsox-fmt-gsm,
@@ -87,6 +92,7 @@
Package: libsox-fmt-alsa
Architecture: linux-any
+Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX alsa format I/O library
SoX is the swiss army knife of sound processing.
@@ -97,6 +103,7 @@
Package: libsox-fmt-ao
Architecture: any
+Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX Libao format I/O library
SoX is the swiss army knife of sound processing.
@@ -105,18 +112,9 @@
.
libao: http://xiph.org/ao
-Package: libsox-fmt-ffmpeg
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}-Description: SoX ffmpeg format library
- SoX is the swiss army knife of sound processing.
- .
- This package contains the SoX ffmpeg format library.
- .
- ffmpeg: http://ffmpeg.sourceforge.net
-
Package: libsox-fmt-mp3
Architecture: any
+Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX MP2 and MP3 format library
SoX is the swiss army knife of sound processing.
@@ -130,6 +128,7 @@
Package: libsox-fmt-oss
Architecture: any
+Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX OSS format I/O library
SoX is the swiss army knife of sound processing.
@@ -141,6 +140,7 @@
Package: libsox-fmt-pulse
Architecture: any
+Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}Description: SoX PulseAudio format I/O library
SoX is the swiss army knife of sound processing.
@@ -151,10 +151,10 @@
Package: libsox-fmt-all
Architecture: any
+Section: libs
Depends: libsox-fmt-alsa (= ${binary:Version}) [linux-any], 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}),--- a/debian/libsox-fmt-ffmpeg.dirs
+++ /dev/null
@@ -1,1 +1,0 @@
-usr/lib/sox
--- a/debian/libsox-fmt-ffmpeg.install
+++ /dev/null
@@ -1,1 +1,0 @@
-debian/tmp/usr/lib/sox/libsox_fmt_ffmpeg.so* usr/lib/sox/
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-CPPFLAGS += -I/usr/include/ffmpeg
-DEB_CONFIGURE_EXTRA_FLAGS := --with-distro="$(shell dpkg-vendor --query vendor)" --with-dyn-default
+DEB_CONFIGURE_EXTRA_FLAGS := --with-distro="$(shell dpkg-vendor --query vendor)" --with-dyn-default --without-ffmpeg
# Takes care of postinst-has-useless-call-to-ldconfig for libsox-fmt-*
DEB_DH_MAKESHLIBS_ARGS := -Xfmt
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
version=3
-http://sf.net/sox/sox-(.*)\.tar\.gz
+opts=uversionmangle=s/(\d)[_\.\-]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/ \
+http://qa.debian.org/watch/sf.php/sox/sox-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))
+# Bart Martens <bartm@debian.org> Sat, 01 Dec 2012 11:43:49 +0000