summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2017-12-01 18:20:06 +0100
committerAndreas Grapentin <andreas@grapentin.org>2017-12-01 18:20:06 +0100
commit0f7c95d2d0f81762427c7e7e2606fead048c9f1f (patch)
treea326944227366cd94ce05d3770691dacbbd7607a /libre
parent4ddea0cb84fc089dd7f14932ec817b9d8983acc3 (diff)
downloadabslibre-0f7c95d2d0f81762427c7e7e2606fead048c9f1f.tar.gz
abslibre-0f7c95d2d0f81762427c7e7e2606fead048c9f1f.tar.bz2
abslibre-0f7c95d2d0f81762427c7e7e2606fead048c9f1f.zip
libre/iceweasel: fixing conflicts array
Diffstat (limited to 'libre')
-rw-r--r--libre/iceweasel/PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index fdbcb71d6..3b6c0c803 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -20,7 +20,7 @@ pkgname=iceweasel
epoch=1
pkgver=57.0.1
-pkgrel=1
+pkgrel=2
_brandingver=57.0
_brandingrel=1
_parabolarepo=https://repo.parabola.nu/other/iceweasel
@@ -41,8 +41,8 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'libnotify: Notification integration'
'speech-dispatcher: Text-to-Speech')
-replaces=("$pkgname-libre" "$_oldname" 'firefox')
-conflicts=("$pkgname-libre" "$_oldname")
+replaces=("$_oldname-libre" "$pkgname-libre" "$_oldname")
+conflicts=("$_oldname-libre" "$pkgname-libre" "$_oldname")
options=(!emptydirs !makeflags !strip debug)