[visual-studio-code-bin] Re-add conflict with code

/usr/bin/code is present in both packages
This commit is contained in:
D. Can Celasun 2021-03-09 13:10:58 +00:00
parent 221d182cd6
commit ec6f5d192c
2 changed files with 4 additions and 2 deletions

View file

@ -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

View file

@ -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'