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

diff --git a/debian/changelog b/debian/changelog
index 4f37ad986a9a2f5680c95e7f19d547edb7466179..5d9ec12c71834df879d263199cdd16715d4e0081 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnuradio (3.2.2.dfsg-2) UNRELEASED; urgency=low
+
+  * fix typos in short package descriptions, closes: #556572
+  * make gnuradio-companion conflict with grc to resolve conflict over the
+    file named /usr/bin/grc, closes: #557050
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 19 Nov 2009 02:49:40 -0700
+
 gnuradio (3.2.2.dfsg-1) unstable; urgency=low
 
   * new upstream version, includes gcc4.3 support, closes: #474801, #524387

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}