From fc691a7208477948ad7519ed67861a0b4c6a4b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 5 Nov 2023 12:34:08 +0100 Subject: DEB: Change debhelper compatibility level to 10. Use DEB_COMPRESS_EXCLUDE_ALL instead of deprecated DEB_COMPRESS_EXCLUDE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk | 2 +- ubuntu/_base/core/tdebindings/debian/compat | 2 +- ubuntu/_base/core/tdebindings/debian/control | 2 +- ubuntu/_base/core/tdebindings/debian/rules | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ubuntu/_base/core/tdebindings') diff --git a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk index f36e3527c..b031e6981 100644 --- a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ diff --git a/ubuntu/_base/core/tdebindings/debian/compat b/ubuntu/_base/core/tdebindings/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdebindings/debian/compat +++ b/ubuntu/_base/core/tdebindings/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control index ca01a7be7..1bda66f65 100644 --- a/ubuntu/_base/core/tdebindings/debian/control +++ b/ubuntu/_base/core/tdebindings/debian/control @@ -1,5 +1,5 @@ Source: tdebindings-trinity -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 10~), python3-all-dev, dh-python, quilt, gawk, default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc], tdelibs14-trinity-dev, diff --git a/ubuntu/_base/core/tdebindings/debian/rules b/ubuntu/_base/core/tdebindings/debian/rules index 5fe76afb1..f7d6f4790 100755 --- a/ubuntu/_base/core/tdebindings/debian/rules +++ b/ubuntu/_base/core/tdebindings/debian/rules @@ -29,7 +29,7 @@ endif DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \ DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python' -DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_COMPRESS_EXCLUDE_ALL += .java .ui .js .rb .map .wav .bmp .cpp .sk # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... -- cgit v1.2.1