summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8f0caa884..e4f514581 100644
--- 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 0e980a441..eefae78f3 100644
--- 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}