[Build-System] Add Bullseye to the Debian packaging

diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index b566bc26d9c698b4b99815e5a8ca46d082ad7856..61098cb11a95d35176da7b05b1eee26c307d2436 100755 (executable)
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -29,7 +29,7 @@ conf_dir="../conf"
 lang_dir="../conf/vanilla/lang"
 fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media."
 mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="."
-supported_debian_distros="wheezy jessie stretch buster sid"
+supported_debian_distros="wheezy jessie stretch buster bullseye sid"
 supported_ubuntu_distros="trusty utopic xenial"
 supported_distros="$supported_debian_distros $supported_ubuntu_distros"
 avoid_mods=(
@@ -299,7 +299,7 @@ print_source_control () {
   esac
   local debhelper_dep="debhelper (>= 8.0.0)"
   if [ ${use_sysvinit} = "false" ]; then
-      debhelper_dep=${debhelper_dep}", dh-systemd"
+      debhelper_dep=${debhelper_dep}", dh-systemd | debhelper (>= 8.0.0)"
   fi
   cat <<EOF
 Source: freeswitch
@@ -325,7 +325,7 @@ Build-Depends:
 # configure options
  libssl1.0-dev | libssl-dev, unixodbc-dev, libpq-dev,
  libncurses5-dev, libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg62-dev | libjpeg8-dev,
- python-dev, python3-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
+ python-dev | python-dev-is-python2, python3-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
 # documentation
  doxygen,
 # for APR (not essential for build)

diff --git a/debian/control-modules b/debian/control-modules
index 24c89d3e39b14321ec03d3759de32c1ab873e463..a3b53790a493b4d5094cc2725e0f16137f7588b0 100644 (file)
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -492,6 +492,7 @@ Description: Adds mod_verto.
  Adds mod_verto.
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev
 
 ## mod/event_handlers
 
@@ -665,11 +666,12 @@ Description: mod_perl
  Adds mod_perl.
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev
 
 Module: languages/mod_python
 Description: mod_python
  Adds mod_python.
-Build-Depends: python-dev 
+Build-Depends: python-dev | python-dev-is-python2
 
 Module: languages/mod_python3
 Description: mod_python3

diff --git a/debian/util.sh b/debian/util.sh
index 88cee7949b532f7ecaf81ed9a4d3ac2236a9bc5c..6a5d8f27da8a0fb1f38180da82e720417b0629e5 100755 (executable)
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -46,9 +46,9 @@ find_distro () {
   case "$1" in
     experimental) echo "sid";;
     unstable) echo "sid";;
-    testing) echo "buster";;
-    stable) echo "stretch";;
-    oldstable) echo "jessie";;
+    testing) echo "bullseye";;
+    stable) echo "buster";;
+    oldstable) echo "stretch";;
     *) echo "$1";;
   esac
 }
@@ -56,9 +56,9 @@ find_distro () {
 find_suite () {
   case "$1" in
     sid) echo "unstable";;
-    buster) echo "testing";;
-    stretch) echo "stable";;
-    jessie) echo "oldstable";;
+    bullseye) echo "testing";;
+    buster) echo "stable";;
+    stretch) echo "oldstable";;
     *) echo "$1";;
   esac
 }