summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorrliang2019-01-24 17:13:06 -0200
committerrliang2019-01-24 17:13:06 -0200
commit6485899c3b1064df3a8156fe12481eb920544fb2 (patch)
treec8623a2664f76d88a197da55cb93f673eb2dc5e7
parent7393d712489e361de2961f5014a9ced3b4e1120c (diff)
downloadaur-6485899c3b1064df3a8156fe12481eb920544fb2.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 287ccce94c0d..57df4a128c17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -36,6 +36,7 @@ pkgbase = gnome-shell-git
optdepends = evolution-data-server: Evolution calendar integration
provides = gnome-shell
conflicts = gnome-shell
+ conflicts = gnome-shell-dev
source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git
source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 798b45d2f67c..ee5d271e97b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="https://wiki.gnome.org/Projects/GnomeShell"
arch=(x86_64)
license=(GPL2)
provides=(gnome-shell)
-conflicts=(gnome-shell)
+conflicts=(gnome-shell gnome-shell-dev)
depends=(accountsservice gcr gjs gnome-bluetooth upower gnome-session gnome-settings-daemon
gnome-themes-extra gsettings-desktop-schemas libcanberra-pulse libcroco libgdm libsecret
mutter-git nm-connection-editor unzip gstreamer libibus)