[Commit-gnuradio] r7286 - gnuradio/branches/releases/3.1/debian

[jcorgan]

Author: jcorgan
Date: 2007-12-27 13:34:50 -0700 (Thu, 27 Dec 2007)
New Revision: 7286

Modified:
   gnuradio/branches/releases/3.1/debian/control
Log:
Applied changeset r6834 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/debian/control
===================================================================
--- gnuradio/branches/releases/3.1/debian/control       2007-12-27 20:32:12 UTC 
(rev 7285)
+++ gnuradio/branches/releases/3.1/debian/control       2007-12-27 20:34:50 UTC 
(rev 7286)
@@ -54,6 +54,7 @@
 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}