From 4893d3da1fa165a7247193715495f7608d772b59 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 23 Sep 2020 18:42:56 +0200
Subject: [PATCH] Add back debian bullseye and add dh-make to ubuntu too

---
 .circleci/config.yml       | 14 +++++++++
 .github/workflows/ccpp.yml | 60 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31cf0b78..55cf027b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -283,6 +283,7 @@ commands:
           command: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -405,6 +406,15 @@ jobs:
       - cmake
       - build_deb
 
+  build_debian_bullseye:
+    docker:
+      - image: debian:bullseye
+    steps:
+      - install_debian_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
 
   build_ubuntu_bionic:
     docker:
@@ -474,6 +484,10 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - build_debian_bullseye:
+          filters:
+            tags:
+              only: /.*/
 
 
       - build_ubuntu_bionic:
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index a71dc42d..0a957e08 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -752,6 +752,63 @@ jobs:
         run: dpkg-buildpackage -b -d -uc -us -nc -j2
 
 
+  build_debian_bullseye:
+    name: Build Debian Bullseye
+    runs-on: ubuntu-latest
+    container:
+      image: debian:bullseye
+    steps:
+      - uses: actions/checkout@v1.2.0
+      - name: Install Debian dependencies
+        run: >
+            apt-get update && apt-get install -y
+            build-essential
+            dh-make
+            ssh
+            git
+            make
+            cmake
+            gcc
+            pkg-config
+            fakeroot
+            gettext
+            lsb-release
+            libglib2.0-dev
+            dpkg-dev
+            libdbus-1-dev
+            libboost-dev
+            libprotobuf-dev
+            protobuf-compiler
+            libsqlite3-dev
+            libgnutls28-dev
+            libasound2-dev
+            libpulse-dev
+            qtbase5-dev
+            qtbase5-dev-tools
+            qtbase5-private-dev
+            libqt5x11extras5-dev
+            qttools5-dev
+            libgstreamer1.0-dev
+            libgstreamer-plugins-base1.0-dev
+            gstreamer1.0-alsa
+            gstreamer1.0-pulseaudio
+            libchromaprint-dev
+            libfftw3-dev
+            libcdio-dev
+            libmtp-dev
+            libgpod-dev
+      - name: Create Build Environment
+        shell: bash
+        run: cmake -E make_directory build
+      - name: Configure CMake
+        shell: bash
+        working-directory: build
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+      - name: make deb
+        shell: bash
+        run: dpkg-buildpackage -b -d -uc -us -nc -j2
+
+
   build_ubuntu_bionic:
     name: Build Ubuntu Bionic
     runs-on: ubuntu-latest
@@ -765,6 +822,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -826,6 +884,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -887,6 +946,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make