diff options
| author | Slávek Banko <[email protected]> | 2021-04-04 03:02:11 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2021-04-04 16:10:05 +0200 |
| commit | a92a915c5d3a438e4d8f7b538efeca6b81fcc4a5 (patch) | |
| tree | 1026c3d6ecf34c4910f61be62e09761e34eb7318 /ubuntu/_base/core/tdetoys | |
| parent | 166fcf9e56586808911b33205ab2aa1c035afe2e (diff) | |
| download | tde-packaging-a92a915c5d3a438e4d8f7b538efeca6b81fcc4a5.tar.gz tde-packaging-a92a915c5d3a438e4d8f7b538efeca6b81fcc4a5.zip | |
DEB: Move DEB_DH_BUILDDEB_ARGS to common cdbs rules.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 3d0fe45a7b0b586d096644a3581df8307787eb3a)
Diffstat (limited to 'ubuntu/_base/core/tdetoys')
| -rw-r--r-- | ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk | 10 | ||||
| -rwxr-xr-x | ubuntu/_base/core/tdetoys/debian/rules | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk index 641c6c6cc..5b4e8bfd7 100644 --- a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdetoys/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/tdetoys/debian/rules b/ubuntu/_base/core/tdetoys/debian/rules index 50e0cee99..b8b2b309b 100755 --- a/ubuntu/_base/core/tdetoys/debian/rules +++ b/ubuntu/_base/core/tdetoys/debian/rules @@ -4,15 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -26,8 +17,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog |