aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rw-r--r--host/cmake/Modules/UHDVersion.cmake8
-rw-r--r--host/cmake/debian/changelog20
2 files changed, 25 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 60430ec90..3a39a40cf 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -15,13 +15,15 @@ find_package(Git QUIET)
# - Increment API on API changes
# - Increment ABI on ABI changes
# - Increment patch for bugfixes and docs
+# (but use 'git' for master to represent 'ahead of the latest stable
+# release)
# - set UHD_VERSION_DEVEL to true for master and development branches
########################################################################
set(UHD_VERSION_MAJOR 4)
-set(UHD_VERSION_API 1)
+set(UHD_VERSION_API 2)
set(UHD_VERSION_ABI 0)
-set(UHD_VERSION_PATCH 0)
-set(UHD_VERSION_DEVEL FALSE)
+set(UHD_VERSION_PATCH git)
+set(UHD_VERSION_DEVEL TRUE)
########################################################################
# If we're on a development branch, we skip the patch version
diff --git a/host/cmake/debian/changelog b/host/cmake/debian/changelog
index c2aa25a0d..a61758fbe 100644
--- a/host/cmake/debian/changelog
+++ b/host/cmake/debian/changelog
@@ -1,3 +1,23 @@
+uhd (4.1.0.1-0ubuntu1) ubuntu_release; urgency=low
+
+ * cmake
+ - remove redundant include
+ - correctly set and unset any CMAKE_REQUIRED variables
+ - fix finding PkgConfig to work robustly (without CMake warnings)
+ * core
+ - remove boost::math in favor of std cmath
+ * docs
+ - x4xx: Update information on CPLD updating
+ - usrp_x4xx: improve filesystem update instructions
+ * mpm
+ - zbx: Fix revision compat check
+ - Update usrp_update_fs to support X410
+ - max10_cpld_flash_ctrl: improve programming log
+ - Skip DTS compatibility check if DTS is not being updated
+
+ -- Ettus Research <packages@ettus.com> Mon, 12 Jul 2021 04:29:39 -0800
+
+
uhd (4.1.0.0-0ubuntu1) ubuntu_release; urgency=low
* adf535x