Update to 0.19.12-2

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0a32804f6fc..7b8a48deeab3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Feb  8 15:54:57 UTC 2016
+# Tue Feb 23 12:05:53 UTC 2016
 pkgbase = mpd-dsd
 	pkgdesc = Flexible, powerful, server-side application for playing music with DSD patches and Sox enabled
 	pkgver = 0.19.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/lintweaker/mpd-dsd-019
 	install = install
 	arch = i686
@@ -35,6 +35,7 @@ pkgbase = mpd-dsd
 	depends = libsoxr
 	depends = smbclient
 	optdepends = sox-dsd-git
+	conflicts = mpd
 	backup = etc/mpd.conf
 	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.12.tar.xz
 	source = http://www.musicpd.org/download/mpd/0.19/mpd-0.19.12.tar.xz.sig
diff --git a/PKGBUILD b/PKGBUILD
index 37c9455394de..4e3279852c10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=mpd-dsd
 pkgver=0.19.12
-pkgrel=1
+pkgrel=2
 pkgdesc='Flexible, powerful, server-side application for playing music with DSD patches and Sox enabled'
 url='https://github.com/lintweaker/mpd-dsd-019'
 license=('GPL')
@@ -18,6 +18,7 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f
          'icu' 'libupnp' 'libnfs' 'libsamplerate' 'libsoxr' 'smbclient')
 optdepends=('sox-dsd-git')
 makedepends=('boost' 'doxygen' 'automake-1.14')
+conflicts=('mpd')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
 source=("http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-${pkgver}.tar.xz"{,.sig}
         'tmpfiles.d'
@@ -63,4 +64,4 @@ package() {
 	install -Dm644 "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service
 	sed '/\[Service\]/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/mpd.service
 	sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service
-}
\ No newline at end of file
+}