Added conflict in python-gnuradio-core for python-gnuradio < 3.1, which will hopefull...

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6834 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/debian/changelog b/debian/changelog
index 8f0caa88473f54fe9332ce877ccee1ac5dc3b724..e4f514581356b6db36136c8a30a4d92344d4f344 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gnuradio (3.1.svn-6824) unstable; urgency=low
+gnuradio (3.1.svn-6834) unstable; urgency=low
 
   * post release 3.1 trunk repository packages
   * see http://gnuradio.org/trac/wiki for stable branch

diff --git a/debian/control b/debian/control
index 0e980a4413b29f375fe9adc42323326cc04ff411..eefae78f30250cb88b42ee5540861affcf903995 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,7 @@ Description: Software Defined Radio
 Package: python-gnuradio-core
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
+Conflicts: python-gnuradio (< 3.1)
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}