From 6e7c32bde0009513daaa8b0d2b38f5c9adc61a38 Mon Sep 17 00:00:00 2001
From: Oliver Jowett <oliver@mutability.co.uk>
Date: Fri, 29 Jun 2018 12:54:33 -0500
Subject: [PATCH] Give up on a single control file for jessie+stretch, just
 handle the dependency difference separately.

---
 debian-wheezy/control | 2 +-
 debian/control        | 5 ++---
 prepare-build.sh      | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian-wheezy/control b/debian-wheezy/control
index f33c3d3..6181dec 100644
--- a/debian-wheezy/control
+++ b/debian-wheezy/control
@@ -26,5 +26,5 @@ 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 packaging of dump1090-mutability, customized for use
+ This is FlightAware's fork of dump1090-mutability, customized for use
  in the PiAware sdcard images.
diff --git a/debian/control b/debian/control
index 4a0576f..f60de0d 100644
--- a/debian/control
+++ b/debian/control
@@ -19,13 +19,12 @@ Description: transitional dummy package for dump1090
 
 Package: dump1090-fa
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libbladerf1 (>= 0.2016.06), libbladerf-udev, adduser, lighttpd
-Conflicts: libbladerf1 (>= 2000), libbladerf1 (<< 2016.06)
+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 packaging of dump1090-mutability, customized for use
+ This is FlightAware's fork of dump1090-mutability, customized for use
  in the PiAware sdcard images.
diff --git a/prepare-build.sh b/prepare-build.sh
index aa43a65..e9563a2 100755
--- a/prepare-build.sh
+++ b/prepare-build.sh
@@ -43,6 +43,7 @@ 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"
         ;;