From a4ee01d27fd60e6022d6bf2c2cf290a6e74ef885 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Wed, 3 Nov 2021 22:07:47 +0100
Subject: [PATCH] TT#124273 Update packaging for bullseye

- Switch to debhelper compat level 13.
- Remove obsolete override_dh_dwz now handled properly by dh_dwz.

Change-Id: I28432b110b958ddc14eadee97007a07ec329a14d
---
 debian/control             | 2 +-
 debian/rules               | 3 ---
 pkg/deb/backports/bullseye | 9 +++++++++
 pkg/deb/backports/buster   | 9 +++++++++
 pkg/deb/backports/focal    | 9 +++++++++
 pkg/deb/backports/stretch  | 2 +-
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 69aa08896..f0648bc5d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Sipwise Development Team <support@sipwise.com>
 Homepage: https://www.sipwise.com/
 Standards-Version: 4.5.1
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  default-libmysqlclient-dev,
  gperf,
  libavcodec-dev (>= 6:10),
diff --git a/debian/rules b/debian/rules
index 29b0914ee..27cce5892 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,9 +51,6 @@ override_dh_install:
 	dh_installdirs -pngcp-rtpengine-iptables $(XTABLES_DIR)
 	install -m 0644 iptables-extension/libxt_RTPENGINE.so debian/ngcp-rtpengine-iptables/$(XTABLES_DIR)
 
-override_dh_dwz:
-	# Disable, as dwz cannot cope with some of the plugins generated.
-
 override_dh_installsystemd:
 	dh_installsystemd
 	dh_installsystemd -pngcp-rtpengine-recording-daemon --name=ngcp-rtpengine-recording-nfs-mount
diff --git a/pkg/deb/backports/bullseye b/pkg/deb/backports/bullseye
index 72d7065db..df09ef49b 100755
--- a/pkg/deb/backports/bullseye
+++ b/pkg/deb/backports/bullseye
@@ -11,6 +11,15 @@ fi
 rm -rf ${DIST}
 cp -r debian ${DIST}
 
+# Update for bullseye debhelper
+sed -i -e 's/debhelper-compat.*/debhelper-compat (= 12),/' ${DIST}/control
+# Add dwz override
+cat >> ${DIST}/rules <<'EOF'
+
+override_dh_dwz:
+	# Disable, as dwz cannot cope with some of the plugins generated.
+EOF
+
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts
diff --git a/pkg/deb/backports/buster b/pkg/deb/backports/buster
index 231c1dee3..05b294cea 100755
--- a/pkg/deb/backports/buster
+++ b/pkg/deb/backports/buster
@@ -14,6 +14,15 @@ cp -r debian ${DIST}
 # No libbcg729-dev package
 sed -i -e '/libbcg729-dev/d' ${DIST}/control
 
+# Update for buster debhelper
+sed -i -e 's/debhelper-compat.*/debhelper-compat (= 12),/' ${DIST}/control
+# Add dwz override
+cat >> ${DIST}/rules <<'EOF'
+
+override_dh_dwz:
+	# Disable, as dwz cannot cope with some of the plugins generated.
+EOF
+
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts
diff --git a/pkg/deb/backports/focal b/pkg/deb/backports/focal
index 8fd870a44..040c09b56 100755
--- a/pkg/deb/backports/focal
+++ b/pkg/deb/backports/focal
@@ -14,6 +14,15 @@ cp -r debian ${DIST}
 # No libbcg729-dev package
 sed -i -e '/libbcg729-dev/d' ${DIST}/control
 
+# Update for focal debhelper
+sed -i -e 's/debhelper-compat.*/debhelper-compat (= 12),/' ${DIST}/control
+# Add dwz override
+cat >> ${DIST}/rules <<'EOF'
+
+override_dh_dwz:
+	# Disable, as dwz cannot cope with some of the plugins generated.
+EOF
+
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts
diff --git a/pkg/deb/backports/stretch b/pkg/deb/backports/stretch
index 38906c4ba..333226e09 100755
--- a/pkg/deb/backports/stretch
+++ b/pkg/deb/backports/stretch
@@ -20,7 +20,7 @@ sed -i -e 's/debhelper-compat.*/debhelper (>= 10),/' ${DIST}/control
 # Compat level for dkms module package
 sed -i -e '/cp debian.control/ i \	cp debian/compat debian/\$(psource)/usr/src/modules/\$(sname)/debian/' ${DIST}/rules
 # Remove bottom make rules
-sed -i -e '/^override_dh_dwz/,/^\n/d' ${DIST}/rules
+sed -i -e '/^override_dh_installsystemd/,/^\n/d' ${DIST}/rules
 # ... and replace with:
 cat >> ${DIST}/rules <<'EOF'
 override_dh_systemd_enable: