summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Marie de Rodat2018-03-11 11:17:16 +0100
committerPierre-Marie de Rodat2018-03-11 11:17:45 +0100
commit41eb3d5f996ff2c0cd76b002cbd1d34894ca8414 (patch)
tree5c8eba3a00cffabd2af4b73cd20c5ee09d0bd25f
parentef5fd2ac22e31968c09bf87ad9637e12eefb6727 (diff)
downloadaur-gnatcoll-core-git.tar.gz
Make this package conflict with the legacy "gnatcoll"
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f9bbeb7ac1..dec5bb3e962 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gnatcoll-core-git
pkgdesc = GNAT Components Collection - Core packages
pkgver = r2835.ed921e27
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/AdaCore/gnatcoll-core/
arch = i686
arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = gnatcoll-core-git
depends = libgpr
provides = gnatcoll-core
conflicts = gnatcoll-core
+ conflicts = gnatcoll
source = git+https://github.com/AdaCore/gnatcoll-core.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d8998c9dd40..f1dd0a4b678 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=gnatcoll-core-git
pkgver=r2835.ed921e27
-pkgrel=1
+pkgrel=2
pkgdesc='GNAT Components Collection - Core packages'
url='https://github.com/AdaCore/gnatcoll-core/'
@@ -13,7 +13,7 @@ depends=('gcc-ada' 'libgpr')
makedepends=('git' 'gprbuild')
provides=('gnatcoll-core')
-conflicts=('gnatcoll-core')
+conflicts=('gnatcoll-core' 'gnatcoll')
source=('git+https://github.com/AdaCore/gnatcoll-core.git')
sha1sums=('SKIP')