Browse Source

choose more appropriate name for gpsd debug tools; remove dbgsym migration

master
Boian Bonev 2 months ago
parent
commit
7c795ac65d
5 changed files with 31 additions and 9 deletions
  1. +2
    -2
      debian/changelog
  2. +2
    -2
      debian/control.in
  3. +0
    -0
      debian/gpsd-debugtools.install
  4. +22
    -0
      debian/patches/spelling.patch
  5. +5
    -5
      debian/rules

+ 2
- 2
debian/changelog View File

@@ -2,8 +2,8 @@ gpsd (3.20-12+devuan1) unstable; urgency=medium

* Fork Debian package for Devuan (Closes: #490, #314)
* Remove systemd related stuff and restore sysvinit startup
* Rename gpsd-dbg to gpsd-dbg-tools
* Install gpsd-dbg-tools binaries under /usr/libexec/gpsd
* Rename gpsd-dbg to gpsd-debugtools
* Install gpsd-debugtools binaries under /usr/libexec/gpsd

-- Boian Bonev <bbonev@ipacct.com> Tue, 14 Jul 2020 20:41:45 +0000



+ 2
- 2
debian/control.in View File

@@ -56,13 +56,13 @@ Description: Global Positioning System - daemon
This also includes common tools ubxtool and gpsctl for device configuration
of the local hardware as well as a ntpshmmon to check generated refclock data.

Package: gpsd-dbg-tools
Package: gpsd-debugtools
Architecture: any
Section: debug
Provides: gpsd-dbg
Breaks: gpsd-dbg
Replaces: gpsd-dbg
Suggests: gpsd-dbgsym, gpsd-dbg-tools-dbgsym
Suggests: gpsd-dbgsym, gpsd-debugtools-dbgsym
Depends: ${shlibs:Depends}, ${misc:Depends}, python3, ${python3:Depends},
libgpsLIBGPSSONAME (= ${binary:Version}) | gpsd (= ${binary:Version}) | gpsd-clients (= ${binary:Version}) | python3-gps (= ${binary:Version})
Description: Global Positioning System - debugging tools


debian/gpsd-dbg-tools.install → debian/gpsd-debugtools.install View File


+ 22
- 0
debian/patches/spelling.patch View File

@@ -1173,3 +1173,25 @@ index f6b8e66..2eb5f68 100644
# out enough about it.
#
# The no fix segment has GPRMC with lat/lon/alt, followed by GPGSA,
--- a/man/gpscat.xml
+++ b/man/gpscat.xml
@@ -96,7 +96,7 @@
<listitem>
<para>In packetizer mode, enable progress messages from the packet
getter. Probably only of interest to developers testing packet
-getter changes. Higher arguements to D produce more output.</para>
+getter changes. Higher arguments to D produce more output.</para>
</listitem>
</varlistentry>
--- a/man/ntpshmmon.xml
+++ b/man/ntpshmmon.xml
@@ -65,7 +65,7 @@
version of the output format; the version line begins with "ntpshmmon
version" and is followed by a numeric version field.</para>
-<para>The remainder of the file is either commments or sample lines. A
+<para>The remainder of the file is either comments or sample lines. A
comment line begins with a # and should ignored by programs that
interpret this format.</para>

+ 5
- 5
debian/rules View File

@@ -74,7 +74,7 @@ PACKAGE_LIB_DEV := libgps-dev
PACKAGE_QTLIB_DEV := libqgpsmm-dev
PACKAGE_PY := python-gps
PACKAGE_PY3 := python3-gps
PACKAGE_GPSDDBG := gpsd-dbg-tools
PACKAGE_GPSDDBG := gpsd-debugtools


cflags := $(shell DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) dpkg-buildflags --get CFLAGS)
@@ -128,7 +128,7 @@ ifeq (,$(findstring hurd,$(DEB_HOST_ARCH_OS)))
endif
endif
# ensure the test tools are built
$(SCONS_ENV) $(PYTHON3) /usr/bin/scons $(SCONSOPTS) $(shell grep test_ debian/gpsd-dbg-tools.install | grep -v '\.py' | awk '{print $$1}')
$(SCONS_ENV) $(PYTHON3) /usr/bin/scons $(SCONSOPTS) $(shell grep test_ debian/gpsd-debugtools.install | grep -v '\.py' | awk '{print $$1}')
touch $@

build-static-stamp: SConstruct.deb_revision
@@ -205,14 +205,14 @@ binary: install-stamp
dh_installinit -- start 26 2 3 4 5 . stop 73 0 1 6 .
dh_installexamples
chmod 644 debian/$(PACKAGE_PY3)/usr/lib/python3*/*-packages/gps/gps.py
dh_python3 -Ngpsd-clients -Ngpsd-dbg-tools
dh_python3 -pgpsd-dbg-tools usr/libexec/gpsd/debug
dh_python3 -Ngpsd-clients -Ngpsd-debugtools
dh_python3 -pgpsd-debugtools usr/libexec/gpsd/debug
dh_python3 -pgpsd-clients usr/bin
dh_python3 -pgpsd lib/udev/
cp $(CURDIR)/gpsd.rules $(CURDIR)/debian/gpsd.udev
dh_installudev
dh_link
dh_strip --dbgsym-migration='gpsd-dbg-tools (<< 3.16-4~)'
dh_strip
dh_buildinfo -p$(PACKAGE_GPSDDBG)
dh_compress
dh_fixperms -Xgpsd.hotplug


Loading…
Cancel
Save