[SCM] xwax/master: Remove patch that was merged upstream in 1.6 final release

[dhj-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9c86307d67466bbf8ad3407957eedff934c51d0b
Author: Daniel James <daniel at 64studio.com>
Date:   Mon Aug 15 11:18:10 2016 +0100

    Remove patch that was merged upstream in 1.6 final release

diff --git a/debian/patches/0001-use_either_ffmpeg_or_avconv.patch b/debian/patches/0001-use_either_ffmpeg_or_avconv.patch
deleted file mode 100644
index 2ed6ea2..0000000
--- a/debian/patches/0001-use_either_ffmpeg_or_avconv.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Pick either avconv or 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 avconv || 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
deleted file mode 100644
index a13a73f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-use_either_ffmpeg_or_avconv.patch

-- 
xwax packaging