diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2021-04-04 03:02:11 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2021-04-04 15:53:01 +0200 |
commit | 3d0fe45a7b0b586d096644a3581df8307787eb3a (patch) | |
tree | f6e05af72fa60089c8db1e9999d982d47be07bc8 /ubuntu/_base/core/tdelibs | |
parent | 5d067f8a1c69ffd2585cd3a46f0601cc552e40d2 (diff) | |
download | tde-packaging-3d0fe45a7b0b586d096644a3581df8307787eb3a.tar.gz tde-packaging-3d0fe45a7b0b586d096644a3581df8307787eb3a.zip |
DEB: Move DEB_DH_BUILDDEB_ARGS to common cdbs rules.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu/_base/core/tdelibs')
-rw-r--r-- | ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk | 10 | ||||
-rwxr-xr-x | ubuntu/_base/core/tdelibs/debian/rules | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk @@ -75,6 +75,16 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index 23758877a..eafe84957 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -69,9 +69,6 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf |