remove conflicts on python-wxgtk2.6

[debian/gnuradio] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index a2d90a0cd97b63d95354389dfa624e20ab263987..c930917e2717b587832cbf7d05fc121750a87605 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,19 @@
-gnuradio (3.2.2-1) unstable; urgency=low
+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
+  * 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>  Thu, 22 Apr 2010 22:45:26 -0600
+
+gnuradio (3.2.2.dfsg-1) unstable; urgency=low
 
   * new upstream version, includes gcc4.3 support, closes: #474801, #524387
+  * upstream tarball modified to elide unnecessary Altera-licensed files 
   * merge debian/ content restructuring from upstream svn
   * change build-dep from fftw3-dev to libfftw3-dev, closes: #458231
   * fix problem with rebuilding, closes: #441739
@@ -9,7 +22,7 @@ gnuradio (3.2.2-1) unstable; urgency=low
   * rebuild reflects python-central file location change, closes: #490513
   * change Jack build depend to libjack-dev, closes: #527413
 
- -- Bdale Garbee <bdale@gag.com>  Tue, 15 Sep 2009 23:37:57 -0600
+ -- Bdale Garbee <bdale@gag.com>  Sun, 01 Nov 2009 15:13:54 -0700
 
 gnuradio (3.0.4-2) unstable; urgency=high