summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoiArthurB2022-07-21 16:02:44 +0700
committerRoiArthurB2022-07-21 16:02:44 +0700
commit364dad5183199473304dea5b0cbf3d6b0fc97e97 (patch)
tree52a083888b4cb78951c7d5f0dae1880aaad3223d
parent98ae25ca4461163bc3232219b000aff91b02534b (diff)
downloadaur-364dad5183199473304dea5b0cbf3d6b0fc97e97.tar.gz
[182-RC1] Separate conflict and replaces
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f53ba332d9f4..de07315a9037 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,8 @@ pkgbase = gama-platform-jdk
arch = x86_64
groups =
license = GPL-3
+ conflicts = gama-platform
replaces = gama-platform-jdk
- replaces = gama-platform
options = !strip
options = !emptydirs
source_x86_64 = https://github.com/gama-platform/gama/releases/download/1.8.2-RC1/GAMA_1.8.2-RC1_Linux_with_JDK.deb
diff --git a/PKGBUILD b/PKGBUILD
index 30508087ad12..dc163a4fb86d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,8 @@ arch=('x86_64')
url="https://gama-platform.org"
license=('GPL-3')
groups=('')
-replaces=('gama-platform-jdk' 'gama-platform')
+replaces=('gama-platform-jdk')
+conflicts=('gama-platform')
options=('!strip' '!emptydirs')
install=${pkgname}.install
source_x86_64=("https://github.com/gama-platform/gama/releases/download/1.8.2-RC1/GAMA_1.8.2-RC1_Linux_with_JDK.deb")