[SCM] forked-daapd/master: Update patches to match original commits

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 24f0a5d80db0a53a68d98b3d31a9a8f0324373b8
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Feb 23 11:50:59 2015 +0100

    Update patches to match original commits
    
    Some line numbers had to be changed to apply cleanly
    
    Git-Dch: Ignore

diff --git a/debian/patches/0001-Fix-bad-free-when-encountering-an-error-fetching-que.patch b/debian/patches/0001-Fix-bad-free-when-encountering-an-error-fetching-que.patch
index 0dd4c87..ae3f6cc 100644
--- a/debian/patches/0001-Fix-bad-free-when-encountering-an-error-fetching-que.patch
+++ b/debian/patches/0001-Fix-bad-free-when-encountering-an-error-fetching-que.patch
@@ -1,7 +1,7 @@
-From 01e6d56f7eef841d96c874f64206aacc09640dd6 Mon Sep 17 00:00:00 2001
+From 4efca3660f7c944071c76cfeca91dc836bd9c8c2 Mon Sep 17 00:00:00 2001
 From: Justin Maggard <jmaggard10 at gmail.com>
 Date: Tue, 16 Dec 2014 15:32:21 -0800
-Subject: [PATCH 1/3] Fix bad free when encountering an error fetching query
+Subject: [PATCH 1/2] Fix bad free when encountering an error fetching query
  results.
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 1/3] Fix bad free when encountering an error fetching query
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/src/httpd_daap.c b/src/httpd_daap.c
-index 9506b6f..50fe3de 100644
+index b4261ca..42c37b5 100644
 --- a/src/httpd_daap.c
 +++ b/src/httpd_daap.c
 @@ -1913,7 +1913,10 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
diff --git a/debian/patches/0002-Fix-invalid-read-on-empty-string-queries.patch b/debian/patches/0002-Fix-invalid-read-on-empty-string-queries.patch
index 17dcdc6..2dbfa0e 100644
--- a/debian/patches/0002-Fix-invalid-read-on-empty-string-queries.patch
+++ b/debian/patches/0002-Fix-invalid-read-on-empty-string-queries.patch
@@ -1,7 +1,7 @@
-From 90c38f639d415b0748520cdb35ea3f23f02e56fb Mon Sep 17 00:00:00 2001
+From cdb004808272cd331f09334fff618a8976e4fb25 Mon Sep 17 00:00:00 2001
 From: Justin Maggard <jmaggard10 at gmail.com>
 Date: Tue, 16 Dec 2014 15:30:45 -0800
-Subject: [PATCH 2/3] Fix invalid read on empty string queries.
+Subject: [PATCH 2/2] Fix invalid read on empty string queries.
 
 ---
  src/DAAP2SQL.g | 2 +-
diff --git a/debian/patches/0003-Fix-problems-with-iTunes-12.1-see-issue-100.patch b/debian/patches/0003-Fix-problems-with-iTunes-12.1-see-issue-100.patch
index 5050ed2..059b778 100644
--- a/debian/patches/0003-Fix-problems-with-iTunes-12.1-see-issue-100.patch
+++ b/debian/patches/0003-Fix-problems-with-iTunes-12.1-see-issue-100.patch
@@ -1,7 +1,7 @@
-From daebb1f671c9a38002c8c84911f6bbc93dede769 Mon Sep 17 00:00:00 2001
+From ebfff85afad856812d9857a5df0fab876ffbc41e Mon Sep 17 00:00:00 2001
 From: ejurgensen <espenjurgensen at gmail.com>
 Date: Fri, 6 Feb 2015 22:14:26 +0100
-Subject: [PATCH 3/3] Fix problems with iTunes 12.1, see issue #100     - don't
+Subject: [PATCH] Fix problems with iTunes 12.1, see issue #100     - don't
  announce group support to iTunes     - support for absolute http url
  streaming requests
 
@@ -10,7 +10,7 @@ Subject: [PATCH 3/3] Fix problems with iTunes 12.1, see issue #100     - don't
  1 file changed, 39 insertions(+), 20 deletions(-)
 
 diff --git a/src/httpd_daap.c b/src/httpd_daap.c
-index 50fe3de..4a7bb41 100644
+index daf6320..0e6065a 100644
 --- a/src/httpd_daap.c
 +++ b/src/httpd_daap.c
 @@ -813,7 +813,15 @@ daap_reply_server_info(struct evhttp_request *req, struct evbuffer *evbuf, char

-- 
forked-daapd packaging