minor change - added conflicts

2 files changed, 5 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 320caf837293..021ec13ae293 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencbm-git
 	pkgdesc = OpenCBM allows access to Commodore (C64) storage devices VIC 1540, 1541, 1570, 1571, or even 1581 floppy drive
-	pkgver = r1436.7134118b
+	pkgver = r1505.c4150875
 	pkgrel = 1
 	url = http://sourceforge.net/projects/opencbm/
 	arch = i686
@@ -11,9 +11,9 @@ pkgbase = opencbm-git
 	depends = libusb
 	optdepends = ncurses: enable interactive mode for cbmlinetester
 	provides = opencbm
+	conflicts = opencbm
 	backup = etc/opencbm.conf
 	source = git+https://github.com/OpenCBM/OpenCBM.git
 	md5sums = SKIP
 
 pkgname = opencbm-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5099b2f50cbe..f8165fc64768 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer: Uffe Jakobsen <microtop@starion.dk>
 #
 pkgname=opencbm-git
-pkgver=r1436.7134118b
+pkgver=r1505.c4150875
 pkgrel=1
 epoch=
 pkgdesc="OpenCBM allows access to Commodore (C64) storage devices VIC 1540, 1541, 1570, 1571, or even 1581 floppy drive"
@@ -18,7 +18,7 @@ makedepends=('git' 'cc65')
 checkdepends=()
 optdepends=('ncurses: enable interactive mode for cbmlinetester')
 provides=('opencbm')
-conflicts=()
+conflicts=('opencbm')
 replaces=()
 backup=('etc/opencbm.conf')
 options=()
@@ -46,7 +46,7 @@ prepare()
 {
   cd "${srcdir}/${_repodirname}"
   # kernel module: add includes to kernel module source
-  sed -i '\!#include <asm/uaccess.h>!s!.*!&\n#include <linux/uaccess.h>\n#include <linux/sched/signal.h>!' opencbm/sys/linux/cbm_module.c
+  #sed -i '\!#include <asm/uaccess.h>!s!.*!&\n#include <linux/uaccess.h>\n#include <linux/sched/signal.h>!' opencbm/sys/linux/cbm_module.c
   # kernel module: Makefile is needed later
   sed -i '\!-rm -f Makefile!d' opencbm/sys/linux/LINUX/Makefile
 }