aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2016-03-21 14:05:46 -0700
committerMartin Braun <martin.braun@ettus.com>2016-03-21 14:05:46 -0700
commitf045ee5199f50df8876fd943d7cc7572df22a28c (patch)
tree41377ad1649aff60828ac5ec193fd9208e8467d4
parent523a17872cea70832032d7040f592106226c9b50 (diff)
parentf0720677d6d02acbeb22d17595f767905c9b240b (diff)
downloaduhd-f045ee5199f50df8876fd943d7cc7572df22a28c.tar.gz
uhd-f045ee5199f50df8876fd943d7cc7572df22a28c.tar.bz2
uhd-f045ee5199f50df8876fd943d7cc7572df22a28c.zip
Merge branch 'maint'
-rw-r--r--CHANGELOG5
-rw-r--r--host/cmake/debian/changelog16
-rwxr-xr-xtools/debs/convert_changelog.py20
3 files changed, 35 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7b7e97908..b91d5fb4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,11 +7,12 @@ Change Log for Releases
connected on a Windows machine, more graceful handling of USB disconnects,,
provided .cdf file for installing on Windows
* B200: Fixed memory growth/increasing tune times issue
-* E300: Fixed memory leak with udev, fixed issue with autoboot value, fixed
- writing of, fixes to button behaviour
+* E300: Fixed memory leak with udev, fixed issue with autoboot value, fixes
+ to button behaviour
* usrp2, usrp3: Fixed IQ imbalance and DC bias in DDC chain
* CMake: Windows registry fixes
* Fixed several compiler warnings and minor bugs
+* Examples: Updated benchmark_rate for improved thread safety
## 003.009.002
* E310: Added support for Speedgrade 3
diff --git a/host/cmake/debian/changelog b/host/cmake/debian/changelog
index 40f04bf74..75aeeab81 100644
--- a/host/cmake/debian/changelog
+++ b/host/cmake/debian/changelog
@@ -1,3 +1,19 @@
+uhd (3.9.3-0ubuntu1) trusty; urgency=low
+
+ * UBX: Fixed a phase synchronization issue on the sub-1GHz band
+ * USB: Fixed transport issue that crashed when multiple USB devices were
+ connected on a Windows machine, more graceful handling of USB disconnects,,
+ provided .cdf file for installing on Windows
+ * B200: Fixed memory growth/increasing tune times issue
+ * E300: Fixed memory leak with udev, fixed issue with autoboot value, fixes
+ to button behaviour
+ * usrp2, usrp3: Fixed IQ imbalance and DC bias in DDC chain
+ * CMake: Windows registry fixes
+ * Fixed several compiler warnings and minor bugs
+ * Examples: Updated benchmark_rate for improved thread safety
+
+ -- Ettus Research <packages@ettus.com> Mon, 21 Mar 2016 11:40:26 -0800
+
uhd (3.9.2-0ubuntu1) trusty; urgency=low
* E310: Added support for Speedgrade 3
diff --git a/tools/debs/convert_changelog.py b/tools/debs/convert_changelog.py
index 5d12a958c..eaad680fa 100755
--- a/tools/debs/convert_changelog.py
+++ b/tools/debs/convert_changelog.py
@@ -53,10 +53,22 @@ def get_footer(uploader_name, uploader_email):
if __name__ == "__main__":
parser = OptionParser()
- parser.add_option("--input-file", type="string", help="Input UHD top-level changelog file")
- parser.add_option("--output-file", type="string", help="Output Debian changelog file (will append onto existing)")
- parser.add_option("--uploader-name", type="string", help="Uploader name (must match GPG key)")
- parser.add_option("--uploader-email", type="string", help="Uploader email (must match GPG key)")
+ parser.add_option(
+ "--input-file", type="string", default='CHANGELOG',
+ help="Input UHD top-level changelog file"
+ )
+ parser.add_option("--output-file",
+ type="string", default='host/cmake/debian/changelog',
+ help="Output Debian changelog file (will append onto existing)"
+ )
+ parser.add_option("--uploader-name",
+ type="string", default='Ettus Research',
+ help="Uploader name (must match GPG key)",
+ )
+ parser.add_option("--uploader-email",
+ type="string", default='packages@ettus.com',
+ help="Uploader email (must match GPG key)"
+ )
parser.add_option("--last-version", type="string", help="Manually specify last version (Debian format)", default="")
(options, args) = parser.parse_args()