DEB: Move DEB_DH_BUILDDEB_ARGS to common cdbs rules.

Signed-off-by: Slávek Banko <[email protected]>

2 files changed, 10 insertions, 44 deletions

diff --git a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk b/dilos/core/tdevelop/debian/cdbs/debian-tde.mk
index 29fca88e1..4dd4698a4 100644
--- a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk
+++ b/dilos/core/tdevelop/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/tdevelop/debian/rules b/dilos/core/tdevelop/debian/rules
index 585d69ab9..962168f89 100755
--- a/dilos/core/tdevelop/debian/rules
+++ b/dilos/core/tdevelop/debian/rules
@@ -13,56 +13,12 @@ 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 := /usr/include
-DEB_CONFIGURE_MANDIR := /usr/share/man
-DEB_CONFIGURE_PREFIX := /usr
-DEB_CONFIGURE_INFODIR := /usr/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
 DEB_DH_STRIP_ARGS  := --dbg-package=tdevelop-trinity-dbg \
 -Xlibkdevcppparser.so.0.0.0
 
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-
 PACKAGES_WITH_LIBS := tdevelop-trinity
 
 DEB_KDE_APIDOX := yes
-DEB_KDE_ENABLE_FINAL :=
-DEB_INSTALL_DOCS_tdevelop = AUTHORS
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := \
-				--disable-debug \
-				--enable-docbase \
-				--enable-scripting \
-				--enable-ada \
-				--enable-bash \
-				--enable-cpp \
-				--enable-fortran \
-				--enable-haskell \
-				--enable-java \
-				--enable-pascal \
-				--enable-perl \
-				--enable-php \
-				--enable-python \
-				--enable-ruby \
-				--enable-sql \
-				--enable-antproject \
-				--enable-autoproject \
-				--enable-customproject \
-				--enable-genericproject \
-				--enable-scriptproject \
-				--enable-trollproject \
-				--enable-cvs \
-				--enable-vba \
-				--enable-subversion \
-				--with-pic \
-				--with-tdelibsdoxy-dir=/usr/share/doc/tde/HTML/en/tdelibs-apidocs \
-				--with-pythondir=/usr \
-#				--with-qtdoc-dir=/usr/share/tqt3/doc/html \
-				--prefix=/usr \
-				--with-extra-libs=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_PREFIX="/usr" \