make gnuradio-companion package conflict with grc to resolve file overwrite

[debian/gnuradio] / debian / control

diff --git a/debian/control b/debian/control
index 237df8385ec1bcc83be9e4d02f96674784061392..93fb61ad066c65df1362836d50a5f799b66578e1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -497,6 +497,7 @@ Description: GNU Radio Radio Astronomy Applications
 Package: gnuradio-companion
 Architecture: any
 Depends: ${python:Depends}, gnuradio, gnuradio-doc, usrp-doc, python-lxml, python-cheetah, python-gtk2
+Conflicts: grc
 Provides: ${python:Provides}
 Section: comm
 XB-Python-Version: ${python:Versions}