Skip to content

Commit

Permalink
Switch to compat 12. Remove vestiges of stretch support.
Browse files Browse the repository at this point in the history
This switches us to using dh_installsystemd, and fixes some
service-restart-on-upgrade paths.

compat 12 was introduced in buster, so this won't work on
stretch, but we no longer support stretch so that's OK.
  • Loading branch information
mutability committed Nov 3, 2023
1 parent 455f3d0 commit 3fe5d5b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 75 deletions.
30 changes: 0 additions & 30 deletions debian-stretch/control

This file was deleted.

35 changes: 0 additions & 35 deletions debian-stretch/rules

This file was deleted.

2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
3 changes: 2 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: dump1090-fa
Section: embedded
Priority: extra
Maintainer: Oliver Jowett <[email protected]>
Build-Depends: debhelper(>=10),
Build-Depends: debhelper(>=12),
librtlsdr-dev <!custom> <rtlsdr>,
libbladerf-dev <!custom> <bladerf>,
libhackrf-dev <!custom> <hackrf>,
Expand All @@ -16,6 +16,7 @@ Vcs-Git: https://github.com/flightaware/dump1090.git

Package: dump1090-fa
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lighttpd
Description: FlightAware ADS-B Ground Station System for SDRs
Networked Aviation Mode S / ADS-B decoder/translator with support
Expand Down
6 changes: 3 additions & 3 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ override_dh_install:
override_dh_installinit:
dh_installinit --no-restart-after-upgrade

override_dh_systemd_start:
dh_systemd_start --no-restart-after-upgrade
override_dh_installsystemd:
dh_installsystemd --no-restart-after-upgrade

%:
dh $@ --with=systemd
dh $@
5 changes: 0 additions & 5 deletions prepare-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ cp -a $TOP/debian $OUT
[ -d $TOP/debian-$DIST ] && cp -a $TOP/debian-$DIST/* $OUT/debian/

case "$DIST" in
stretch)
echo "Updating changelog for stretch backport build" >&2
dch --changelog $OUT/debian/changelog --local ~bpo9+ --force-distribution --distribution stretch-backports "Automated backport build for jessie"
;;

buster)
echo "Updating changelog for buster backport build" >&2
dch --changelog $OUT/debian/changelog --local ~bpo10+ --force-distribution --distribution buster-backports "Automated backport build for buster"
Expand Down

0 comments on commit 3fe5d5b

Please sign in to comment.