summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorrliang2019-01-24 17:14:00 -0200
committerrliang2019-01-24 17:14:00 -0200
commit4d809bdc62e65c4a263048ba34a49c40572e4a44 (patch)
tree86e974f646cb5abaa4cfe014ac8a2734f10cbce7
parentdaea8fdf95146023fb41a696ef8f69f5ed35c742 (diff)
downloadaur-4d809bdc62e65c4a263048ba34a49c40572e4a44.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 95cfe50999e6..d5418798632e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,6 +27,7 @@ pkgbase = mutter-git
depends = pipewire
provides = mutter
conflicts = mutter
+ conflicts = mutter-dev
source = git+https://gitlab.gnome.org/GNOME/mutter.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index aadff4b06b22..4ebd58539c34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url="https://gitlab.gnome.org/GNOME/mutter"
arch=(x86_64)
license=(GPL)
provides=(mutter)
-conflicts=(mutter)
+conflicts=(mutter mutter-dev)
depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas-git libcanberra
startup-notification zenity libsm gnome-desktop upower libxkbcommon-x11
gnome-settings-daemon libgudev libinput pipewire)