From 0c5fdaaafb16dc11fd2eb021dd345ce4258d8eaf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 7 Sep 2015 15:18:17 +0200 Subject: [PATCH] firefox: conflicts with firefox-esr. --- srcpkgs/firefox/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 406a373de83..b2ca689dd06 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,7 +1,7 @@ # Template build file for 'firefox'. pkgname=firefox version=40.0.3 -revision=2 +revision=3 wrksrc="mozilla-release" short_desc="Lightweight gecko-based web browser" maintainer="Juan RP " @@ -20,6 +20,7 @@ makedepends="nss-devel libjpeg-turbo-devel libpng-devel hunspell-devel libXcomposite-devel libSM-devel libXScrnSaver-devel libXt-devel libXdamage-devel" depends="desktop-file-utils hicolor-icon-theme" +conflicts="firefox-esr>=0" if [ "$CROSS_BUILD" ]; then # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find