eliminate conflict with grc since we're renaming our binary

[debian/gnuradio] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5d9ec12c71834df879d263199cdd16715d4e0081..23bae0cf571e662ce4f2319e6687a10050ed66b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 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
+  * resolve gnuradio-companion conflict with grc by renaming our binary,
+    closes: #557050
+  * accept patches that remove moc files and make libusrp packages depend 
+    on adduser, closes: #566564, #566565, #574209, #574231, #574209
+  * stop delivering custom prefs.py, closes: #559640
+  * lose the conflicts on python-wxgtk2.6, closes: #582486
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 08 Jun 2010 20:05:02 -0600
 
 gnuradio (3.2.2.dfsg-1) unstable; urgency=low