diff -Nru gnuradio-3.10.1.1/debian/changelog gnuradio-3.10.1.1/debian/changelog --- gnuradio-3.10.1.1/debian/changelog 2022-04-05 20:55:39.000000000 +0000 +++ gnuradio-3.10.1.1/debian/changelog 2022-04-01 22:57:34.000000000 +0000 @@ -1,8 +1,9 @@ -gnuradio (3.10.1.1-1ubuntu1) jammy; urgency=medium +gnuradio (3.10.1.1-2) unstable; urgency=medium - * No-change rebuild against libthrift-0.16.0. + * install usr/local python path (Closes: #1008794) + * Have gnuradio-companion launch x-terminal-emulator by default - -- Stefano Rivera Tue, 05 Apr 2022 16:55:39 -0400 + -- A. Maitland Bottoms Fri, 01 Apr 2022 18:57:34 -0400 gnuradio (3.10.1.1-1) unstable; urgency=medium diff -Nru gnuradio-3.10.1.1/debian/control gnuradio-3.10.1.1/debian/control --- gnuradio-3.10.1.1/debian/control 2022-04-05 20:55:39.000000000 +0000 +++ gnuradio-3.10.1.1/debian/control 2022-03-30 02:18:31.000000000 +0000 @@ -1,8 +1,7 @@ Source: gnuradio Section: comm Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: A. Maitland Bottoms +Maintainer: A. Maitland Bottoms Build-Depends: cmake (>= 3.16.3), debhelper-compat (= 13), dh-python, @@ -96,6 +95,7 @@ python3-thrift [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x], python3-yaml, python3-zmq [!hurd-i386], + gnome-terminal|x-terminal-emulator, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} diff -Nru gnuradio-3.10.1.1/debian/gnuradio.install gnuradio-3.10.1.1/debian/gnuradio.install --- gnuradio-3.10.1.1/debian/gnuradio.install 2020-11-02 04:27:07.000000000 +0000 +++ gnuradio-3.10.1.1/debian/gnuradio.install 2022-03-29 03:13:21.000000000 +0000 @@ -1,6 +1,6 @@ etc usr/bin -usr/lib/python* +usr/local/lib/python* usr/share/applications usr/share/gnuradio usr/share/icons diff -Nru gnuradio-3.10.1.1/debian/patches/build-on-hurd gnuradio-3.10.1.1/debian/patches/build-on-hurd --- gnuradio-3.10.1.1/debian/patches/build-on-hurd 2022-01-14 23:08:44.000000000 +0000 +++ gnuradio-3.10.1.1/debian/patches/build-on-hurd 2022-04-01 20:53:08.000000000 +0000 @@ -8,11 +8,9 @@ gnuradio-runtime/lib/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt -index 6cd9c0c54..b74d59279 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt -@@ -287,8 +287,8 @@ if(WIN32) +@@ -287,8 +287,8 @@ target_compile_definitions(gnuradio-runtime PUBLIC -DWIN32_LEAN_AND_MEAN) endif(WIN32) @@ -23,6 +21,3 @@ target_link_libraries(gnuradio-runtime PUBLIC rt) endif() --- -2.30.2 - diff -Nru gnuradio-3.10.1.1/debian/patches/look-for-x-terminal-emulator gnuradio-3.10.1.1/debian/patches/look-for-x-terminal-emulator --- gnuradio-3.10.1.1/debian/patches/look-for-x-terminal-emulator 1970-01-01 00:00:00.000000000 +0000 +++ gnuradio-3.10.1.1/debian/patches/look-for-x-terminal-emulator 2022-04-01 20:48:51.000000000 +0000 @@ -0,0 +1,26 @@ +From 510dcb439db6cc2ea4b3aabd3d2516d72ee27955 Mon Sep 17 00:00:00 2001 +From: "A. Maitland Bottoms" +Date: Sun, 27 Sep 2020 17:30:52 -0400 +Subject: [PATCH 11/12] look for x-terminal-emulator + +--- + grc/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/grc/CMakeLists.txt ++++ b/grc/CMakeLists.txt +@@ -91,12 +91,12 @@ + + if(UNIX) + find_program(GRC_XTERM_EXE +- NAMES xterminal-emulator gnome-terminal konsole xterm ++ NAMES x-terminal-emulator gnome-terminal konsole xterm foot + HINTS ENV PATH + DOC "graphical terminal emulator used in GRC's no-gui-mode" + ) + if(NOT GRC_XTERM_EXE) +- set(GRC_XTERM_EXE "") ++ set(GRC_XTERM_EXE "x-terminal-emulator") + endif() + else() # APPLE CYGWIN + set(GRC_XTERM_EXE "xterm") diff -Nru gnuradio-3.10.1.1/debian/patches/series gnuradio-3.10.1.1/debian/patches/series --- gnuradio-3.10.1.1/debian/patches/series 2022-02-07 00:19:00.000000000 +0000 +++ gnuradio-3.10.1.1/debian/patches/series 2022-04-01 20:55:19.000000000 +0000 @@ -4,3 +4,4 @@ skip-long-tests cppgen-Add-C-generation-support-to-gr-vocoder shared-library-throw-not-exit +look-for-x-terminal-emulator diff -Nru gnuradio-3.10.1.1/debian/patches/usr-bin-examples gnuradio-3.10.1.1/debian/patches/usr-bin-examples --- gnuradio-3.10.1.1/debian/patches/usr-bin-examples 2022-01-14 23:08:44.000000000 +0000 +++ gnuradio-3.10.1.1/debian/patches/usr-bin-examples 2022-04-01 20:53:02.000000000 +0000 @@ -10,39 +10,30 @@ gr-uhd/examples/c++/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/gr-audio/examples/c++/CMakeLists.txt b/gr-audio/examples/c++/CMakeLists.txt -index 2f5ba16a3..f8a28fca6 100644 --- a/gr-audio/examples/c++/CMakeLists.txt +++ b/gr-audio/examples/c++/CMakeLists.txt -@@ -11,5 +11,5 @@ target_link_libraries(dial_tone +@@ -11,5 +11,5 @@ INSTALL(TARGETS dial_tone - DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR} + DESTINATION ${GR_RUNTIME_DIR} ) -diff --git a/gr-qtgui/examples/c++/CMakeLists.txt b/gr-qtgui/examples/c++/CMakeLists.txt -index ceb4eaf4d..82d25363a 100644 --- a/gr-qtgui/examples/c++/CMakeLists.txt +++ b/gr-qtgui/examples/c++/CMakeLists.txt -@@ -33,5 +33,5 @@ target_link_libraries(display_qt ${QTGUI_LIBRARIES}) +@@ -33,5 +33,5 @@ INSTALL(TARGETS display_qt - DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} + DESTINATION ${GR_RUNTIME_DIR} ) -diff --git a/gr-uhd/examples/c++/CMakeLists.txt b/gr-uhd/examples/c++/CMakeLists.txt -index 86a8cc9f6..83fa69e97 100644 --- a/gr-uhd/examples/c++/CMakeLists.txt +++ b/gr-uhd/examples/c++/CMakeLists.txt -@@ -13,5 +13,5 @@ target_link_libraries(tags_demo gnuradio-uhd) +@@ -13,5 +13,5 @@ INSTALL(TARGETS tags_demo - DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR} + DESTINATION ${GR_RUNTIME_DIR} ) --- -2.30.2 -