From 327f294e2717512bec71907e5f43b5532f03dd2c Mon Sep 17 00:00:00 2001 From: Marian Koop Date: Thu, 6 Jun 2024 14:41:43 +0200 Subject: [PATCH] lib: Bump version to 4.7.0.0 --- host/cmake/Modules/UHDVersion.cmake | 2 +- host/cmake/debian/README.Debian | 5 ++++- host/cmake/debian/control | 10 +++++----- .../{libuhd4.6.0.install => libuhd4.7.0.install} | 0 host/cmake/debian/rules | 8 ++++---- tools/debs/upload_debs.sh | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) rename host/cmake/debian/{libuhd4.6.0.install => libuhd4.7.0.install} (100%) diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 971c03a3fc..7a6de88c0e 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -20,7 +20,7 @@ find_package(Git QUIET) # - set UHD_VERSION_DEVEL to true for master and development branches ######################################################################## set(UHD_VERSION_MAJOR 4) -set(UHD_VERSION_API 6) +set(UHD_VERSION_API 7) set(UHD_VERSION_ABI 0) set(UHD_VERSION_PATCH 0) set(UHD_VERSION_DEVEL TRUE) diff --git a/host/cmake/debian/README.Debian b/host/cmake/debian/README.Debian index 0b54755c8b..f96ba24b4e 100644 --- a/host/cmake/debian/README.Debian +++ b/host/cmake/debian/README.Debian @@ -25,7 +25,7 @@ Settings will not take effect until the user has logged in and out. Multiple packages ----------------- -libuhd4.3.0: +libuhd4.x.x: Small package just for the library itself. libuhd-dev: @@ -41,6 +41,9 @@ uhd-host: directories. The utils include tools for managing the flash memory or EEPROM configuration of various USRPs. +python3-uhd: + The python3-uhd package to access the library from Python 3. + Python examples are included in the uhd-host package. UHD Firmware / FPGA images diff --git a/host/cmake/debian/control b/host/cmake/debian/control index 2bed053047..8bde0923ad 100644 --- a/host/cmake/debian/control +++ b/host/cmake/debian/control @@ -2,7 +2,7 @@ Source: uhd Section: science Priority: optional Maintainer: Ettus Research -Uploaders: Aki Tomita +Uploaders: Joerg Hofrichter Build-Depends: cmake, debhelper (>= 9), libboost-date-time-dev, @@ -33,7 +33,7 @@ Vcs-Git: https://github.com/EttusResearch/uhd.git Package: uhd-host Architecture: any -Depends: libuhd4.6.0 (= ${binary:Version}), +Depends: libuhd4.7.0 (= ${binary:Version}), python3, python3-mako, python3-numpy, @@ -56,7 +56,7 @@ Description: hardware driver for Ettus Research products - host apps display hardware configuration information, and Doxygen generated documentation. -Package: libuhd4.6.0 +Package: libuhd4.7.0 Architecture: any Section: libs Pre-Depends: ${misc:Pre-Depends} @@ -74,7 +74,7 @@ Description: hardware driver for Ettus Research products Package: libuhd-dev Architecture: any Section: libdevel -Depends: libuhd4.6.0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Depends: libuhd4.7.0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Recommends: gnuradio-dev Suggests: uhd-doc Description: universal hardware driver for Ettus Research products @@ -90,7 +90,7 @@ Description: universal hardware driver for Ettus Research products Package: python3-uhd Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 m68k mips64el ppc64 ppc64el riscv64 s390x sparc64 x32 Section: libdevel -Depends: libuhd4.6.0 (= ${binary:Version}), +Depends: libuhd4.7.0 (= ${binary:Version}), python3, python3-mako, python3-numpy, diff --git a/host/cmake/debian/libuhd4.6.0.install b/host/cmake/debian/libuhd4.7.0.install similarity index 100% rename from host/cmake/debian/libuhd4.6.0.install rename to host/cmake/debian/libuhd4.7.0.install diff --git a/host/cmake/debian/rules b/host/cmake/debian/rules index e7a8bf0aac..b80d9b05a5 100755 --- a/host/cmake/debian/rules +++ b/host/cmake/debian/rules @@ -53,7 +53,7 @@ override_dh_acc: - cat logs/libuhd-dev/*/log.txt override_dh_shlibdeps: - dh_shlibdeps --package=uhd-host --libpackage=libuhd4.6.0 - dh_shlibdeps --package=libuhd4.6.0 --libpackage=libuhd4.6.0 - dh_shlibdeps --package=libuhd-dev --libpackage=libuhd4.6.0 - dh_shlibdeps --package=python3-uhd --libpackage=libuhd4.6.0 + dh_shlibdeps --package=uhd-host --libpackage=libuhd4.7.0 + dh_shlibdeps --package=libuhd4.7.0 --libpackage=libuhd4.7.0 + dh_shlibdeps --package=libuhd-dev --libpackage=libuhd4.7.0 + dh_shlibdeps --package=python3-uhd --libpackage=libuhd4.7.0 diff --git a/tools/debs/upload_debs.sh b/tools/debs/upload_debs.sh index dcb80d48cd..c0275c2179 100755 --- a/tools/debs/upload_debs.sh +++ b/tools/debs/upload_debs.sh @@ -45,7 +45,7 @@ ORIG_RELEASE=`head -1 host/cmake/debian/changelog | sed 's/.*) \(.*\);.*/\1/'` # Currently supported versions can be found here: # https://launchpad.net/ubuntu/+ppas # -RELEASES="bionic focal jammy lunar" +RELEASES="bionic focal jammy noble" PPA=ppa:ettusresearch/uhd #