summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorD. Can Celasun2021-03-09 13:10:58 +0000
committerD. Can Celasun2021-03-09 13:10:58 +0000
commitec6f5d192c0f475d2277867bc6c0605f79ff2a02 (patch)
tree0e2f2dfa2eaa6ed79039cce453be23c0d4006a59
parent221d182cd61414ef99b31213e0a6af88092d51d8 (diff)
downloadaur-ec6f5d192c0f475d2277867bc6c0605f79ff2a02.tar.gz
[visual-studio-code-bin] Re-add conflict with code
/usr/bin/code is present in both packages
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e8239c2636a9..e25530c0c30e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = visual-studio-code-bin
pkgdesc = Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)
pkgver = 1.54.1
- pkgrel = 1
+ pkgrel = 2
url = https://code.visualstudio.com/
arch = x86_64
arch = i686
@@ -21,6 +21,7 @@ pkgbase = visual-studio-code-bin
optdepends = glib2: Needed for move to trash functionality
optdepends = libdbusmenu-glib: Needed for KDE global menu
provides = code
+ conflicts = code
source = visual-studio-code.desktop
source = visual-studio-code-url-handler.desktop
sha256sums = 0deefcb638e06c35a52e7e9fb8e19b2dc393f01e5c1c122d2938cddeb22cf8de
diff --git a/PKGBUILD b/PKGBUILD
index 47850aa4d92e..271ebac33a79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
pkgname=visual-studio-code-bin
_pkgname=visual-studio-code
pkgver=1.54.1
-pkgrel=1
+pkgrel=2
pkgdesc="Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)"
arch=('x86_64' 'i686' 'aarch64' 'armv7h')
url="https://code.visualstudio.com/"
license=('custom: commercial')
provides=('code')
+conflicts=('code')
# lsof: need for terminal splitting, see https://github.com/Microsoft/vscode/issues/62991
depends=(libxkbfile gnupg gtk3 libsecret nss gcc-libs libnotify libxss glibc lsof)
optdepends=('glib2: Needed for move to trash functionality'