Initial commit

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd7bac6ed6bd..aa6ad58178e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,6 +19,7 @@ pkgbase = linuxcnc-bin
 	depends = psmisc
 	provides = linuxcnc
 	conflicts = linuxcnc
+	conflicts = linuxcnc-git
 	source = linuxcnc-bin-2.8.0.deb::http://linuxcnc.org/dists/stretch/2.8-rtpreempt/binary-amd64/linuxcnc-uspace_2.8.0_amd64.deb
 	sha256sums = 86fc5708552300316add400c83afe56537c15ae9ab5d9c597c87f4c9b0d2316b
 
diff --git a/PKGBUILD b/PKGBUILD
index fa82c0df25f1..33da772e9a14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ depends=('bc'
          'procps-ng'
          'psmisc')
 provides=('linuxcnc')
-conflicts=('linuxcnc')
+conflicts=('linuxcnc' 'linuxcnc-git')
 source=("${pkgname}-${pkgver}.deb::http://linuxcnc.org/dists/stretch/2.8-rtpreempt/binary-amd64/linuxcnc-uspace_${pkgver}_amd64.deb")
 sha256sums=('86fc5708552300316add400c83afe56537c15ae9ab5d9c597c87f4c9b0d2316b')