summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbinex-dsk2020-12-14 13:57:58 -0500
committerbinex-dsk2020-12-14 13:57:58 -0500
commit922d768c86f2b88458d80b021fe797879c40f861 (patch)
tree557cd047f74153253a0d8ce9fb843ddbeeb02644
parenta5906bf76901371843144f060f3298435ab4931f (diff)
downloadaur-922d768c86f2b88458d80b021fe797879c40f861.tar.gz
removed conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 561dbf46aa80..9c358c6094c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vscodium-bin
pkgdesc = Binary releases of VS Code without MS branding/telemetry/licensing.
pkgver = 1.52.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/VSCodium/vscodium
arch = x86_64
arch = aarch64
@@ -21,8 +21,6 @@ pkgbase = vscodium-bin
optdepends = gvfs: For move to trash functionality
optdepends = libdbusmenu-glib: For KDE global menu
provides = code
- conflicts = code
- conflicts = vscode
source = vscodium-bin.desktop
sha256sums = 65e6b053e6d8be61763801312ded64a82cf835d77a6eabe1b9d7eb9e87b2e49b
source_x86_64 = https://github.com/VSCodium/vscodium/releases/download/1.52.0/VSCodium-linux-x64-1.52.0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 38ac9d49fdb1..20a9453145b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=vscodium-bin
_pkgname=VSCodium
pkgver=1.52.0
-pkgrel=1
+pkgrel=2
pkgdesc="Binary releases of VS Code without MS branding/telemetry/licensing."
arch=('x86_64' 'aarch64' 'armv7h')
url="https://github.com/VSCodium/vscodium"
@@ -20,7 +20,6 @@ optdepends=(
'libdbusmenu-glib: For KDE global menu'
)
provides=('code')
-conflicts=('code' 'vscode')
sha256sums=('65e6b053e6d8be61763801312ded64a82cf835d77a6eabe1b9d7eb9e87b2e49b')
sha256sums_x86_64=('7be0fa9177401bc187186bf808a348de37cc4008e67e2705700108f438f26484')