summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Allred2016-05-30 20:27:59 -0500
committerBrian Allred2016-05-30 20:27:59 -0500
commitc9bcd3f87cfd2a8ecae6320782f9146a8a3a87e2 (patch)
tree5db2f5a6341ffc9f92cb67ae1e37b84fc4b42374
parente758d9638d5ade6a91432d1847e569c77cbe5c55 (diff)
downloadaur-c9bcd3f87cfd2a8ecae6320782f9146a8a3a87e2.tar.gz
Fix conflicts and replaces for good
-rw-r--r--.SRCINFO6
-rwxr-xr-xPKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4b0b0d39bd20..be374912238d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue May 31 01:25:16 UTC 2016
+# Tue May 31 01:27:26 UTC 2016
pkgbase = gpmdp-git
pkgdesc = A beautiful cross platform Desktop Player for Google Play Music.
pkgver = 3.2.4.72.gd25d92e
@@ -26,9 +26,9 @@ pkgbase = gpmdp-git
optdepends = libxtst
optdepends = desktop-file-utils: Needed to update desktop icon database
provides = gpmdp
- conflicts = google-play-music-player-git
+ conflicts = google-play-music-player-desktop-git
conflicts = gpmdp
- replaces = google-play-music-player-git
+ replaces = google-play-music-desktop-player-git
source = git+https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-.git
source = gpmdp.desktop
source = gpmdp-git.install
diff --git a/PKGBUILD b/PKGBUILD
index e4621f49014f..683480731cbe 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ depends=('libnotify' 'alsa-lib' 'gconf' 'gtk2' 'nss' 'avahi')
makedepends=('nodejs' 'electron' 'npm' 'git' 'gcc' 'libx11')
optdepends=('gnome-keyring' 'lsb-release' 'libxtst' 'desktop-file-utils: Needed to update desktop icon database')
provides=('gpmdp')
-replaces=('google-play-music-player-git')
-conflicts=('google-play-music-player-git' 'gpmdp')
+replaces=('google-play-music-desktop-player-git')
+conflicts=('google-play-music-player-desktop-git' 'gpmdp')
install=gpmdp-git.install
source=("git+https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-.git"
"gpmdp.desktop"