Remove invalid/deprecated avahi config file. This should fix issues advertising the server to iTunes.

3 files changed, 4 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4908f2c0b1a6..bd7641b0b182 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = forked-daapd
 	pkgdesc = iTunes-compatible media server, originally intended as a rewrite of Firefly Media Server (mt-daapd).
 	pkgver = 26.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ejurgensen/forked-daapd
 	install = forked-daapd.install
 	arch = armv6h
@@ -24,35 +24,28 @@ pkgbase = forked-daapd
 	depends = protobuf-c
 	depends = json-c
 	backup = etc/forked-daapd.conf
-	backup = etc/avahi/services/forked-daapd.service
 	source = https://github.com/ejurgensen/forked-daapd/archive/26.0.tar.gz
 	source = forked-daapd.install
-	source = forked-daapd.avahi
 	source = forked-daapd.service
 	source = http://www.antlr3.org/download/antlr-3.4-complete.jar
 	md5sums = eeaa8fabb1486d3c4f240a69770f8643
 	md5sums = bad1372140c914d1c312a186087fe375
-	md5sums = c01fde6f40880fed6092c0830a5f232e
 	md5sums = 5047515b396f37a9030a003f12eaaafa
 	md5sums = 1b91dea1c7d480b3223f7c8a9aa0e172
 	sha1sums = b96213397a13910955f74a45d01d46909e80e724
 	sha1sums = 90a796470231ae7c22635c3fbbb47f9d8a61ebd6
-	sha1sums = a6f3c5ee05365481caaa569fe15ca34ffe4dc847
 	sha1sums = 76623036d11d411cb438f9ac8f9cdf21f12b305f
 	sha1sums = 5cab59d859caa6598e28131d30dd2e89806db57f
 	sha256sums = 66d4319a8355b56a98ce62e043db48bd523c7723ddeacebfd6e4a577d10db7d4
 	sha256sums = 19b394a38ac88247d6b7d939e648ac53e8f08bef852e76c79355d1231bffad3d
-	sha256sums = 0efc8aac56d2b3a70d74c90a72595f3b685a30ee94a278880cd0cc4db35fa113
 	sha256sums = f623bfe983e65bd5c658bb456b775c62812e3daf8a5f27d154cf70c48c1e51bf
 	sha256sums = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7
 	sha384sums = ec18167763acadf6bc1f79106516850cfbccf733113f8831c2238cfb79e849e450fbe7026261a386acf3993e290b145a
 	sha384sums = b536551061e8404f0128e9313411c9f2419d7bf4c982c8d9f32300727c873219d90c90bda32256fb9d3bd560c0be2704
-	sha384sums = 36bdb6cfc389572f7f34658307b68f31d79ba9a5827eeee60c43f042f3d75d90c9d76e90840258e57e59c5c4d8d47d52
 	sha384sums = a4dc8c4a504496a624e210ac668e5190eb6756a4f7f2825c42624f424723ddfd0c0338fa753ad1d61944d3bdf08451a7
 	sha384sums = a2fbecb5fae6af12adcfb3801624d4941e25e4b526794f7b9a713ae8b6873962ca36a74f9220d7e0057aaa89d5ca6d68
 	sha512sums = d02b153c8d8fe0564f208b8ce237d5add9287dd7f67a302c482b71f332b4153c4211b5f5513c33935ed32228d660e2c85a264191f60ae8d86e5d5f0ce9a05cc0
 	sha512sums = f82c8b73b39e6b8e83b09953d187b98b9fb856914a0a231b6758701f4f383b5dd5368ec468011b78402fd9850662b61b48e6198336ed4049cfd1ed7cb8659e9b
-	sha512sums = 70da9a199ac821736ea6cd33455c14cf32ab5bc4b401dc31179dc6029c36fcb543810d0041f309fdcfd7be84d7d1f921b63a70993ad89b6f0c1ea06e51859dfb
 	sha512sums = bc32f4cb705bf3890e85a51530818a1d86b260c1f6c1203b0f07757a8ab23b7654a357bc9c7ab10b370f4714f26b60368c1910c7efe9197041015183518a40d6
 	sha512sums = 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d390a388f85..42b35f96c4a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: John-Michael Mulesa <jmulesa@gmail.com>
 pkgname=forked-daapd
 pkgver=26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="iTunes-compatible media server, originally intended as a rewrite of Firefly Media Server (mt-daapd)."
 arch=('armv6h' 'armv7h' 'i686' 'x86_64')
 url="https://github.com/ejurgensen/forked-daapd"
@@ -13,35 +13,30 @@ optdepends=()
 provides=()
 conflicts=()
 replaces=()
