shithub: sox

Download patch

ref: 38da9f290a6d1ba2cf308a86858bccc6881463de
parent: 17ab877e047675d489afadebac67ceaea6123147
author: evilynux <evilynux>
date: Mon Jul 28 10:02:43 EDT 2008

Merged the two remaining "ordinary" format libraries (ogg and flac) in libsox-fmt-base. I took that opportunity to sort libsox-fmt-base.install.

A few dh_shlibdeps warnings remain... fixing will be post-14.1.0.
All in all, i should be ready for 14.1.0.

--- a/debian/changelog
+++ b/debian/changelog
@@ -33,10 +33,12 @@
     - Bumped Standards-Version to 3.8.0, needed changes were already made.
     - Removed libsox-fmt-gsm and libsox-fmt-sndfile, merged in libsox-fmt-base.
   * [debian/libsox-fmt-gsm.install, debian/libsox-fmt-gsm.dirs,
-     debian/libsox-fmt-libsndfile.install, debian/libsox-fmt-libsndfile.dirs]:
-    - Removed, merged gsm in libsox-fmt-base.
+     debian/libsox-fmt-libsndfile.install, debian/libsox-fmt-libsndfile.dirs,
+     debian/libsox-fmt-flac.install, debian/libsox-fmt-flac.dirs,
+     debian/libsox-fmt-ogg.install, debian/libsox-fmt-ogg.dirs]:
+    - Removed, merged gsm, libsndfile, flac and ogg in libsox-fmt-base.
   
- -- Pascal Giard <evilynux@gmail.com>  Thu, 24 Jul 2008 10:58:34 -0400
+ -- Pascal Giard <evilynux@gmail.com>  Mon, 28 Jul 2008 09:53:17 -0400
 
 sox (14.0.1-2) unstable; urgency=low
 
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@
  SoX is able to handle formats like Ogg Vorbis, MP3, WAV, AIFF, VOC, SND, AU,
  GSM and several more.
  Any format support requires at least libsox-fmt-base. Some formats have their
- own package e.g. Ogg Vorbis is provided by libsox-fmt-ogg.
+ own package e.g. mp3 read support is provided by libsox-fmt-mp3.
  .
  SoX supports most common sound architectures i.e. Alsa, Libao and OSS
  (provided by libsox-fmt-alsa, libsox-fmt-ao and libsox-fmt-oss). It also
@@ -89,18 +89,6 @@
  .
  ffmpeg: http://ffmpeg.sourceforge.net
 
-Package: libsox-fmt-flac
-Architecture: any
-Section: sound
-Homepage: http://sox.sourceforge.net
-Depends: ${shlibs:Depends}
-Description: SoX FLAC format library
- SoX is the swiss army knife of sound processing.
- .
- This package contains the SoX FLAC format library.
- .
- FLAC: http://flac.sourceforge.net
-
 Package: libsox-fmt-mp3
 Architecture: any
 Section: sound
@@ -114,18 +102,6 @@
  .
  libmad: http://www.underbit.com/products/mad/
 
-Package: libsox-fmt-ogg
-Architecture: any
-Section: sound
-Depends: ${shlibs:Depends}
-Homepage: http://sox.sourceforge.net
-Description: SoX OGG Vorbis format library
- SoX is the swiss army knife of sound processing.
- .
- This package contains the SoX OGG Vorbis format library.
- .
- OGG Vorbis: http://www.vorbis.com
-
 Package: libsox-fmt-oss
 Architecture: any
 Section: sound
@@ -139,7 +115,7 @@
 Package: libsox-fmt-all
 Architecture: any
 Section: sound
-Depends: libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-flac, libsox-fmt-mp3, libsox-fmt-ogg, libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss
+Depends: libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-mp3, libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss
 Homepage: http://sox.sourceforge.net
 Description: All SoX format libraries
  SoX is the swiss army knife of sound processing.
--- a/debian/libsox-fmt-base.install
+++ b/debian/libsox-fmt-base.install
@@ -3,6 +3,7 @@
 debian/tmp/usr/lib/sox/libsox_fmt_al.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_au.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_avr.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_caf.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_cdr.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_cvsd.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_dat.so* usr/lib/sox/
@@ -9,6 +10,8 @@
 debian/tmp/usr/lib/sox/libsox_fmt_dvms.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_f4.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_f8.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_fap.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_flac.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_gsm.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_hcom.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_htk.so* usr/lib/sox/
@@ -16,16 +19,22 @@
 debian/tmp/usr/lib/sox/libsox_fmt_la.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_lpc10.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_lu.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_mat4.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_mat5.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_maud.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_nul.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_paf.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_prc.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_pvf.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_raw.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_s1.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_s2.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_s3.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_s4.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_sd2.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_sf.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_smp.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_sndfile.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_sounder.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_soundtool.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_sphere.so* usr/lib/sox/
@@ -37,18 +46,11 @@
 debian/tmp/usr/lib/sox/libsox_fmt_u4.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_ul.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_voc.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_vorbis.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_vox.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_w64.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_wavpack.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_wav.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_wve.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_xa.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_wavpack.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_sndfile.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_caf.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_fap.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_paf.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_mat4.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_mat5.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_pvf.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_sd2.so* usr/lib/sox/
-debian/tmp/usr/lib/sox/libsox_fmt_w64.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_xi.so* usr/lib/sox/
--- a/debian/libsox-fmt-flac.dirs
+++ /dev/null
@@ -1,1 +1,0 @@
-usr/lib/sox
--- a/debian/libsox-fmt-flac.install
+++ /dev/null
@@ -1,1 +1,0 @@
-debian/tmp/usr/lib/sox/libsox_fmt_flac.so* usr/lib/sox/
--- a/debian/libsox-fmt-ogg.dirs
+++ /dev/null
@@ -1,1 +1,0 @@
-usr/lib/sox
--- a/debian/libsox-fmt-ogg.install
+++ /dev/null
@@ -1,1 +1,0 @@
-debian/tmp/usr/lib/sox/libsox_fmt_vorbis.so* usr/lib/sox/