diff --git a/debian/control b/debian/control index 377173ab..0d44b3bb 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Homepage: https://www.sipwise.com/ Standards-Version: 3.9.8 Build-Depends: debhelper-compat (= 12), - dh-python, flite-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libev-dev, @@ -20,8 +19,6 @@ Build-Depends: libssl-dev, libxml2-dev, openssl, - python-dev, - python-sip-dev, Package: ngcp-sems Architecture: any @@ -32,7 +29,6 @@ Depends: ngcp-prompts, ngcp-system-tools, ${misc:Depends}, - ${python:Depends}, ${shlibs:Depends}, Conflicts: sems, diff --git a/debian/patches/series b/debian/patches/series index b956f4be..5b0785a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,3 +35,4 @@ sipwise/0001-TT-34704-Fix-sems-and-sems-pbx-to-write-pid-file-whe.patch sipwise/0001-TT-53685-add_header_pattern_match_support.patch sipwise/add-vsc-to-disable_all_cf.patch sipwise/handle_bye_after_180.patch +sipwise/upgrade_to_bullseye.patch diff --git a/debian/patches/sipwise/upgrade_to_bullseye.patch b/debian/patches/sipwise/upgrade_to_bullseye.patch new file mode 100644 index 00000000..71d2301b --- /dev/null +++ b/debian/patches/sipwise/upgrade_to_bullseye.patch @@ -0,0 +1,34 @@ +Index: sems/Makefile.defs +=================================================================== +--- sems.orig/Makefile.defs ++++ sems/Makefile.defs +@@ -85,7 +85,10 @@ exclude_core_modules = g729 silk + # build in support for monitoring? + # + # +-USE_MONITORING=yes ++USE_MONITORING=no ++ ++#include SBC tools into build ++USE_SBC_TOOLS=no + + # Support for long debug messages? (useful for debugging SIP messages' contents) + # +Index: sems/apps/sbc/Makefile +=================================================================== +--- sems.orig/apps/sbc/Makefile ++++ sems/apps/sbc/Makefile +@@ -4,7 +4,12 @@ module_ldflags = + module_cflags = + + extra_target = make_call_control_mods +-extra_install = install_tools install_call_control_mods ++extra_install = install_call_control_mods ++ ++ifeq ($(USE_SBC_TOOLS), yes) ++extra_install += install_tools ++endif ++ + extra_clean = clean_call_control_mods + + COREPATH ?= ../../core diff --git a/debian/rules b/debian/rules index 7758f62d..1e09e40a 100755 --- a/debian/rules +++ b/debian/rules @@ -4,11 +4,9 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -PYTHON_MODULES=ivr conf_auth mailbox pin_collect +EXCLUDED_MODULES=conf_auth examples examples/db_announce fast_ack gateway ivr mailbox mp3 pin_collect twit webconference -EXCLUDED_MODULES=gateway mp3 twit - -EXCLUDED_DSM_MODULES=mod_aws +EXCLUDED_DSM_MODULES=mod_aws mod_py EXCLUDED_DSM_PY_MODULES=mod_aws mod_py CPPFLAGS += -DHAVE_XMLRPCPP_SSL @@ -49,9 +47,6 @@ override_dh_auto_install: prefix=/usr \ cfg_target=/etc/$(APP_NAME)/ - dh_python2 - dh_python2 /usr/lib/$(APP_NAME) - override_dh_strip: dh_strip --dbgsym-migration='$(APP_NAME)-dbg (<= 1:1.6.0-1+0~mr6.0.0.0)' # MT#7431 those binaries aren't automatically stripped