From: Bdale Garbee <bdale@gag.com>
Date: Thu, 19 Nov 2009 09:50:02 +0000 (-0700)
Subject: make gnuradio-companion package conflict with grc to resolve file overwrite
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;ds=sidebyside;h=303a675fa1e4d400d7fe3458ec5087d4f4abad9f;p=debian%2Fgnuradio

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

diff --git a/debian/changelog b/debian/changelog
index 4f37ad98..5d9ec12c 100644
--- 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 237df838..93fb61ad 100644
--- 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}