diff -Nru gpsd-3.20/debian/changelog gpsd-3.20/debian/changelog
--- gpsd-3.20/debian/changelog	2021-08-04 15:34:28.000000000 +0000
+++ gpsd-3.20/debian/changelog	2021-08-04 15:34:28.000000000 +0000
@@ -1,8 +1,12 @@
-gpsd (3.20-8ubuntu0.3) focal-security; urgency=medium
+gpsd (3.20-8ubuntu0.4) focal-security; urgency=medium
 
   * SECURITY UPDATE: incorrect time jump (LP: #1938730)
     - debian/patches/fix_wrong_gps_rollover.patch: don't compute wrong GPS
       rollover after 2020-10-23.
+    - debian/control*: add python3-matplotlib, python3-gps, python3-gi,
+      python3-cairo, gir1.2-gtk-3.0, python3-serial, python3-gi-cairo to
+      Build-Depends so tests run.
+    - debian/source/include-binaries: include some updated binary tests.
     - No CVE number
 
  -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 04 Aug 2021 11:34:28 -0400
diff -Nru gpsd-3.20/debian/control gpsd-3.20/debian/control
--- gpsd-3.20/debian/control	2021-08-04 15:34:28.000000000 +0000
+++ gpsd-3.20/debian/control	2021-08-04 15:34:28.000000000 +0000
@@ -13,6 +13,7 @@
  libusb-1.0-0-dev,
  libdbus-1-dev, libglib2.0-dev, libdbus-glib-1-dev, makedev,
  libbluetooth-dev [linux-any],
+ python3-matplotlib, python3-gps, python3-gi, python3-cairo, gir1.2-gtk-3.0, python3-serial, python3-gi-cairo,
  qtbase5-dev,
  lsb-release, bc,
  dpkg-dev (>= 1.15.6),
diff -Nru gpsd-3.20/debian/control.in gpsd-3.20/debian/control.in
--- gpsd-3.20/debian/control.in	2020-05-20 06:23:02.000000000 +0000
+++ gpsd-3.20/debian/control.in	2021-08-04 15:34:28.000000000 +0000
@@ -13,6 +13,7 @@
  libusb-1.0-0-dev,
  libdbus-1-dev, libglib2.0-dev, libdbus-glib-1-dev, makedev,
  libbluetooth-dev [linux-any],
+ python3-matplotlib, python3-gps, python3-gi, python3-cairo, gir1.2-gtk-3.0, python3-serial, python3-gi-cairo,
  qtbase5-dev,
  lsb-release, bc,
  dpkg-dev (>= 1.15.6),
diff -Nru gpsd-3.20/debian/patches/fix_wrong_gps_rollover.patch gpsd-3.20/debian/patches/fix_wrong_gps_rollover.patch
--- gpsd-3.20/debian/patches/fix_wrong_gps_rollover.patch	2021-08-04 15:34:28.000000000 +0000
+++ gpsd-3.20/debian/patches/fix_wrong_gps_rollover.patch	2021-08-04 15:34:28.000000000 +0000
@@ -401,3 +401,90 @@
  
      // gcc needs the (time_t)week to not overflow. clang got it right.
      // if time_t is 32-bits, then still 2038 issues
+--- a/test/daemon/trimble-lassen_iq-playacar.log.chk
++++ b/test/daemon/trimble-lassen_iq-playacar.log.chk
+@@ -1,26 +1,26 @@
+-$GPRMC,040929.00,V,,S,,W,0.0000,0.000,120419,,*22
++$GPRMC,040929.00,V,,S,,W,0.0000,0.000,270899,,*20
+ $GPGSA,A,1,,,,,,,,,,,,,,,,*32
+-{"class":"TPV","mode":1,"time":"2019-04-12T04:09:29.000Z","ept":0.005}
+-$GPRMC,040930.00,V,2037.7075,N,08704.0535,W,,,120419,-2.0,W*6A
+-{"class":"TPV","mode":0,"time":"2019-04-12T04:09:30.000Z","ept":0.005}
++{"class":"TPV","mode":1,"time":"1999-08-27T04:09:29.000Z","ept":0.005}
++$GPRMC,040930.00,V,2037.7075,N,08704.0535,W,,,270899,-2.0,W*68
++{"class":"TPV","mode":0,"time":"1999-08-27T04:09:30.000Z","ept":0.005}
+ $GPGGA,040930.00,2037.7075,N,08704.0535,W,1,05,2.34,27.90,M,-15.010,M,,*6F
+-$GPRMC,040930.00,A,2037.7075,N,08704.0535,W,0.0000,0.000,120419,-2.0,W*4D
++$GPRMC,040930.00,A,2037.7075,N,08704.0535,W,0.0000,0.000,270899,-2.0,W*4F
+ $GPGSA,A,3,,,,,,,,,,,,,2.9,2.3,1.7*3E
+-{"class":"TPV","mode":3,"time":"2019-04-12T04:09:30.000Z","ept":0.005,"lat":20.628457567,"lon":-87.067558169,"altHAE":12.892,"altMSL":27.902,"alt":27.902,"epv":39.373,"track":0.0000,"magtrack":358.0076,"magvar":-2.0,"speed":0.000,"climb":0.000,"velN":0.000,"velE":0.000,"velD":-0.000,"geoidSep":-15.010,"eph":44.377,"sep":55.020}
+-$GPRMC,040931.00,A,2037.7075,N,08704.0535,W,,,120419,-2.0,W*7C
+-{"class":"TPV","mode":0,"time":"2019-04-12T04:09:31.000Z","ept":0.005}
++{"class":"TPV","mode":3,"time":"1999-08-27T04:09:30.000Z","ept":0.005,"lat":20.628457567,"lon":-87.067558169,"altHAE":12.892,"altMSL":27.902,"alt":27.902,"epv":39.373,"track":0.0000,"magtrack":358.0076,"magvar":-2.0,"speed":0.000,"climb":0.000,"velN":0.000,"velE":0.000,"velD":-0.000,"geoidSep":-15.010,"eph":44.377,"sep":55.020}
++$GPRMC,040931.00,A,2037.7075,N,08704.0535,W,,,270899,-2.0,W*7E
++{"class":"TPV","mode":0,"time":"1999-08-27T04:09:31.000Z","ept":0.005}
+ $GPGGA,040931.00,2037.7075,N,08704.0535,W,1,05,2.34,27.90,M,-15.010,M,,*6E
+-$GPRMC,040931.00,A,2037.7075,N,08704.0535,W,0.0000,0.000,120419,-2.0,W*4C
++$GPRMC,040931.00,A,2037.7075,N,08704.0535,W,0.0000,0.000,270899,-2.0,W*4E
+ $GPGSA,A,3,,,,,,,,,,,,,2.9,2.3,1.7*3E
+-{"class":"TPV","mode":3,"time":"2019-04-12T04:09:31.000Z","ept":0.005,"lat":20.628457697,"lon":-87.067558187,"altHAE":12.894,"altMSL":27.904,"alt":27.904,"epv":39.384,"track":0.0000,"magtrack":358.0076,"magvar":-2.0,"speed":0.000,"climb":0.000,"epc":78.76,"velN":0.000,"velE":0.000,"velD":-0.000,"geoidSep":-15.010,"eph":44.392,"sep":55.038}
+-$GPRMC,040932.00,A,2037.7075,N,08704.0535,W,,,120419,-2.0,W*7F
+-{"class":"TPV","mode":0,"time":"2019-04-12T04:09:32.000Z","ept":0.005}
++{"class":"TPV","mode":3,"time":"1999-08-27T04:09:31.000Z","ept":0.005,"lat":20.628457697,"lon":-87.067558187,"altHAE":12.894,"altMSL":27.904,"alt":27.904,"epv":39.384,"track":0.0000,"magtrack":358.0076,"magvar":-2.0,"speed":0.000,"climb":0.000,"epc":78.76,"velN":0.000,"velE":0.000,"velD":-0.000,"geoidSep":-15.010,"eph":44.392,"sep":55.038}
++$GPRMC,040932.00,A,2037.7075,N,08704.0535,W,,,270899,-2.0,W*7D
++{"class":"TPV","mode":0,"time":"1999-08-27T04:09:32.000Z","ept":0.005}
+ $GPGGA,040932.00,2037.7075,N,08704.0535,W,1,05,2.34,27.91,M,-15.010,M,,*6C
+-$GPRMC,040932.00,A,2037.7075,N,08704.0535,W,0.0000,0.000,120419,-2.0,W*4F
++$GPRMC,040932.00,A,2037.7075,N,08704.0535,W,0.0000,0.000,270899,-2.0,W*4D
+ $GPGSA,A,3,,,,,,,,,,,,,2.9,2.3,1.7*3E
+-{"class":"TPV","mode":3,"time":"2019-04-12T04:09:32.000Z","ept":0.005,"lat":20.628457840,"lon":-87.067558197,"altHAE":12.896,"altMSL":27.906,"alt":27.906,"epv":39.384,"track":0.0000,"magtrack":358.0076,"magvar":-2.0,"speed":0.000,"climb":0.000,"epc":78.77,"velN":0.000,"velE":0.000,"velD":-0.000,"geoidSep":-15.010,"eph":44.392,"sep":55.038}
+-$GPRMC,040933.00,A,2037.7075,N,08704.0535,W,,,120419,-2.0,W*7E
+-{"class":"TPV","mode":0,"time":"2019-04-12T04:09:33.000Z","ept":0.005}
++{"class":"TPV","mode":3,"time":"1999-08-27T04:09:32.000Z","ept":0.005,"lat":20.628457840,"lon":-87.067558197,"altHAE":12.896,"altMSL":27.906,"alt":27.906,"epv":39.384,"track":0.0000,"magtrack":358.0076,"magvar":-2.0,"speed":0.000,"climb":0.000,"epc":78.77,"velN":0.000,"velE":0.000,"velD":-0.000,"geoidSep":-15.010,"eph":44.392,"sep":55.038}
++$GPRMC,040933.00,A,2037.7075,N,08704.0535,W,,,270899,-2.0,W*7C
++{"class":"TPV","mode":0,"time":"1999-08-27T04:09:33.000Z","ept":0.005}
+ $GPGGA,040937.53,2037.7075,N,08704.0535,W,1,05,2.34,27.91,M,-15.010,M,,*6F
+ $GPRMC,040937.53,A,2037.7075,N,08704.0535,W,0.0000,0.000,221206,-2.0,W*46
+ $GPGSA,A,3,,,,,,,,,,,,,2.9,2.3,1.7*3E
+--- a/test/daemon/trimble-lassen_iq-3dfix.log.chk
++++ b/test/daemon/trimble-lassen_iq-3dfix.log.chk
+@@ -8,22 +8,22 @@ $GPRMC,,V,,S,,W,,,,,*35
+ $GPGSA,A,1,,,,,,,,,,,,,,,,*32
+ {"class":"TPV","mode":1}
+ $GPGSV,1,1,01,19,26,250,29*48
+-{"class":"SKY","time":"2019-04-07T06:57:22.584Z","vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[]}
++{"class":"SKY","time":"1999-08-22T06:57:22.584Z","vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[]}
+ $GPGSV,1,1,02,19,26,250,29,18,26,096,35*7F
+-{"class":"SKY","time":"2019-04-07T06:57:22.584Z","vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19}]}
++{"class":"SKY","time":"1999-08-22T06:57:22.584Z","vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19}]}
+ $GPGSV,1,1,03,19,26,250,29,18,26,096,35,01,29,221,26*41
+-{"class":"SKY","time":"2019-04-07T06:57:22.584Z","vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19}]}
++{"class":"SKY","time":"1999-08-22T06:57:22.584Z","vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19}]}
+ $GPGSV,1,1,04,19,26,250,29,18,26,096,35,01,29,221,26,11,24,307,29*7F
+-{"class":"SKY","time":"2019-04-07T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18}]}
++{"class":"SKY","time":"1999-08-22T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18}]}
+ $GPGSV,2,1,05,19,26,250,29,18,26,096,35,01,29,221,26,11,24,307,29*7D
+ $GPGSV,2,2,05,03,08,225,28*48
+-{"class":"SKY","time":"2019-04-07T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18},{"PRN":1,"el":29.1,"az":221.2,"ss":26.0,"used":true,"gnssid":0,"svid":1}]}
++{"class":"SKY","time":"1999-08-22T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18},{"PRN":1,"el":29.1,"az":221.2,"ss":26.0,"used":true,"gnssid":0,"svid":1}]}
+ $GPGSV,2,1,06,19,26,250,29,18,26,096,35,01,29,221,26,11,24,307,29*7E
+ $GPGSV,2,2,06,03,08,225,28,22,65,094,38*7E
+-{"class":"SKY","time":"2019-04-07T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18},{"PRN":1,"el":29.1,"az":221.2,"ss":26.0,"used":true,"gnssid":0,"svid":1},{"PRN":11,"el":24.4,"az":307.3,"ss":29.0,"used":true,"gnssid":0,"svid":11}]}
++{"class":"SKY","time":"1999-08-22T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18},{"PRN":1,"el":29.1,"az":221.2,"ss":26.0,"used":true,"gnssid":0,"svid":1},{"PRN":11,"el":24.4,"az":307.3,"ss":29.0,"used":true,"gnssid":0,"svid":11}]}
+ $GPGSV,2,1,07,19,26,250,29,18,26,096,35,01,29,221,26,11,24,307,29*7F
+ $GPGSV,2,2,07,03,08,225,28,22,65,094,38,09,24,045,38*4A
+-{"class":"SKY","time":"2019-04-07T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18},{"PRN":1,"el":29.1,"az":221.2,"ss":26.0,"used":true,"gnssid":0,"svid":1},{"PRN":11,"el":24.4,"az":307.3,"ss":29.0,"used":true,"gnssid":0,"svid":11},{"PRN":3,"el":7.9,"az":225.4,"ss":28.0,"used":true,"gnssid":0,"svid":3}]}
++{"class":"SKY","time":"1999-08-22T06:57:22.584Z","xdop":0.72,"ydop":2.76,"vdop":2.56,"tdop":1.47,"hdop":1.43,"gdop":3.28,"pdop":2.93,"satellites":[{"PRN":19,"el":26.0,"az":249.7,"ss":29.0,"used":true,"gnssid":0,"svid":19},{"PRN":18,"el":26.3,"az":95.6,"ss":35.0,"used":true,"gnssid":0,"svid":18},{"PRN":1,"el":29.1,"az":221.2,"ss":26.0,"used":true,"gnssid":0,"svid":1},{"PRN":11,"el":24.4,"az":307.3,"ss":29.0,"used":true,"gnssid":0,"svid":11},{"PRN":3,"el":7.9,"az":225.4,"ss":28.0,"used":true,"gnssid":0,"svid":3}]}
+ $GPRMC,,V,,S,,W,,,,,*35
+ $GPGSA,A,1,19,18,1,11,3,22,9,,,,,,,,,*08
+ {"class":"TPV","mode":1}
+--- a/test/daemon/trimble-lasseniq-bin2d.log.chk
++++ b/test/daemon/trimble-lasseniq-bin2d.log.chk
+@@ -1,5 +1,5 @@
+-$GPRMC,233739.00,V,4404.1298,N,12118.8428,W,,,120419,14.4,E*67
+-{"class":"TPV","mode":0,"time":"2019-04-12T23:37:39.000Z","ept":0.005}
++$GPRMC,233739.00,V,4404.1298,N,12118.8428,W,,,270899,14.4,E*65
++{"class":"TPV","mode":0,"time":"1999-08-27T23:37:39.000Z","ept":0.005}
+ $GPZDA,233739.00,01,11,2019,00,00*62
+ $GPGGA,233739.00,4404.1299,N,12118.8429,W,1,03,,1126.37,M,-22.154,M,,*7A
+ $GPRMC,233739.00,A,4404.1299,N,12118.8429,W,0.0000,0.000,011119,14.4,E*46
diff -Nru gpsd-3.20/debian/source/include-binaries gpsd-3.20/debian/source/include-binaries
--- gpsd-3.20/debian/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
+++ gpsd-3.20/debian/source/include-binaries	2021-08-04 15:34:28.000000000 +0000
@@ -0,0 +1 @@
+test/daemon/sirfstarv.log
Binary files /tmp/tmprl_k13xv/nlZUboZmNW/gpsd-3.20/test/daemon/sirfstarv.log and /tmp/tmprl_k13xv/xAAOeWbVpz/gpsd-3.20/test/daemon/sirfstarv.log differ