Merge ~paelzer/ubuntu/+source/gpsd:lp-1879272-json-quotes-on-add-GROOVY into ubuntu/+source/gpsd:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4069

[Christian Ehrhardt  (paelzer)]

accepted and uploaded and synced via https://salsa.debian.org/debian-gps-team/pkg-gpsd/-/merge_requests/8

Abanoning this MP as it is no more needed.

Unmerged commits

78655b6... by Christian Ehrhardt  on 2020-05-20

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

958a483... by Christian Ehrhardt  on 2020-05-20

changelog: fix json missing quotes on device add (LP: #1879272)

Signed-off-by: Christian Ehrhardt <email address hidden>

4e389be... by Christian Ehrhardt  on 2020-05-20

fix json missing quotes on device add (LP: #1879272)

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 2e76731..2802816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gpsd (3.20-11ubuntu1) groovy; urgency=medium
+
+  * fix json missing quotes on device add (LP: #1879272)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 20 May 2020 08:23:02 +0200
+
 gpsd (3.20-11) unstable; urgency=medium
 
   [ Christian Ehrhardt ]
diff --git a/debian/control b/debian/control
index 5ff5787..fb6fe2c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: gpsd
 Section: misc
 Priority: optional
-Maintainer: Bernd Zeimetz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Build-Depends: debhelper (>= 11),
  po-debconf,
  python3-all-dev (>= 2.6.6-3),
diff --git a/debian/control.in b/debian/control.in
index 342d813..808982a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: gpsd
 Section: misc
 Priority: optional
-Maintainer: Bernd Zeimetz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Build-Depends: debhelper (>= 11),
  po-debconf,
  python3-all-dev (>= 2.6.6-3),
diff --git a/debian/patches/lp-1879272-gpsd-Quote-the-activated-timestamp-in-the-json-paylo.patch b/debian/patches/lp-1879272-gpsd-Quote-the-activated-timestamp-in-the-json-paylo.patch
new file mode 100644
index 0000000..807e892
--- /dev/null
+++ b/debian/patches/lp-1879272-gpsd-Quote-the-activated-timestamp-in-the-json-paylo.patch
@@ -0,0 +1,33 @@
+From 733495192307d43c9e3bdd9e1b202045e66d998b Mon Sep 17 00:00:00 2001
+From: Andreas Tobler <[e-mail]>
+Date: Thu, 14 May 2020 20:30:19 +0200
+Subject: [PATCH] gpsd: Quote the activated timestamp in the json payload
+
+Without the quotes we get this as DECVICE json payload:
+
+{"class":"DEVICE","path":"/dev/pts/9","activateed":2020-05-14T15:36:35.087Z}
+
+This results in a json parse error after the 2020.
+Fix this with quoting the timestamp.
+
+Signed-off-by: Gary E. Miller <[e-mail]>
+
+Origin: backport, https://gitlab.com/gpsd/gpsd/-/commit/733495192307d43c9e3bdd9e1b2020
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1879272
+Last-Update: 2020-05-20
+
+---
+ gpsd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gpsd.c
++++ b/gpsd.c
+@@ -748,7 +748,7 @@ bool gpsd_add_device(const char *device_
+ #ifdef SOCKET_EXPORT_ENABLE
+ 	    notify_watchers(devp, true, false,
+ 			    "{\"class\":\"DEVICE\",\"path\":\"%s\","
+-                            "\"activated\":%s}\r\n",
++                            "\"activated\":\"%s\"}\r\n",
+ 			    devp->gpsdata.dev.path,
+ 		            now_to_iso8601(tbuf, sizeof(tbuf)));
+ #endif /* SOCKET_EXPORT_ENABLE */
diff --git a/debian/patches/series b/debian/patches/series
index f5e43d9..cd24696 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ gpsd_hotplug_rules_disable_generic_serial_converters
 0001-Fix-merging-and-using-of-python-flags.patch
 ignore-test-xgps_deps_check
 fix-soname
+lp-1879272-gpsd-Quote-the-activated-timestamp-in-the-json-paylo.patch