summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 70a3c4473f08..5b3c657e37be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = kicad-pcb-diff
pkgdesc = Tool to generate a PDF file showing the changes between two KiCad PCB/SCH files. Also a git plug-in.
pkgver = 2.5.0
- pkgrel = 1
+ pkgrel = 4
url = https://github.com/INTI-CMNB/KiDiff
arch = any
license = GPL-2.0
@@ -21,6 +21,10 @@ pkgbase = kicad-pcb-diff
provides = kicad-diff
provides = kicad-pcb-diff
provides = python-kidiff
+ conflicts = kidiff
+ conflicts = kicad-diff
+ conflicts = kicad-pcb-diff
+ conflicts = python-kidiff
options = !strip
source = KiDiff-2.5.0.tar.gz::https://github.com/INTI-CMNB/KiDiff/archive/refs/tags/v2.5.0.tar.gz
sha256sums = 9f5bb503517b6c2a5a07fcd1761d6aa73e2c9b2597ab069a19b39d6963cb9734
diff --git a/PKGBUILD b/PKGBUILD
index c81cf31976ef..4468460c29a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=kicad-pcb-diff
pkgname=kicad-pcb-diff
pkgver=2.5.0
-pkgrel=1
+pkgrel=4
epoch=
pkgdesc="Tool to generate a PDF file showing the changes between two KiCad PCB/SCH files. Also a git plug-in."
arch=('any')
@@ -22,7 +22,7 @@ makedepends=(python-{build,installer}
python-wheel)
optdepends=("kiauto-git: KiCad automation scripts.")
provides=('kidiff' 'kicad-diff' 'kicad-pcb-diff' 'python-kidiff')
-conflicts=()
+conflicts=('kidiff' 'kicad-diff' 'kicad-pcb-diff' 'python-kidiff')
replaces=()
backup=()
options=('!strip')