cobble a temporary changelog entry to keep this test build straight

[debian/gnuradio] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index c521bae418e5f268c6c1fb1d8866d338e59018bd..bf8d8e86de3dede841f112cd4801c31200b6d2be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,24 @@
-gnuradio (3.2.2.dfsg-2) UNRELEASED; urgency=low
+gnuradio (3.3.1.dfsg-1) UNRELEASED; urgency=low
+
+  * new upstream version
+  * add Vcs entries to the control file
+  * use maintainer-clean target, always run bootstrap before configure
+  * switch from using python-central to dh_python2
+  * switch to doxygen-latex as a build dep, closes: #616252
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 04 Mar 2011 08:33:04 -0700
+
+gnuradio (3.2.2.dfsg-2) unstable; 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
-  * patch from Kamal Mostafa to make libusrp packages depend on adduser,
-    closes: #566564, #566565
+  * 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, 02 Mar 2010 15:08:41 -0700
+ -- Bdale Garbee <bdale@gag.com>  Tue, 08 Jun 2010 20:05:02 -0600
 
 gnuradio (3.2.2.dfsg-1) unstable; urgency=low