summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Blakeney2018-01-11 14:23:31 +1000
committerMark Blakeney2018-01-11 14:23:31 +1000
commita03132403f329b309b8b7192904d3c161a929c6b (patch)
tree0040a59fc861b4f7751e2696ea7ddbb52b5d2242
parent55ee3d26bd0d2c2324c6974f2ad1646e8dde00d0 (diff)
downloadaur-a03132403f329b309b8b7192904d3c161a929c6b.tar.gz
Fix up package conflicts
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87853fa50051..432ce6a22d72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = skypeforlinux-preview-bin
pkgdesc = Skype for Linux - Preview/Insider Version
pkgver = 8.13.76.8
- pkgrel = 1
+ pkgrel = 2
url = http://www.skype.com
arch = x86_64
license = custom
@@ -16,8 +16,8 @@ pkgbase = skypeforlinux-preview-bin
provides = skypeforlinux
conflicts = skypeforlinux
conflicts = skypeforlinux-bin
- conflicts = skypeforlinux-preview-bin-stable-bin
- conflicts = skypeforlinux-preview-bin-beta-bin
+ conflicts = skypeforlinux-stable-bin
+ conflicts = skypeforlinux-beta-bin
replaces = skypeforlinux-bin
source = https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.13.76.8_amd64.deb
sha256sums = 3d75df92f00743f76a799534fe522ffbce44b996273cadb378182ac9f7fabfee
diff --git a/PKGBUILD b/PKGBUILD
index 91b5923570fd..4609e1965e89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
_pkgname=skypeforlinux
pkgname=$_pkgname-preview-bin
pkgver=8.13.76.8
-pkgrel=1
+pkgrel=2
pkgdesc="Skype for Linux - Preview/Insider Version"
arch=("x86_64")
url="http://www.skype.com"
license=("custom")
depends=("gtk2" "libxss" "gconf" "alsa-lib" "libxtst" "libsecret" "nss")
optdepends=("gnome-keyring")
-conflicts=("$_pkgname" "$_pkgname-bin" "$pkgname-stable-bin" "$pkgname-beta-bin")
+conflicts=("$_pkgname" "$_pkgname-bin" "$_pkgname-stable-bin" "$_pkgname-beta-bin")
provides=("$_pkgname")
replaces=("$_pkgname-bin")
source=("https://repo.skype.com/deb/pool/main/s/$_pkgname/${_pkgname}_${pkgver}_amd64.deb")