-backup=(etc/forked-daapd.conf etc/avahi/services/forked-daapd.service)
+backup=(etc/forked-daapd.conf)
 options=()
 install=forked-daapd.install
 changelog=
-source=(https://github.com/ejurgensen/forked-daapd/archive/$pkgver.tar.gz forked-daapd.install forked-daapd.avahi forked-daapd.service http://www.antlr3.org/download/antlr-3.4-complete.jar)
+source=(https://github.com/ejurgensen/forked-daapd/archive/$pkgver.tar.gz forked-daapd.install forked-daapd.service http://www.antlr3.org/download/antlr-3.4-complete.jar)
 noextract=()
 md5sums=('eeaa8fabb1486d3c4f240a69770f8643'
          'bad1372140c914d1c312a186087fe375'
-         'c01fde6f40880fed6092c0830a5f232e'
          '5047515b396f37a9030a003f12eaaafa'
          '1b91dea1c7d480b3223f7c8a9aa0e172')
 sha1sums=('b96213397a13910955f74a45d01d46909e80e724'
           '90a796470231ae7c22635c3fbbb47f9d8a61ebd6'
-          'a6f3c5ee05365481caaa569fe15ca34ffe4dc847'
           '76623036d11d411cb438f9ac8f9cdf21f12b305f'
           '5cab59d859caa6598e28131d30dd2e89806db57f')
 sha256sums=('66d4319a8355b56a98ce62e043db48bd523c7723ddeacebfd6e4a577d10db7d4'
             '19b394a38ac88247d6b7d939e648ac53e8f08bef852e76c79355d1231bffad3d'
-            '0efc8aac56d2b3a70d74c90a72595f3b685a30ee94a278880cd0cc4db35fa113'
             'f623bfe983e65bd5c658bb456b775c62812e3daf8a5f27d154cf70c48c1e51bf'
             '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7')
 sha384sums=('ec18167763acadf6bc1f79106516850cfbccf733113f8831c2238cfb79e849e450fbe7026261a386acf3993e290b145a'
             'b536551061e8404f0128e9313411c9f2419d7bf4c982c8d9f32300727c873219d90c90bda32256fb9d3bd560c0be2704'
-            '36bdb6cfc389572f7f34658307b68f31d79ba9a5827eeee60c43f042f3d75d90c9d76e90840258e57e59c5c4d8d47d52'
             'a4dc8c4a504496a624e210ac668e5190eb6756a4f7f2825c42624f424723ddfd0c0338fa753ad1d61944d3bdf08451a7'
             'a2fbecb5fae6af12adcfb3801624d4941e25e4b526794f7b9a713ae8b6873962ca36a74f9220d7e0057aaa89d5ca6d68')
 sha512sums=('d02b153c8d8fe0564f208b8ce237d5add9287dd7f67a302c482b71f332b4153c4211b5f5513c33935ed32228d660e2c85a264191f60ae8d86e5d5f0ce9a05cc0'
             'f82c8b73b39e6b8e83b09953d187b98b9fb856914a0a231b6758701f4f383b5dd5368ec468011b78402fd9850662b61b48e6198336ed4049cfd1ed7cb8659e9b'
-            '70da9a199ac821736ea6cd33455c14cf32ab5bc4b401dc31179dc6029c36fcb543810d0041f309fdcfd7be84d7d1f921b63a70993ad89b6f0c1ea06e51859dfb'
             'bc32f4cb705bf3890e85a51530818a1d86b260c1f6c1203b0f07757a8ab23b7654a357bc9c7ab10b370f4714f26b60368c1910c7efe9197041015183518a40d6'
             '04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2')
 
@@ -64,6 +59,5 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   install -D -m644 "$srcdir/forked-daapd.service" "$pkgdir/usr/lib/systemd/system/forked-daapd.service"
-  install -D -m644 "$srcdir/forked-daapd.avahi" "$pkgdir/etc/avahi/services/forked-daapd.service"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/forked-daapd.avahi b/forked-daapd.avahi
deleted file mode 100644
index 479e54f02170..000000000000
--- a/forked-daapd.avahi
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  This file is part of avahi.
- 
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or (at your option) any later version.
-
-  avahi is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
--->
-
-<!-- See avahi.service(5) for more information about this configuration file -->
-
-<service-group>
-
-  <name replace-wildcards="yes">%h</name>
-
-  <service>
-    <type>_daap._tcp</type>
-    <port>3689</port>
-  </service>
-  
-  <service>
-    <type>_rsp._tcp</type>
-    <port>3689</port>
-  </service>
-
-</service-group>