[SCM] xwax/master: Support both avconf and ffmpeg binaries

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1c85985adf57596ccd89b8d2464737956b12f5f2
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Wed Jun 10 12:54:39 2015 +0100

    Support both avconf and ffmpeg binaries
    
    Closes: #722487

diff --git a/debian/control b/debian/control
index 91b3b5e..ec56249 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends:
  ${shlibs:Depends}
 Recommends:
  cdparanoia,
- ffmpeg,
+ libav-tools | ffmpeg,
  mpg123
 Suggests:
  jackd
diff --git a/debian/patches/0001-use_either_ffmpeg_or_avconv.patch b/debian/patches/0001-use_either_ffmpeg_or_avconv.patch
new file mode 100644
index 0000000..ed4c198
--- /dev/null
+++ b/debian/patches/0001-use_either_ffmpeg_or_avconv.patch
@@ -0,0 +1,28 @@
+Description: Pick either avconv of ffmpeg.
+Author: Alessio Treglia <alessio at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722487
+Forwarded: no
+---
+ import |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- xwax.orig/import
++++ xwax/import
+@@ -13,6 +13,8 @@
+ FILE="$1"
+ RATE="$2"
+ 
++g_fallback_tool="$(which avconf || which ffmpeg)"
++
+ case "$FILE" in
+ 
+ *.cdaudio)
+@@ -27,7 +29,7 @@ case "$FILE" in
+ 
+ *)
+     echo "Calling fallback decoder..." >&2
+-    exec ffmpeg -v 0 -i "$FILE" -f s16le -ar "$RATE" -
++    exec "$g_fallback_tool" -v 0 -i "$FILE" -f s16le -ar "$RATE" -
+     ;;
+ 
+ esac
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a13a73f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-use_either_ffmpeg_or_avconv.patch

-- 
xwax packaging