Browse Source

split more uncommon tools to gpsd-tools (LP: #1872189)

This will allow people using the common tools like cgps/gpsmon to
not be forced to install all the dependencies of the further tools and
examples.

In addition that allows us to bump the common clients to a recommends.

This is case #7 of https://wiki.debian.org/PackageTransition

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
master
Christian Ehrhardt 6 months ago
parent
commit
2fcf975445
No known key found for this signature in database GPG Key ID: BA3E29338280B242
7 changed files with 80 additions and 48 deletions
  1. +19
    -4
      debian/control
  2. +20
    -4
      debian/control.in
  3. +0
    -36
      debian/gpsd-clients.install
  4. +0
    -0
      debian/gpsd-tools.examples
  5. +36
    -0
      debian/gpsd-tools.install
  6. +1
    -1
      debian/gpsd-tools.postinst
  7. +4
    -3
      debian/rules

+ 19
- 4
debian/control View File

@@ -35,9 +35,9 @@ Depends: netbase | systemd-sysv, lsb-base (>= 3.2-13),
adduser (>= 3.34),
${shlibs:Depends}, ${misc:Depends},
libgps25 (= ${binary:Version})
Recommends: udev [linux-any], ${python3:Depends}, python3
Recommends: udev [linux-any], ${python3:Depends}, python3, gpsd-clients
Breaks: ${gpsd:Breaks}
Suggests: gpsd-clients, dbus, apparmor
Suggests: gpsd-tools, dbus, apparmor
Conflicts: fso-gpsd
Multi-Arch: foreign
Description: Global Positioning System - daemon
@@ -69,12 +69,27 @@ Package: gpsd-clients
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgps25 (= ${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
Replaces: python-gps
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 the most common tools 'gpsmon' and 'cgps' used to
access a GPS device.

Package: gpsd-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgps25 (= ${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
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.


+ 20
- 4
debian/control.in View File

@@ -35,9 +35,9 @@ Depends: netbase | systemd-sysv, lsb-base (>= 3.2-13),
adduser (>= 3.34),
${shlibs:Depends}, ${misc:Depends},
libgpsLIBGPSSONAME (= ${binary:Version})
Recommends: udev [linux-any], ${python3:Depends}, python3
Recommends: udev [linux-any], ${python3:Depends}, python3, gpsd-clients
Breaks: ${gpsd:Breaks}
Suggests: gpsd-clients, dbus, apparmor
Suggests: gpsd-tools, dbus, apparmor
Conflicts: fso-gpsd
Multi-Arch: foreign
Description: Global Positioning System - daemon
@@ -69,12 +69,27 @@ Package: gpsd-clients
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgpsLIBGPSSONAME (= ${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
Replaces: python-gps
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 the most common tools 'gpsmon' and 'cgps' used to
access a GPS device.

Package: gpsd-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgpsLIBGPSSONAME (= ${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
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.
@@ -82,6 +97,7 @@ Description: Global Positioning System - clients
This package contains auxiliary tools and example clients for monitoring,
testing, latency-profiling, device configuration and simulating gpsd.


Package: python3-gps
Architecture: any
Section: python


+ 0
- 36
debian/gpsd-clients.install View File

@@ -1,40 +1,4 @@
usr/bin/gpsctl
usr/bin/gpspipe
usr/bin/gpsmon
usr/bin/gpsdecode
usr/bin/xgps
usr/bin/xgpsspeed
usr/bin/gpxlogger
usr/bin/lcdgps
usr/bin/cgps
usr/bin/gegps
usr/bin/gps2udp
usr/bin/ubxtool
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/gpsmon.1
usr/share/man/man1/gpsdecode.1
usr/share/man/man1/gpsctl.1
usr/share/man/man1/cgps.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/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
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

debian/gpsd-clients.examples → debian/gpsd-tools.examples View File


+ 36
- 0
debian/gpsd-tools.install View File

@@ -0,0 +1,36 @@
usr/bin/gpsctl
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/ubxtool
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/gpsctl.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/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
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

debian/gpsd-clients.postinst → debian/gpsd-tools.postinst View File

@@ -1,5 +1,5 @@
#!/bin/bash
# postinst script for gpsd-clients
# postinst script for gpsd-tools

set -e


+ 4
- 3
debian/rules View File

@@ -61,6 +61,7 @@ endif
#package names
PACKAGE_GPSD := gpsd
PACKAGE_CLIENTS := gpsd-clients
PACKAGE_TOOLS := gpsd-tools
PACKAGE_LIB := libgps$(LIB_soname)
PACKAGE_QTLIB := libqgpsmm$(LIB_soname)
PACKAGE_LIB_DEV := libgps-dev
@@ -178,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-clients/usr/bin/*
sed -i 's,/usr/bin/env python,/usr/bin/env python3,' debian/gpsd-tools/usr/bin/*
sed -i 's,^#!python.*,#!/usr/bin/python3,' debian/*/usr/lib/gpsd/debug/*.py
touch $@

@@ -200,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 -Ngpsd-clients -Ngpsd-dbg
dh_python3 -Ngpsd -Ngpsd-tools -Ngpsd-dbg
dh_python3 -pgpsd-dbg usr/lib/gpsd/debug
dh_python3 -pgpsd-clients usr/bin
dh_python3 -pgpsd-tools usr/bin
dh_python3 -pgpsd lib/udev/
cp $(CURDIR)/gpsd.rules $(CURDIR)/debian/gpsd.udev
dh_installudev


Loading…
Cancel
Save