summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian 'Swift Geek' Grzywna2017-10-19 08:16:45 +0200
committerSebastian 'Swift Geek' Grzywna2017-10-19 08:16:45 +0200
commita57848ea896272ce328b7ed3bb8bbb9a1593bc3b (patch)
tree8f174e953de9583ae27d19bbb887fb4718f287af
parent5ce2ebc1fc620fb3d11a4c1d812aecaeb8db3867 (diff)
downloadaur-a57848ea896272ce328b7ed3bb8bbb9a1593bc3b.tar.gz
Add kicad-library-3d and kicad-library to conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 5 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abb2657016c1..e5123c325fe6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Thu Oct 19 06:15:50 UTC 2017
pkgbase = kicad-library-git
pkgdesc = The schematic and 3D libraries supported by KiCad team
pkgver = a
@@ -8,6 +10,8 @@ pkgbase = kicad-library-git
makedepends = cmake
makedepends = git
conflicts = kicad-library-bzr
+ conflicts = kicad-library-3d
+ conflicts = kicad-library
source = git://github.com/KiCad/kicad-library.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 59e549f3691e..19acb1ed513b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ arch=('any')
url="https://github.com/KiCad/kicad-library"
license=('GPL')
makedepends=('cmake' 'git')
-conflicts=('kicad-library-bzr')
+conflicts=('kicad-library-bzr' 'kicad-library-3d' 'kicad-library')
source=("git://github.com/KiCad/kicad-library.git")
md5sums=('SKIP')