summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorD. Can Celasun2021-03-04 20:28:26 +0000
committerD. Can Celasun2021-03-04 20:28:26 +0000
commite3a62000765950e69ffd15aa035ab10ba9755819 (patch)
tree1e5d378bad15c29e52a2f959c57ccc8e80de6521
parented5b3310fd198aa74c62e98fc6d4ca45ce0dbc71 (diff)
downloadaur-e3a62000765950e69ffd15aa035ab10ba9755819.tar.gz
[visual-studio-code-bin] Remove conflict with code
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6e225afa3966..d0c18fe5616d 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.0
- pkgrel = 1
+ pkgrel = 2
url = https://code.visualstudio.com/
arch = x86_64
arch = i686
@@ -21,7 +21,6 @@ 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 89de2e4e750e..95f3d0c0afb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,12 @@
pkgname=visual-studio-code-bin
_pkgname=visual-studio-code
pkgver=1.54.0
-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'