Browse Source

merge with suites/unstable

master
Boian Bonev 2 months ago
parent
commit
f506dcbd8f
6 changed files with 13 additions and 23 deletions
  1. +1
    -2
      debian/changelog
  2. +3
    -6
      debian/control
  3. +2
    -11
      debian/control.in
  4. +0
    -0
      debian/gpsd-dbg.install
  5. +4
    -4
      debian/rules
  6. +3
    -0
      debian/source/lintian-overrides

+ 1
- 2
debian/changelog View File

@@ -2,8 +2,7 @@ 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-debugtools
* Install gpsd-debugtools binaries under /usr/libexec/gpsd
* Install gpsd-dbg binaries under /usr/libexec/gpsd
* Enable hardened build
* Update standards to 4.5.0
* Bump debhelper to 13


+ 3
- 6
debian/control View File

@@ -56,13 +56,10 @@ 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-debugtools
Package: gpsd-dbg
Architecture: any
Section: debug
Provides: gpsd-dbg
Breaks: gpsd-dbg
Replaces: gpsd-dbg
Suggests: gpsd-dbgsym, gpsd-debugtools-dbgsym
Section: misc
Suggests: gpsd-dbgsym
Depends: ${shlibs:Depends}, ${misc:Depends}, python3, ${python3:Depends},
libgps26 (= ${binary:Version}) | gpsd (= ${binary:Version}) | gpsd-clients (= ${binary:Version}) | python3-gps (= ${binary:Version})
Description: Global Positioning System - debugging tools


+ 2
- 11
debian/control.in View File

@@ -57,18 +57,9 @@ Description: Global Positioning System - daemon
of the local hardware as well as a ntpshmmon to check generated refclock data.

Package: gpsd-dbg
Depends: gpsd-debugtools, ${misc:Depends}
Architecture: all
Priority: optional
Description: transitional package
This is a transitional package. It can safely be removed.

Package: gpsd-debugtools
Architecture: any
Provides: gpsd-dbg
Breaks: gpsd-dbg
Replaces: gpsd-dbg
Suggests: gpsd-dbgsym, gpsd-debugtools-dbgsym
Section: misc
Suggests: gpsd-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-debugtools.install → debian/gpsd-dbg.install View File


+ 4
- 4
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-debugtools
PACKAGE_GPSDDBG := gpsd-dbg


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-debugtools.install | grep -v '\.py' | awk '{print $$1}')
$(SCONS_ENV) $(PYTHON3) /usr/bin/scons $(SCONSOPTS) $(shell grep test_ debian/gpsd-dbg.install | grep -v '\.py' | awk '{print $$1}')
touch $@

build-static-stamp: SConstruct.deb_revision
@@ -205,8 +205,8 @@ 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-debugtools
dh_python3 -pgpsd-debugtools usr/libexec/gpsd/debug
dh_python3 -Ngpsd-clients -Ngpsd-dbg
dh_python3 -pgpsd-dbg usr/libexec/gpsd/debug
dh_python3 -pgpsd-clients usr/bin
dh_python3 -pgpsd lib/udev/
cp $(CURDIR)/gpsd.rules $(CURDIR)/debian/gpsd.udev


+ 3
- 0
debian/source/lintian-overrides View File

@@ -0,0 +1,3 @@
# this is no old style -dbg(sym) but a collection of test tools
gpsd: debian-control-has-obsolete-dbg-package gpsd-dbg
gpsd source: package-builds-dbg-and-dbgsym-variants

Loading…
Cancel
Save