shithub: sox

Download patch

ref: ec27f1e05cff22b01b3bb6677114cef239a8b1ee
parent: e11ca5c9083abd9f9aa60999d5548f6f345e54fd
author: evilynux <evilynux>
date: Sat Oct 10 11:26:22 EDT 2009 

- Merged with NMU patch from Stefano Zacchiroli;
- Bumped tarball version to 14.3.1 (can build Debian package from CVS again);
- Removed Guenter from uploaders per is request;
- Other small fixes.


--- a/debian/README.source
+++ b/debian/README.source
@@ -14,7 +14,7 @@
 ----------------
 Create your patch from the SoX root folder (e.g. /tmp/sox-14.3.0/build-tree).
 Copy it into the debian/patches folder. Patches are applied in the alphabetical
-order so you may want to use numered prefixes.
+order so you may want to use numbered prefixes.
 
 Patch Example
 -------------
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,27 @@
-sox (14.3.0+cvs-1) UNRELEASED; urgency=low
+sox (14.3.0.99+cvs-1) UNRELEASED; urgency=low
 
   * CVS Version.
+    - Single-threaded is now default (closes: #546944).
   * [debian/control]:
     - Improved PulseAudio integration.
-    - Bumped standard version to 3.8.2, no changes required.
+    - Bumped standard version to 3.8.3, no changes required.
     - 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).
   * [debian/changelog]:
     - Fixed to spelling errors reported by Lintian.
+  * [debian/README.source]:
+    - Fixed typo.
 
- -- Pascal Giard <evilynux@gmail.com>  Tue, 14 Jul 2009 09:57:08 -0400
+ -- Pascal Giard <evilynux@gmail.com>  Sat, 10 Oct 2009 09:43:51 -0400
+
+sox (14.3.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add missing Replaces from libsox-fmt-base to libsox-fmt-sndfile. Fix
+    file overwrite errors when upgrading from Lenny. (Closes: #540497)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 04 Oct 2009 14:44:45 +0200
 
 sox (14.3.0-1) unstable; urgency=low
 
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@
 Section: sound
 Priority: optional
 Maintainer: Pascal Giard <pascal@debian.org>
-Uploaders: Guenter Geiger (Debian/GNU) <geiger@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.2
+Standards-Version: 3.8.3
 
 Package: sox
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsox-fmt-base, libsox-fmt-alsa | libsox-fmt-ao | libsox-fmt-oss | libsox-fmt-pulse
+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
 Suggests: libsox-fmt-all
 Description: Swiss army knife of sound processing
  SoX is a command line utility that can convert various formats of computer 
@@ -46,7 +45,7 @@
 Package: libsox-fmt-base
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libsox-fmt-flac, libsox-fmt-gsm, libsox-fmt-libsndfile, libsox-fmt-ogg
+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.
  .
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-DEB_TAR_SRCDIR := sox-14.3.0
+DEB_TAR_SRCDIR := sox-14.3.1
 
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk