Merge tag 'debian/3.22-3' into masterdebian/3.22-3+linaro1

gpsd Debian release 3.22-3

Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>

5 files changed, 24 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 1c3c248..282d5c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+gpsd (3.22-3+linaro1) unstable; urgency=medium
+
+  * Update debian version.
+
+ -- Anibal Limón <anibal.limon@linaro.org>  Fri, 16 Jul 2021 14:35:07 -0500
+
+gpsd (3.22-3) unstable; urgency=medium
+
+  * [c6838e37] Remove duplicate lines from symbol files.
+    Thanks to Matthias Klose (Closes: #985930)
+  * [5c240253] Mark String::QString(QString const&)@Base as optional.
+    Required for backporting.
+  * [2dfbaa07] Updating debian/control from debian/control.in
+  * [c582b2aa] gpsd-tools: add missing Breaks+Replaces
+    gpsd-tools needs Breaks/Replaces for gpsd-clients (<< 3.20-10)
+    Thanks to Andreas Beckmann (Closes: #987208)
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sun, 25 Apr 2021 12:17:57 +0200
+
 gpsd (3.22-2+linaro1) unstable; urgency=medium
 
   * Update debian version.
diff --git a/debian/control b/debian/control
index 3654136..3be63bf 100644
--- a/debian/control
+++ b/debian/control
@@ -63,8 +63,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libgps28 (= ${binary:Version}),
 Suggests: gpsd
-Breaks: python-gps, gpsd (<< 3.20-9)
-Replaces: python-gps
+Breaks: python-gps, gpsd (<< 3.20-9), gpsd-clients (<< 3.20-10)
+Replaces: python-gps, gpsd-clients (<< 3.20-10)
 Description: Global Positioning System - tools
  The gpsd service daemon can monitor one or more GPS devices connected to
  a host computer, making all data on the location and movements of the
diff --git a/debian/control.in b/debian/control.in
index 21149eb..70e87cf 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -63,8 +63,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libgpsLIBGPSSONAME (= ${binary:Version}),
 Suggests: gpsd
-Breaks: python-gps, gpsd (<< 3.20-9)
-Replaces: python-gps
+Breaks: python-gps, gpsd (<< 3.20-9), gpsd-clients (<< 3.20-10)
+Replaces: python-gps, gpsd-clients (<< 3.20-10)
 Description: Global Positioning System - tools
  The gpsd service daemon can monitor one or more GPS devices connected to
  a host computer, making all data on the location and movements of the
diff --git a/debian/libgpsLIBGPSSONAME.symbols b/debian/libgpsLIBGPSSONAME.symbols
index 03ae8f9..3f66558 100644
--- a/debian/libgpsLIBGPSSONAME.symbols
+++ b/debian/libgpsLIBGPSSONAME.symbols
@@ -9,8 +9,6 @@ libgps.so.LIBGPSSONAME libgpsLIBGPSSONAME #MINVER#
  (c++)"gpsmm::stream(int)@Base" 3.3
  (c++)"gpsmm::waiting(int)@Base" 3.3
  (c++)"gpsmm::~gpsmm()@Base" 3.3
- (c++)"gpsmm::~gpsmm()@Base" 3.3
- (c++)"gpsmm::~gpsmm()@Base" 3.3
  (c++)"typeinfo for gpsmm@Base" 3.3
  (c++)"typeinfo name for gpsmm@Base" 3.3
  (c++)"vtable for gpsmm@Base" 3.3
diff --git a/debian/libqgpsmmLIBGPSSONAME.symbols b/debian/libqgpsmmLIBGPSSONAME.symbols
index 84edae2..d3d51ab 100644
--- a/debian/libqgpsmmLIBGPSSONAME.symbols
+++ b/debian/libqgpsmmLIBGPSSONAME.symbols
@@ -36,19 +36,13 @@ libQgpsmm.so.LIBGPSSONAME libqgpsmmLIBGPSSONAME #MINVER#
  (c++)"gpsmm::waiting(int)@Base" 3.3
  (c++)"gpsmm::clear_fix()@Base" 3.3
  (c++)"gpsmm::~gpsmm()@Base" 3.3
- (c++)"gpsmm::~gpsmm()@Base" 3.3
- (c++)"gpsmm::~gpsmm()@Base" 3.3
-#MISSING: 3.18# (c++|optional)"QDebug::~QDebug()@Base" 3.3
 #MISSING: 3.18# (c++|optional)"QDebug::~QDebug()@Base" 3.3
  (c++|optional)"QString::~QString()@Base" 3.3
- (c++|optional)"QString::~QString()@Base" 3.3
- (c++|optional)"QList<QString>::~QList()@Base" 3.5
  (c++|optional)"QList<QString>::~QList()@Base" 3.5
  (c++)"typeinfo for gpsmm@Base" 3.3
  (c++)"typeinfo name for gpsmm@Base" 3.3
  (c++)"vtable for gpsmm@Base" 3.3
 #MISSING: 3.18# (c++|optional)"QByteArray::~QByteArray()@Base" 3.3
-#MISSING: 3.18# (c++|optional)"QByteArray::~QByteArray()@Base" 3.3
  (c++)"shiftleft(unsigned char*, int, unsigned short)@Base" 3.12
 #MISSING: 3.17# (c++)"shm_get(int, bool, bool)@Base" 3.15
 #MISSING: 3.17# (c++)"ntp_name(int)@Base" 3.15
@@ -158,6 +152,5 @@ libQgpsmm.so.LIBGPSSONAME libqgpsmmLIBGPSSONAME #MINVER#
 #MISSING: 3.20# unix_to_iso8601@Base 3.3
  datum_code_string@Base 3.19
 #MISSING: 3.21.1~dev# nanowait(int, timespec*)@Base 3.21.1
- (c++)"QString::QString(QString const&)@Base" 3.21.1~dev
- (c++)"QString::QString(QString const&)@Base" 3.21.1~dev
+ (c++|optional)"QString::QString(QString const&)@Base" 3.21.1~dev
  gpsd_version@Base 3.21.1~dev