summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Jicheng2022-05-22 01:02:54 +0800
committerChen Jicheng2022-05-22 01:02:54 +0800
commit30680008d05da0661e3cc64d772a4592faa03a68 (patch)
tree5c0216d66dd5715749a9aa040b1e5db1771e639b
parent5faaf5cd82da8087751f4860c8ac7f6660202154 (diff)
downloadaur-30680008d05da0661e3cc64d772a4592faa03a68.tar.gz
Add conflicts
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d418c4536fc7..891834ca31bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,7 @@ pkgbase = firefox-nightly-bin
optdepends = libnotify: notification integration
optdepends = networkmanager: location detection via available WiFi networks
optdepends = speech-dispatcher: text-to-speech
+ conflicts = firefox-nightly
source = firefox-nightly.desktop
source = policies.json
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
diff --git a/PKGBUILD b/PKGBUILD
index b609838d9a49..54c702457b70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,6 +14,7 @@ pkgrel=1
arch=(i686 x86_64)
license=(MPL GPL LGPL)
depends=(dbus-glib gtk3 libxt nss mime-types)
+conflicts=(firefox-nightly)
optdepends=('pulseaudio: audio support'
'ffmpeg: h.264 video'
'hunspell: spell checking'