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

[debian/gnuradio] / debian / changelog

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