diff --git a/CHANGELOG b/CHANGELOG
index 3b442fa69..087b0b612 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+sdrangel (6.8.0-1) unstable; urgency=medium
+
+ * New Packet Error Tester feature plugin. PR #836
+ * DATV modulator plugin: DVB-S2 implementation. PR #826
+ * DATV demodulator: various fixes including internal player. Issue #833
+ * Fixed station position altitude setting. Issue #828
+ * APRS feature: choose between metric and imperial units. Issue #829
+ * AudioOutput plugin: fixed REST API device settings PUT.PATCH. Issue #837
+
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Thu, 08 Apr 2021 17:26:09 +0200
+
sdrangel (6.7.0-1) unstable; urgency=medium
* New DATV modulator plugin: DVB-S modulator. PR #810
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6bde2726..67cb2c7f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# configure version
set(sdrangel_VERSION_MAJOR "6")
-set(sdrangel_VERSION_MINOR "7")
+set(sdrangel_VERSION_MINOR "8")
set(sdrangel_VERSION_PATCH "0")
set(sdrangel_VERSION_SUFFIX "")
diff --git a/debian/changelog b/debian/changelog
index 3e2f72a69..048bfbc9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sdrangel (6.8.0-1) unstable; urgency=medium
+
+ * New Packet Error Tester feature plugin. PR #836
+ * DATV modulator plugin: DVB-S2 implementation. PR #826
+ * DATV demodulator: various fixes including internal player. Issue #833
+ * Fixed station position altitude setting. Issue #828
+ * APRS feature: choose between metric and imperial units. Issue #829
+ * AudioOutput plugin: fixed REST API device settings PUT.PATCH. Issue #837
+
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Thu, 08 Apr 2021 17:26:09 +0200
+
sdrangel (6.7.0-1) unstable; urgency=medium
* New DATV modulator plugin: DVB-S modulator. PR #810
diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.cpp b/plugins/channelrx/demoddatv/datvdemodplugin.cpp
index 28eee1cee..34e07e36a 100644
--- a/plugins/channelrx/demoddatv/datvdemodplugin.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodplugin.cpp
@@ -30,7 +30,7 @@ const PluginDescriptor DATVDemodPlugin::m_ptrPluginDescriptor =
{
DATVDemod::m_channelId,
QString("DATV Demodulator"),
- QString("6.7.0"),
+ QString("6.8.0"),
QString("(c) F4HKW for SDRAngel using LeanSDR framework (c) F4DAV"),
QString("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channelrx/demodpacket/packetdemodplugin.cpp b/plugins/channelrx/demodpacket/packetdemodplugin.cpp
index ecd2bce95..e0f770d16 100644
--- a/plugins/channelrx/demodpacket/packetdemodplugin.cpp
+++ b/plugins/channelrx/demodpacket/packetdemodplugin.cpp
@@ -29,7 +29,7 @@
const PluginDescriptor PacketDemodPlugin::m_pluginDescriptor = {
PacketDemod::m_channelId,
QStringLiteral("Packet Demodulator"),
- QStringLiteral("6.5.1"),
+ QStringLiteral("6.8.0"),
QStringLiteral("(c) Jon Beniston, M7RCE"),
QStringLiteral("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp
index 515498323..20fb5b111 100644
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modplugin.cpp
@@ -29,7 +29,7 @@
const PluginDescriptor IEEE_802_15_4_ModPlugin::m_pluginDescriptor = {
IEEE_802_15_4_Mod::m_channelId,
QStringLiteral("802.15.4 Modulator"),
- QStringLiteral("6.3.3"),
+ QStringLiteral("6.8.0"),
QStringLiteral("(c) Jon Beniston, M7RCE"),
QStringLiteral("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp b/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp
index 64607cc99..6fae3a098 100644
--- a/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp
+++ b/plugins/channeltx/modchirpchat/chirpchatmodplugin.cpp
@@ -28,7 +28,7 @@
const PluginDescriptor ChirpChatModPlugin::m_pluginDescriptor = {
ChirpChatMod::m_channelId,
QStringLiteral("ChirpChat Modulator"),
- QStringLiteral("6.3.3"),
+ QStringLiteral("6.8.0"),
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
QStringLiteral("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/channeltx/moddatv/datvmodplugin.cpp b/plugins/channeltx/moddatv/datvmodplugin.cpp
index 7caeed274..1a5044d2e 100644
--- a/plugins/channeltx/moddatv/datvmodplugin.cpp
+++ b/plugins/channeltx/moddatv/datvmodplugin.cpp
@@ -29,7 +29,7 @@
const PluginDescriptor DATVModPlugin::m_pluginDescriptor = {
DATVMod::m_channelId,
QStringLiteral("DATV Modulator"),
- QStringLiteral("6.7.1"),
+ QStringLiteral("6.8.0"),
QStringLiteral("(c) Jon Beniston, M7RCE, Edouard Griffiths, F4EXB. DVB-S2 by G4GUO"),
QStringLiteral("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/feature/aprs/aprsplugin.cpp b/plugins/feature/aprs/aprsplugin.cpp
index 6357a3e82..302579f73 100644
--- a/plugins/feature/aprs/aprsplugin.cpp
+++ b/plugins/feature/aprs/aprsplugin.cpp
@@ -30,7 +30,7 @@
const PluginDescriptor APRSPlugin::m_pluginDescriptor = {
APRS::m_featureId,
QStringLiteral("APRS"),
- QStringLiteral("6.7.1"),
+ QStringLiteral("6.8.0"),
QStringLiteral("(c) Jon Beniston, M7RCE"),
QStringLiteral("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/feature/pertester/pertesterplugin.cpp b/plugins/feature/pertester/pertesterplugin.cpp
index d8fa9d389..597bb4fab 100644
--- a/plugins/feature/pertester/pertesterplugin.cpp
+++ b/plugins/feature/pertester/pertesterplugin.cpp
@@ -30,7 +30,7 @@
const PluginDescriptor PERTesterPlugin::m_pluginDescriptor = {
PERTester::m_featureId,
QStringLiteral("Packet Error Rate Tester"),
- QStringLiteral("6.7.1"),
+ QStringLiteral("6.8.0"),
QStringLiteral("(c) Jon Beniston, M7RCE"),
QStringLiteral("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/feature/satellitetracker/satellitetrackerplugin.cpp b/plugins/feature/satellitetracker/satellitetrackerplugin.cpp
index a60a93475..8238bd3ac 100644
--- a/plugins/feature/satellitetracker/satellitetrackerplugin.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackerplugin.cpp
@@ -30,7 +30,7 @@
const PluginDescriptor SatelliteTrackerPlugin::m_pluginDescriptor = {
SatelliteTracker::m_featureId,
QStringLiteral("Satellite Tracker"),
- QStringLiteral("6.7.0"),
+ QStringLiteral("6.8.0"),
QStringLiteral("(c) Jon Beniston, M7RCE and Daniel Warner (SGP4 library)"),
QStringLiteral("https://github.com/f4exb/sdrangel"),
true,
diff --git a/plugins/samplesink/audiooutput/audiooutputplugin.cpp b/plugins/samplesink/audiooutput/audiooutputplugin.cpp
index ec36a0476..ed8afbfc9 100644
--- a/plugins/samplesink/audiooutput/audiooutputplugin.cpp
+++ b/plugins/samplesink/audiooutput/audiooutputplugin.cpp
@@ -31,7 +31,7 @@
const PluginDescriptor AudioOutputPlugin::m_pluginDescriptor = {
QString("AudioOutput"),
QString("Audio output"),
- QString("6.1.0"),
+ QString("6.8.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,