Browse Source

exchange gpsd-client/tools content

As suggested by bzed this allows people used to install gpsd-clients (or
having it installed on upgrade) to retain the same set of binaries.

gpsd-tools will be the one now suggested by gpsd and the one with the
reduced dependencies meant for most common installations.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
master
Christian Ehrhardt 5 months ago
parent
commit
7670b61e33
No known key found for this signature in database GPG Key ID: BA3E29338280B242
5 changed files with 59 additions and 59 deletions
  1. +11
    -11
      debian/control
  2. +11
    -11
      debian/control.in
  3. +30
    -4
      debian/gpsd-clients.install
  4. +4
    -30
      debian/gpsd-tools.install
  5. +3
    -3
      debian/rules

+ 11
- 11
debian/control View File

@@ -36,10 +36,10 @@ Depends: netbase | systemd-sysv, lsb-base (>= 3.2-13),
${shlibs:Depends}, ${misc:Depends},
libgps25 (= ${binary:Version}),
${python3:Depends}, python3
Recommends: udev [linux-any], gpsd-clients
Breaks: ${gpsd:Breaks}, gpsd-clients (<< 3.20-9)
Replaces: gpsd-clients (<< 3.20-9)
Suggests: gpsd-tools, dbus, apparmor
Recommends: udev [linux-any], gpsd-tools
Breaks: ${gpsd:Breaks}, gpsd-tools (<< 3.20-10)
Replaces: gpsd-tools (<< 3.20-10)
Suggests: gpsd-clients, dbus, apparmor
Conflicts: fso-gpsd
Multi-Arch: foreign
Description: Global Positioning System - daemon
@@ -70,14 +70,14 @@ Description: Global Positioning System - debugging symbols
to the debug the behaviour of gpsd. Debug symbols are being shipped
in the dbgsym package.

Package: gpsd-clients
Package: gpsd-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgps25 (= ${binary:Version}),
Suggests: gpsd
Breaks: python-gps, gpsd (<< 3.20-9)
Replaces: python-gps
Description: Global Positioning System - clients
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
sensors available to be queried on TCP port 2947.
@@ -85,17 +85,17 @@ Description: Global Positioning System - clients
This package contains the most common tools 'gpsmon' and 'cgps' used to
access a GPS device.

Package: gpsd-tools
Package: gpsd-clients
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgps25 (= ${binary:Version}),
gpsd-clients (= ${binary:Version}),
gpsd-tools (= ${binary:Version}),
python3-gps, python3-gi, python3-cairo, gir1.2-gtk-3.0, python3-serial, python3-gi-cairo, ${python3:Depends},
python3
Suggests: gpsd
Breaks: python-gps, gpsd-clients (<< 3.20-9)
Replaces: python-gps, gpsd-clients (<< 3.20-9)
Description: Global Positioning System - tools
Breaks: python-gps, gpsd-tools (<< 3.20-10)
Replaces: python-gps, gpsd-tools (<< 3.20-10)
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.


+ 11
- 11
debian/control.in View File

@@ -36,10 +36,10 @@ Depends: netbase | systemd-sysv, lsb-base (>= 3.2-13),
${shlibs:Depends}, ${misc:Depends},
libgpsLIBGPSSONAME (= ${binary:Version}),
${python3:Depends}, python3
Recommends: udev [linux-any], gpsd-clients
Breaks: ${gpsd:Breaks}, gpsd-clients (<< 3.20-9)
Replaces: gpsd-clients (<< 3.20-9)
Suggests: gpsd-tools, dbus, apparmor
Recommends: udev [linux-any], gpsd-tools
Breaks: ${gpsd:Breaks}, gpsd-tools (<< 3.20-10)
Replaces: gpsd-tools (<< 3.20-10)
Suggests: gpsd-clients, dbus, apparmor
Conflicts: fso-gpsd
Multi-Arch: foreign
Description: Global Positioning System - daemon
@@ -70,14 +70,14 @@ Description: Global Positioning System - debugging symbols
to the debug the behaviour of gpsd. Debug symbols are being shipped
in the dbgsym package.

Package: gpsd-clients
Package: gpsd-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgpsLIBGPSSONAME (= ${binary:Version}),
Suggests: gpsd
Breaks: python-gps, gpsd (<< 3.20-9)
Replaces: python-gps
Description: Global Positioning System - clients
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
sensors available to be queried on TCP port 2947.
@@ -85,17 +85,17 @@ Description: Global Positioning System - clients
This package contains the most common tools 'gpsmon' and 'cgps' used to
access a GPS device.

