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 /dilos/core/tdegraphics | |
| 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 'dilos/core/tdegraphics')
| -rw-r--r-- | dilos/core/tdegraphics/debian/cdbs/debian-tde.mk | 10 | ||||
| -rwxr-xr-x | dilos/core/tdegraphics/debian/rules | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk b/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk index 29fca88e1..4dd4698a4 100644 --- a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdegraphics/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/dilos/core/tdegraphics/debian/rules b/dilos/core/tdegraphics/debian/rules index 2f0c68797..316afdc09 100755 --- a/dilos/core/tdegraphics/debian/rules +++ b/dilos/core/tdegraphics/debian/rules @@ -35,9 +35,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg \ -Xkcm_kgamma.so -Xxf86gammacfg -Xlibtext2path.so.0.0.0 \ -Xlibksvgrendererlibart.so -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity |