Updates for bullseye, drop jessie support.

* dh-compat 10
 * no dh-systemd dependency
 * backport version for buster
 * teach prepare-build about bullseye
 * update stretch maintainer address
 * update Jenkinsfile (this will be broken until the builder machine is upgraded)

Jenkinsfile

@@ -8,7 +8,7 @@ node(label: 'raspberrypi') {
         durabilityHint(hint: 'PERFORMANCE_OPTIMIZED')
     ])
 
-    def dists = ["buster", "stretch", "jessie"]
+    def dists = ["bullseye", "buster", "stretch"]
     def srcdir = "${WORKSPACE}/src"
 
     stage('Checkout') {

README.md

@@ -16,31 +16,18 @@ it can be used to contribute crowd-sourced flight tracking data to FlightAware.
 It is designed to build as a Debian package, but should also be buildable on
 many other Linux or Unix-like systems.
 
-## Building under buster
+## Building under bullseye, buster, or stretch
 
 ```bash
-$ sudo apt-get install build-essential fakeroot debhelper librtlsdr-dev pkg-config dh-systemd libncurses5-dev libbladerf-dev libhackrf-dev liblimesuite-dev
+$ sudo apt-get install build-essential fakeroot debhelper librtlsdr-dev pkg-config libncurses5-dev libbladerf-dev libhackrf-dev liblimesuite-dev
-$ ./prepare-build.sh buster
+$ ./prepare-build.sh bullseye    # or buster, or stretch
-$ cd buster
+$ cd package-bullseye            # or buster, or stretch
 $ dpkg-buildpackage -b --no-sign
 ```
 
-## Building under stretch
-
-```bash
-$ sudo apt-get install build-essential debhelper librtlsdr-dev pkg-config dh-systemd libncurses5-dev libbladerf-dev
-$ ./prepare-build.sh stretch
-$ cd stretch
-$ dpkg-buildpackage -b --no-sign
-```
-
-### Actually building it
-
-Nothing special, just build it (`dpkg-buildpackage -b`)
-
 ## Building with limited dependencies
 
-(Supported for buster builds only)
+(Supported for bullseye and buster builds only)
 
 The package supports some build profiles to allow building without all
 required SDR libraries being present. This will produce a package with

debian-jessie/control

@@ -1,30 +0,0 @@
-Source: dump1090-fa
-Section: embedded
-Priority: extra
-Maintainer: Oliver Jowett <oliver@mutability.co.uk>
-Build-Depends: debhelper(>=9), librtlsdr-dev, libusb-1.0-0-dev, pkg-config, dh-systemd, libncurses5-dev, libbladerf-dev
-Standards-Version: 3.9.3
-Homepage: http://www.flightaware.com/
-Vcs-Git: https://github.com/flightaware/dump1090.git
-
-Package: dump1090
-Architecture: all
-Depends: dump1090-fa, ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: transitional dummy package for dump1090
-  This is a transitional dummy package to handle upgrades from
-  the old package name of "dump1090" to the new package name of
-  "dump1090-fa". It can safely be removed.
-
-Package: dump1090-fa
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libbladerf1 (>= 0.2016.06), adduser, lighttpd
-Replaces: dump1090 (<< 3.0)
-Breaks: dump1090 (<< 3.0)
-Description: ADS-B Ground Station System for RTL-SDR
- Networked Aviation Mode S / ADS-B decoder/translator with RTL-SDR software
- defined radio USB device support.
- .
- This is FlightAware's fork of dump1090-mutability, customized for use
- in the PiAware sdcard images.

debian-jessie/rules

@@ -1,29 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-override_dh_auto_build:
-	# jessie's gcc doesn't support the compiler flags needed for ARM-specific starch flavors;
-	# turn off runtime CPU detection
-	dh_auto_build -- RTLSDR=yes BLADERF=yes HACKRF=no LIMESDR=no DUMP1090_VERSION=$(DEB_VERSION) CPUFEATURES=no
-
-override_dh_install:
-	dh_install
-	install -d debian/dump1090-fa/usr/bin
-	cp -a dump1090 debian/dump1090-fa/usr/bin/dump1090-fa
-	cp -a view1090 debian/dump1090-fa/usr/bin/view1090-fa
-
-%:
-	dh $@ --with=systemd

debian-stretch/control

@@ -1,8 +1,8 @@
 Source: dump1090-fa
 Section: embedded
 Priority: extra
-Maintainer: Oliver Jowett <oliver@mutability.co.uk>
+Maintainer: Oliver Jowett <oliver.jowett@flightaware.com>
-Build-Depends: debhelper(>=9), librtlsdr-dev, libusb-1.0-0-dev, pkg-config, dh-systemd, libncurses5-dev, libbladerf-dev
+Build-Depends: debhelper(>=10), librtlsdr-dev, libusb-1.0-0-dev, pkg-config, libncurses5-dev, libbladerf-dev
 Standards-Version: 3.9.3
 Homepage: http://www.flightaware.com/
 Vcs-Git: https://github.com/flightaware/dump1090.git

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -2,13 +2,13 @@ Source: dump1090-fa
 Section: embedded
 Priority: extra
 Maintainer: Oliver Jowett <oliver.jowett@flightaware.com>
-Build-Depends: debhelper(>=9),
+Build-Depends: debhelper(>=10),
   librtlsdr-dev <!custom> <rtlsdr>,
   libbladerf-dev <!custom> <bladerf>,
   libhackrf-dev <!custom> <hackrf>,
   liblimesuite-dev <!custom> <limesdr>,
   libusb-1.0-0-dev <!custom> <rtlsdr> <bladerf> <hackrf> <limesdr>,
-  pkg-config, dh-systemd, libncurses5-dev
+  pkg-config, libncurses5-dev
 Standards-Version: 3.9.3
 Homepage: http://www.flightaware.com/
 Vcs-Git: https://github.com/flightaware/dump1090.git

prepare-build.sh

@@ -35,21 +35,20 @@ FILES=$(find $TOP -mindepth 1 -maxdepth 1 -name .git -prune -o -name 'debian*' -
 mkdir -p $OUT
 cp -a $FILES $OUT
 cp -a $TOP/debian $OUT
+[ -d $TOP/debian-$DIST ] && cp -a $TOP/debian-$DIST/* $OUT/debian/
 
 case "$DIST" in
-    jessie)
-        cp -a $TOP/debian-jessie/* $OUT/debian/
-        echo "Updating changelog for jessie backport build" >&2
-        dch --changelog $OUT/debian/changelog --local ~bpo8+ --force-distribution --distribution jessie-backports "Automated backport build for jessie"
-        ;;
-
     stretch)
-        cp -a $TOP/debian-stretch/* $OUT/debian/
         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"
+        ;;
+
+    bullseye)
         ;;
 
     *)