summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan2007-11-08 18:33:03 +0000
committerjcorgan2007-11-08 18:33:03 +0000
commit3d2a76f4eeede13bdb4fcf628409a0086ae61737 (patch)
treef659ab44889535ae385629ee58f57a50558e2d06
parent014ae1c4fd0a0d77535a2a777aeb88f83fafee96 (diff)
downloadgnuradio-3d2a76f4eeede13bdb4fcf628409a0086ae61737.tar.gz
gnuradio-3d2a76f4eeede13bdb4fcf628409a0086ae61737.tar.bz2
gnuradio-3d2a76f4eeede13bdb4fcf628409a0086ae61737.zip
Added conflict in python-gnuradio-core for python-gnuradio < 3.1, which will hopefully force the prior package to be deinstalled when upgrading.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6834 221aa14e-8319-0410-a670-987f0aec2ac5
-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}