d/control{.in}, d/gpsd-clients.install, d/python3-gps.install: tools gpscat, gpsfake and gpsprof are python2 and part of the cli tools, so move them from python3-gps to gpsd-clients

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

debian/control

@@ -76,14 +76,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  python-gps, python3-gps, python-gtk2, python-cairo, gir1.2-gtk-3.0, python-serial, python-gi-cairo, ${python:Depends}
 Suggests: gpsd
 Conflicts: gps
-Breaks: ${python:Breaks}
+Breaks: ${python:Breaks}, python-gps (<<3.18.1-1)
+Replaces: python-gps (<<3.18.1-1)
 Description: Global Positioning System - clients
  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
  sensors available to be queried on TCP port 2947.
  .
- This package contains auxiliary tools and example clients for monitoring and
- testing gpsd.
+ This package contains auxiliary tools and example clients for monitoring,
+ testing, latency-profiling, device configuration and simulating gpsd.
 
 Package: python-gps
 Architecture: any
@@ -93,7 +94,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= 2.6) | python-simplejson
 Recommends: gpsd
 Provides: ${python:Provides}
-Breaks: ${python:Breaks}
+Breaks: ${python:Breaks}, gpsd-clients (<<3.18.1-1)
 Conflicts: python-json
 Description: Global Positioning System - Python 2 libraries
  The gpsd service daemon can monitor one or more GPS devices connected to
@@ -101,9 +102,7 @@ Description: Global Positioning System - Python 2 libraries
  sensors available to be queried on TCP port 2947.
  .
  This package contains a Python 2 interface to connect to gpsd, together with
- a module providing a controlled testing environment. It also ships two tools
- which utilize the interface: gpsprof for latency-profiling, and gpsfake to
- simulate a GPS by playing back a logfile.
+ a module providing a controlled testing environment.
 
 Package: python3-gps
 Architecture: any
@@ -119,9 +118,7 @@ Description: Global Positioning System - Python 3 libraries
  sensors available to be queried on TCP port 2947.
  .
  This package contains a Python 3 interface to connect to gpsd, together with
- a module providing a controlled testing environment. It also ships two tools
- which utilize the interface: gpsprof for latency-profiling, and gpsfake to
- simulate a GPS by playing back a logfile.
+ a module providing a controlled testing environment.
 
 Package: libgps23
 Architecture: any

debian/control.in

@@ -76,14 +76,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  python-gps, python3-gps, python-gtk2, python-cairo, gir1.2-gtk-3.0, python-serial, python-gi-cairo, ${python:Depends}
 Suggests: gpsd
 Conflicts: gps
-Breaks: ${python:Breaks}
+Breaks: ${python:Breaks}, python-gps (<<3.18.1-1)
+Replaces: python-gps (<<3.18.1-1)
 Description: Global Positioning System - clients
  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
  sensors available to be queried on TCP port 2947.
  .
- This package contains auxiliary tools and example clients for monitoring and
- testing gpsd.
+ This package contains auxiliary tools and example clients for monitoring,
+ testing, latency-profiling, device configuration and simulating gpsd.
 
 Package: python-gps
 Architecture: any
@@ -93,7 +94,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= 2.6) | python-simplejson
 Recommends: gpsd
 Provides: ${python:Provides}
-Breaks: ${python:Breaks}
+Breaks: ${python:Breaks}, gpsd-clients (<<3.18.1-1)
 Conflicts: python-json
 Description: Global Positioning System - Python 2 libraries
  The gpsd service daemon can monitor one or more GPS devices connected to
@@ -101,9 +102,7 @@ Description: Global Positioning System - Python 2 libraries
  sensors available to be queried on TCP port 2947.
  .
  This package contains a Python 2 interface to connect to gpsd, together with
- a module providing a controlled testing environment. It also ships two tools
- which utilize the interface: gpsprof for latency-profiling, and gpsfake to
- simulate a GPS by playing back a logfile.
+ a module providing a controlled testing environment.
 
 Package: python3-gps
 Architecture: any
@@ -119,9 +118,7 @@ Description: Global Positioning System - Python 3 libraries
  sensors available to be queried on TCP port 2947.
  .
  This package contains a Python 3 interface to connect to gpsd, together with
- a module providing a controlled testing environment. It also ships two tools
- which utilize the interface: gpsprof for latency-profiling, and gpsfake to
- simulate a GPS by playing back a logfile.
+ a module providing a controlled testing environment.
 
 Package: libgpsLIBGPSSONAME
 Architecture: any

debian/gpsd-clients.install

@@ -11,6 +11,9 @@ usr/bin/gegps
 usr/bin/gps2udp
 usr/bin/ubxtool
 usr/bin/zerk
+usr/bin/gpscat
+usr/bin/gpsfake
+usr/bin/gpsprof
 usr/share/man/man1/gps.1
 usr/share/man/man1/gpspipe.1
 usr/share/man/man1/gpsmon.1
@@ -25,6 +28,9 @@ usr/share/man/man1/gpxlogger.1
 usr/share/man/man1/gps2udp.1
 usr/share/man/man1/ubxtool.1
 usr/share/man/man1/zerk.1
+usr/share/man/man1/gpsfake.1
+usr/share/man/man1/gpscat.1
+usr/share/man/man1/gpsprof.1
 usr/bin/ntpshmmon
 usr/share/man/man1/ntpshmmon.1
 packaging/X11/xgps.desktop usr/share/applications

debian/python3-gps.install

@@ -2,9 +2,3 @@ usr/lib/python3*/*/gps/*.py
 usr/lib/python3*/*/gps/clienthelpers.*.so
 usr/lib/python3*/*/gps/packet.*.so
 usr/lib/python3*/*/*.egg-info
-usr/share/man/man1/gpsfake.1
-usr/share/man/man1/gpscat.1
-usr/share/man/man1/gpsprof.1
-usr/bin/gpscat
-usr/bin/gpsfake
-usr/bin/gpsprof