Package: gpsd-tools
Package: gpsd-clients
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgpsLIBGPSSONAME (= ${binary:Version}),
gpsd-clients (= ${binary:Version}),
gpsd-tools (= ${binary:Version}),
python3-gps, python3-gi, python3-cairo, gir1.2-gtk-3.0, python3-serial, python3-gi-cairo, ${python3:Depends},
python3
Suggests: gpsd
Breaks: python-gps, gpsd-clients (<< 3.20-9)
Replaces: python-gps, gpsd-clients (<< 3.20-9)
Description: Global Positioning System - tools
Breaks: python-gps, gpsd-tools (<< 3.20-10)
Replaces: python-gps, gpsd-tools (<< 3.20-10)
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.


+ 30
- 4
debian/gpsd-clients.install View File

@@ -1,4 +1,30 @@
usr/bin/gpsmon
usr/bin/cgps
usr/share/man/man1/gpsmon.1
usr/share/man/man1/cgps.1
usr/bin/gpspipe
usr/bin/gpsdecode
usr/bin/xgps
usr/bin/xgpsspeed
usr/bin/gpxlogger
usr/bin/lcdgps
usr/bin/gegps
usr/bin/gps2udp
usr/bin/zerk
usr/bin/gpscat
usr/bin/gpsfake
usr/bin/gpsprof
usr/bin/gpsrinex
usr/share/man/man1/gps.1
usr/share/man/man1/gpspipe.1
usr/share/man/man1/gpsdecode.1
usr/share/man/man1/gegps.1
usr/share/man/man1/lcdgps.1
usr/share/man/man1/xgps.1
usr/share/man/man1/xgpsspeed.1
usr/share/man/man1/gpxlogger.1
usr/share/man/man1/gps2udp.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/share/man/man1/gpsrinex.1
packaging/X11/xgps.desktop usr/share/applications
packaging/X11/xgpsspeed.desktop usr/share/applications
packaging/X11/gpsd-logo.png /usr/share/gpsd

+ 4
- 30
debian/gpsd-tools.install View File

@@ -1,30 +1,4 @@
usr/bin/gpspipe
usr/bin/gpsdecode
usr/bin/xgps
usr/bin/xgpsspeed
usr/bin/gpxlogger
usr/bin/lcdgps
usr/bin/gegps
usr/bin/gps2udp
usr/bin/zerk
usr/bin/gpscat
usr/bin/gpsfake
usr/bin/gpsprof
usr/bin/gpsrinex
usr/share/man/man1/gps.1
usr/share/man/man1/gpspipe.1
usr/share/man/man1/gpsdecode.1
usr/share/man/man1/gegps.1
usr/share/man/man1/lcdgps.1
usr/share/man/man1/xgps.1
usr/share/man/man1/xgpsspeed.1
usr/share/man/man1/gpxlogger.1
usr/share/man/man1/gps2udp.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/share/man/man1/gpsrinex.1
packaging/X11/xgps.desktop usr/share/applications
packaging/X11/xgpsspeed.desktop usr/share/applications
packaging/X11/gpsd-logo.png /usr/share/gpsd
usr/bin/gpsmon
usr/bin/cgps
usr/share/man/man1/gpsmon.1
usr/share/man/man1/cgps.1

+ 3
- 3
debian/rules View File

@@ -179,7 +179,7 @@ install-stamp: build-stamp build-static-stamp $(LIBGPS_DEBIAN_FILE_TARGETS)
rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgps.so.$(LIBGPS_SONAME)
dh_missing --fail-missing
# use python3
sed -i 's,/usr/bin/env python,/usr/bin/env python3,' debian/gpsd-tools/usr/bin/*
sed -i 's,/usr/bin/env python,/usr/bin/env python3,' debian/gpsd-clients/usr/bin/*
sed -i 's,^#!/usr/bin/env python,#!/usr/bin/env python3,' debian/*/usr/lib/gpsd/debug/*.py
touch $@

@@ -201,9 +201,9 @@ binary: install-stamp
dh_installsystemd -pgpsd --restart-after-upgrade
dh_installexamples
chmod 755 debian/$(PACKAGE_PY3)/usr/lib/python3*/*-packages/gps/gps.py
dh_python3 -Ngpsd-tools -Ngpsd-dbg
dh_python3 -Ngpsd-clients -Ngpsd-dbg
dh_python3 -pgpsd-dbg usr/lib/gpsd/debug
dh_python3 -pgpsd-tools usr/bin
dh_python3 -pgpsd-clients usr/bin
dh_python3 -pgpsd lib/udev/
cp $(CURDIR)/gpsd.rules $(CURDIR)/debian/gpsd.udev
dh_installudev


Loading…
Cancel
Save