provides and conflicts with gnuradio-companion

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f55d743f79eb..553d8127fdc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnuradio-git
 	pkgdesc = General purpose DSP and SDR toolkit, with drivers for usrp and fcd.
-	pkgver = 3.8tech.preview.229.g121706288
+	pkgver = 3.8tech.preview.283.g0ab1a75a8
 	pkgrel = 1
 	url = https://github.com/gnuradio/gnuradio
 	arch = i686
@@ -36,7 +36,9 @@ pkgbase = gnuradio-git
 	depends = log4cpp
 	optdepends = python-lxml: Some GRC modules use lxml optionally for improved performance
 	provides = gnuradio
+	provides = gnuradio-companion
 	conflicts = gnuradio
+	conflicts = gnuradio-companion
 	source = git://github.com/gnuradio/gnuradio.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 349e8d0b5dd2..4cdabe866fcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gnuradio-git
 _gitname=gnuradio
-pkgver=3.8tech.preview.229.g121706288
+pkgver=3.8tech.preview.283.g0ab1a75a8
 pkgrel=1
 pkgdesc="General purpose DSP and SDR toolkit, with drivers for usrp and fcd."
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ makedepends=('git' 'boost' 'cmake' 'python-cairo' 'python-yaml' 'python-cheetah'
 optdepends=('python-lxml: Some GRC modules use lxml optionally for improved performance')
 source=("git://github.com/gnuradio/gnuradio.git")
 md5sums=('SKIP')
-conflicts=('gnuradio')
-provides=('gnuradio')
+conflicts=('gnuradio' 'gnuradio-companion')
+provides=('gnuradio' 'gnuradio-companion')
 
 pkgver() {
     cd "$srcdir/$_gitname"