Commit df06db39 authored by Maitland Bottoms's avatar Maitland Bottoms

2.11.4-1 upload

parent 69615414
gqrx-sdr (2.11.4-1) unstable; urgency=medium
* New upstream release
-- A. Maitland Bottoms <bottoms@debian.org> Sun, 13 May 2018 19:58:58 -0400
gqrx-sdr (2.9-2) unstable; urgency=medium
* upstream Debian patches, update to v2.9-4-g4138038
......
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: A. Maitland Bottoms <bottoms@debian.org>
Build-Depends: cmake (>=2.8),
debhelper (>= 10),
gnuradio-dev (>=3.7.11),
gnuradio-dev (>=3.7.12.0),
gr-iio,
gr-osmosdr (>=0.1.4-13),
libasound2-dev,
......@@ -23,10 +23,10 @@ Build-Depends: cmake (>=2.8),
qtbase5-dev,
qtbase5-dev-tools,
qtchooser
Standards-Version: 4.1.2
Standards-Version: 4.1.4
Homepage: http://gqrx.dk/
Vcs-Git: https://anonscm.debian.org/git/users/bottoms/pkg-gqrx-sdr.git
Vcs-Browser: https://anonscm.debian.org/cgit/users/bottoms/pkg-gqrx-sdr.git/
Vcs-Browser: https://salsa.debian.org/bottoms/pkg-gqrx-sdr
Vcs-Git: https://salsa.debian.org/bottoms/pkg-gqrx-sdr.git
Package: gqrx-sdr
Architecture: any
......
From 76bf3315f09e701b20b634c47826717b3603c1d2 Mon Sep 17 00:00:00 2001
From: Alexandru Csete <oz9aec@gmail.com>
Date: Sat, 25 Nov 2017 23:32:34 +0100
Subject: [PATCH 1/4] Continue with devel version string
---
CMakeLists.txt | 6 +++---
gqrx.pro | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c97bab..731a15f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ set(${PROJECT_NAME}_MAJOR "2")
set(${PROJECT_NAME}_MINOR "9")
set(${PROJECT_NAME}_PATCH "0")
##set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}")
-set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}")
-add_definitions(-DVERSION="${VERSION}")
+##set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}")
+##add_definitions(-DVERSION="${VERSION}")
# development version
execute_process(
@@ -16,7 +16,7 @@ execute_process(
OUTPUT_VARIABLE GITVERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-##add_definitions(-DVERSION="${GITVERSION}")
+add_definitions(-DVERSION="${GITVERSION}")
set(PACKAGE ${PROJECT_NAME})
diff --git a/gqrx.pro b/gqrx.pro
index 951fb45..bb39c34 100644
--- a/gqrx.pro
+++ b/gqrx.pro
@@ -67,14 +67,14 @@ CONFIG(debug, debug|release) {
#QMAKE_CFLAGS_DEBUG += '-g -O0'
# Define version string (see below for releases)
- ##VER = $$system(git describe --abbrev=8)
- VER = 2.9
+ VER = $$system(git describe --abbrev=8)
+ ##VER = 2.9
} else {
DEFINES += QT_NO_DEBUG
DEFINES += QT_NO_DEBUG_OUTPUT
- ##VER = $$system(git describe --abbrev=1)
- VER = 2.9
+ VER = $$system(git describe --abbrev=1)
+ ##VER = 2.9
# Release binaries with gr bundled
# QMAKE_RPATH & co won't work with origin
--
2.11.0
From a36123552b83607fe7304c322a1a237ca13c3ef8 Mon Sep 17 00:00:00 2001
From: Alexandru Csete <oz9aec@gmail.com>
Date: Sun, 10 Dec 2017 20:44:28 +0100
Subject: [PATCH 2/4] Remove invalid category
Patch from Debian package.
---
gqrx.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gqrx.desktop b/gqrx.desktop
index 5bd3085..021a206 100644
--- a/gqrx.desktop
+++ b/gqrx.desktop
@@ -12,5 +12,5 @@ Comment[de]=Software defined Radio auf Basis von GNU Radio und dem Qt GUI Toolki
Exec=gqrx
Terminal=false
Icon=gqrx
-Categories=Network;HamRadio;Accessories;
+Categories=Network;HamRadio;
Keywords=SDR;Radio;HAM;
--
2.11.0
From bab5577b5e09ee2d0ee6f39466107abd95c2b202 Mon Sep 17 00:00:00 2001
From: Alexandru Csete <oz9aec@gmail.com>
Date: Sun, 10 Dec 2017 20:56:29 +0100
Subject: [PATCH 3/4] Add missing header file
---
gqrx.pro | 1 +
1 file changed, 1 insertion(+)
diff --git a/gqrx.pro b/gqrx.pro
index bb39c34..71af524 100644
--- a/gqrx.pro
+++ b/gqrx.pro
@@ -158,6 +158,7 @@ HEADERS += \
src/dsp/rds/decoder_impl.h \
src/dsp/rds/parser_impl.h \
src/dsp/rds/constants.h \
+ src/dsp/rds/tmc_events.h \
src/dsp/resampler_xx.h \
src/dsp/rx_agc_xx.h \
src/dsp/rx_demod_am.h \
--
2.11.0
From 413803805a44c99a6aa56e34d6b48a21cf52d67d Mon Sep 17 00:00:00 2001
From: Alexandru Csete <oz9aec@gmail.com>
Date: Sun, 10 Dec 2017 20:58:04 +0100
Subject: [PATCH 4/4] Fix spelling errors
Patch from Debian package.
---
resources/news.txt | 2 +-
src/dsp/rds/tmc_events.h | 2 +-
src/dsp/rx_filter.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/resources/news.txt b/resources/news.txt
index c7f06c0..730abce 100644
--- a/resources/news.txt
+++ b/resources/news.txt
@@ -126,7 +126,7 @@
FIXED: Use correct main category in desktop entry file.
IMPROVED: Support up to 1M point FFT.
IMPROVED: Fractional PPM correction.
- IMPROVED: AGC peformance.
+ IMPROVED: AGC performance.
IMPROVED: FFT performance.
IMPROVED: Right click on frequency digit to clear digits.
IMPROVED: Robustness against malformed remote control commands.
diff --git a/src/dsp/rds/tmc_events.h b/src/dsp/rds/tmc_events.h
index c3c86f9..d8ca28a 100644
--- a/src/dsp/rds/tmc_events.h
+++ b/src/dsp/rds/tmc_events.h
@@ -891,7 +891,7 @@ static const std::string tmc_events[TMC_EVENTS][4]={
{"857","(Q) obstruction(s) on roadway {something that does block the road or part of it}","901","0"},
{"858","(Q) obstructions on the road. Danger","902","0"},
{"859","(Q) obstructions on the road. Passable with care","981","0"},
- {"860","(Q) object(s) on roadway {something that does not neccessarily block the road or part of it} ","61","0"},
+ {"860","(Q) object(s) on roadway {something that does not necessarily block the road or part of it} ","61","0"},
{"861","(Q) object(s) on the road. Danger","63","0"},
{"862","(Q) shed load(s)","210","0"},
{"863","(Q) shed load(s). Danger","359","0"},
diff --git a/src/dsp/rx_filter.cpp b/src/dsp/rx_filter.cpp
index 8800702..3edd9de 100644
--- a/src/dsp/rx_filter.cpp
+++ b/src/dsp/rx_filter.cpp
@@ -90,7 +90,7 @@ void rx_filter::set_param(double low, double high, double trans_width)
d_trans_width);
#ifndef QT_NO_DEBUG_OUTPUT
- std::cout << "Genrating taps for new filter LO:" << d_low
+ std::cout << "Generating taps for new filter LO:" << d_low
<< " HI:" << d_high << " TW:" << d_trans_width
<< " Taps: " << d_taps.size() << std::endl;
#endif
--
2.11.0
--- a/gqrx.desktop
+++ b/gqrx.desktop
@@ -12,5 +12,5 @@
Exec=gqrx
Terminal=false
Icon=gqrx
-Categories=Network;HamRadio;Accessories;
+Categories=Network;HamRadio;
Keywords=SDR;Radio;HAM;
0002-Remove-invalid-category.patch
0003-Add-missing-header-file.patch
0004-Fix-spelling-errors.patch
Description: spell network
Author: A. Maitland Bottoms <bottoms@debian.org>
--- a/src/dsp/rx_filter.cpp
+++ b/src/dsp/rx_filter.cpp
@@ -90,7 +90,7 @@
d_trans_width);
#ifndef QT_NO_DEBUG_OUTPUT
- std::cout << "Genrating taps for new filter LO:" << d_low
+ std::cout << "Generating taps for new filter LO:" << d_low
<< " HI:" << d_high << " TW:" << d_trans_width
<< " Taps: " << d_taps.size() << std::endl;
#endif
--- a/src/dsp/rds/tmc_events.h
+++ b/src/dsp/rds/tmc_events.h
@@ -891,7 +891,7 @@
{"857","(Q) obstruction(s) on roadway {something that does block the road or part of it}","901","0"},
{"858","(Q) obstructions on the road. Danger","902","0"},
{"859","(Q) obstructions on the road. Passable with care","981","0"},
- {"860","(Q) object(s) on roadway {something that does not neccessarily block the road or part of it} ","61","0"},
+ {"860","(Q) object(s) on roadway {something that does not necessarily block the road or part of it} ","61","0"},
{"861","(Q) object(s) on the road. Danger","63","0"},
{"862","(Q) shed load(s)","210","0"},
{"863","(Q) shed load(s). Danger","359","0"},
--- a/resources/news.txt
+++ b/resources/news.txt
@@ -126,7 +126,7 @@
FIXED: Use correct main category in desktop entry file.
IMPROVED: Support up to 1M point FFT.
IMPROVED: Fractional PPM correction.
- IMPROVED: AGC peformance.
+ IMPROVED: AGC performance.
IMPROVED: FFT performance.
IMPROVED: Right click on frequency digit to clear digits.
IMPROVED: Robustness against malformed remote control commands.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment