ref: e9189be45890d10cb3aef09819684bd266118c5b
parent: cfc3ccc2fdae6f5f462b35c0445069ab36630778
author: Pascal Giard <evilynux@gmail.com>
date: Thu Feb 26 17:22:52 EST 2015
Merge most Debian changes into master.
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,18 +5,66 @@
-- Pascal Giard <evilynux@gmail.com> Tue, 22 Jan 2013 22:56:30 -0500
-sox (14.4.1rc2-0+git20130122-1) UNRELEASED; urgency=low
+sox (14.4.1-5) unstable; urgency=medium
- * Git Version (closes: #676143).
+ * Patches to fix memory corruptions on the heap, CVE-2014-8145
+ (closes: #773720):
+ + 0001-Check-for-minimum-size-sphere-headers.patch
+ + 0002-More-checks-for-invalid-MS-ADPCM-blocks.patch
+
+ -- Pascal Giard <pascal@debian.org> Wed, 24 Dec 2014 14:33:55 -0500
+
+sox (14.4.1-4) unstable; urgency=low
+
+ * [debian/rules,debian/control]:
+ - Build with dh-autoreconf instead of autotools-dev to fix FTBFS on new
+ architectures. Thanks to William Grant <wgrant@ubuntu.com> and Breno
+ Leitao <brenohl@br.ibm.com> (Closes: #746517).
+ * [debian/control]:
+ - Remove useless build-dep on libav* (Closes: #748049).
+
+ -- Pascal Giard <pascal@debian.org> Wed, 21 May 2014 21:58:57 -0400
+
+sox (14.4.1-3) unstable; urgency=low
+
+ * [debian/rules]:
+ - Added an explicit call to dh_installchangelogs as Ubuntu no longer does
+ does it by default. It's important for us as it contains the list of
+ past contributors.
+ * [debian/docs]:
+ - Fixed paths to files.
+
+ -- Pascal Giard <pascal@debian.org> Mon, 15 Apr 2013 21:20:12 -0400
+
+sox (14.4.1-2) unstable; urgency=low
+
+ * [debian/libsox-fmt-base.install.in]:
+ - Added all missing sndfile-derived formats. Thanks to Ulrich Klauer
+ <ulrich@chirlu.de> for the patch (LP: #1086889).
+ * [debian/control]:
+ - Removed duplicate section field for sox. Fixes lintian warning.
+ - Added Build-Dep on autotools-dev for dh_autotools_dev.
+ * [debian/rules]:
+ - Use dh_autotools_dev to update the outdated autotools helper files.
+ Fixes lintian warning.
+
+ -- Pascal Giard <pascal@debian.org> Fri, 22 Feb 2013 22:38:19 -0500
+
+sox (14.4.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixed misleading error message (closes: #676143).
+ - Fixed early termination on Ogg Vorbis files with a non-power of two
+ number of channels (closes: #672567).
* [debian/source/format]:
- Finally switched to dpkg-source 3.0 (quilt) format!
* [debian/rules]:
- No longer using CDBS and depricated makefiles, fixes lintian warnings
- "debian-rules-uses-deprecated-makefile".
+ "debian-rules-uses-deprecated-makefile".
- Added multiarch support.
* [debian/control]:
- Added Vcs-Git and Vcs-Browser pointing to upstream VCS.
- - Added Pre-Depends on multiarch-support for libsox3, does not seem to
+ - Added Pre-Depends on multiarch-support for libsox2, does not seem to be
required for the other packages (contradiction in the documentation?),
fixes lintian warning "missing-pre-dependency-on-multiarch-support".
- Bumped Standards-Version to 3.9.3, no changes needed.
@@ -33,7 +81,7 @@
* [debian/README.source]:
- Updated to reflect the much simplified packaging and usage of quilt.
- -- Pascal Giard <evilynux@gmail.com> Tue, 22 Jan 2013 22:56:30 -0500
+ -- Pascal Giard <pascal@debian.org> Mon, 11 Feb 2013 22:25:36 -0500
sox (14.4.0-5) unstable; urgency=low
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,11 @@
Section: sound
Priority: optional
Maintainer: Pascal Giard <pascal@debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: dh-autoreconf,
+ debhelper (>= 9),
ladspa-sdk,
libao-dev,
libasound2-dev [linux-any],
- libavcodec-dev (>= 4:0.6.0),
- libavformat-dev,
- libavutil-dev,
libgsm1-dev,
libid3tag0-dev,
libltdl3-dev,
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
-build-tree/*/README
+README
+NEWS
debian/README.source
-build-tree/*/TODO
--- a/debian/libsox-fmt-base.install.in
+++ b/debian/libsox-fmt-base.install.in
@@ -4,5 +4,14 @@
debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_gsm.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_lpc10.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_sndfile.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_caf.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_fap.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_mat4.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_mat5.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_paf.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_pvf.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_sd2.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_w64.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
+debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_xi.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_vorbis.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
debian/tmp/usr/lib/@DEB_HOST_MULTIARCH@/sox/libsox_fmt_wavpack.so* usr/lib/@DEB_HOST_MULTIARCH@/sox/
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,10 @@
override_dh_auto_install: $(PREPROCESS_FILES:.in=)
dh_auto_install
+ # Force Ubuntu into installing upstream ChangeLog, it contains the
+ # list of past contributors
+ dh_installchangelogs ChangeLog
%:
- dh $@
+ dh $@ --with autoreconf