diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-07-11 12:42:54 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-07-11 12:42:54 +0900 |
commit | 3e7c64331262e5e5238f04465670e1b1e96a2383 (patch) | |
tree | 793763a37e637de2380a9406b4455318cc1e33f5 | |
parent | 420633c6862ead221800c5f61266baad560ef32f (diff) | |
download | tde-packaging-3e7c64331262e5e5238f04465670e1b1e96a2383.tar.gz tde-packaging-3e7c64331262e5e5238f04465670e1b1e96a2383.zip |
DEB: enable parallel build in debian-tde.mk.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
274 files changed, 488 insertions, 120 deletions
diff --git a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk b/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/abakus/debian/rules b/debian/_base/applications/abakus/debian/rules index 1180312f8..8ab9fb501 100755 --- a/debian/_base/applications/abakus/debian/rules +++ b/debian/_base/applications/abakus/debian/rules @@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - debian/abakus.xpm: icons/hi64-app-abakus.png convert -resize 32 $< $@ diff --git a/debian/_base/applications/adept/debian/cdbs/debian-tde.mk b/debian/_base/applications/adept/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/adept/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/adept/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk b/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk b/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk b/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk b/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk b/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kcpuload/debian/rules b/debian/_base/applications/kcpuload/debian/rules index 8a8c4ebb0..7ee0b8693 100755 --- a/debian/_base/applications/kcpuload/debian/rules +++ b/debian/_base/applications/kcpuload/debian/rules @@ -17,9 +17,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/keep/debian/cdbs/debian-tde.mk b/debian/_base/applications/keep/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/keep/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/keep/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk b/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kerberostray/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk b/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk b/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kgtk-qt3/debian/rules b/debian/_base/applications/kgtk-qt3/debian/rules index 8e3edaf95..877cefbb8 100755 --- a/debian/_base/applications/kgtk-qt3/debian/rules +++ b/debian/_base/applications/kgtk-qt3/debian/rules @@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - binary-install/kgtk-qt3-trinity:: mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ diff --git a/debian/_base/applications/kile/debian/cdbs/debian-tde.mk b/debian/_base/applications/kile/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kile/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kile/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kima/debian/cdbs/debian-tde.mk b/debian/_base/applications/kima/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kima/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kima/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk b/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk b/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk b/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk b/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk b/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knetload/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knights/debian/cdbs/debian-tde.mk b/debian/_base/applications/knights/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knights/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knights/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk b/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knmap/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk b/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knowit/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk b/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk b/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk b/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk b/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk b/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/krename/debian/cdbs/debian-tde.mk b/debian/_base/applications/krename/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/krename/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/krename/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk b/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk b/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kscope/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk b/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk b/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk b/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kuickshow/debian/cdbs/debian-tde.mk b/debian/_base/applications/kuickshow/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kuickshow/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kuickshow/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk b/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk b/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk b/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/piklab/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk b/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/rosegarden/debian/rules b/debian/_base/applications/rosegarden/debian/rules index 47e0616c9..6e3b7df21 100755 --- a/debian/_base/applications/rosegarden/debian/rules +++ b/debian/_base/applications/rosegarden/debian/rules @@ -30,10 +30,6 @@ DEB_COMPRESS_EXCLUDE += .rg .wav .docbook DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - binary-install/rosegarden-trinity:: dh_testdir find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \; diff --git a/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tde-style-qtcurve/debian/rules b/debian/_base/applications/tde-style-qtcurve/debian/rules index 122d7896f..9b96d4f85 100755 --- a/debian/_base/applications/tde-style-qtcurve/debian/rules +++ b/debian/_base/applications/tde-style-qtcurve/debian/rules @@ -26,7 +26,3 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true diff --git a/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk b/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdeio-ftps/debian/rules b/debian/_base/applications/tdeio-ftps/debian/rules index 1b2078eae..18aa16b96 100755 --- a/debian/_base/applications/tdeio-ftps/debian/rules +++ b/debian/_base/applications/tdeio-ftps/debian/rules @@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdeio-locate/debian/rules b/debian/_base/applications/tdeio-locate/debian/rules index 855a20a5b..0f27aed49 100755 --- a/debian/_base/applications/tdeio-locate/debian/rules +++ b/debian/_base/applications/tdeio-locate/debian/rules @@ -23,8 +23,4 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS diff --git a/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tdesvn/debian/rules b/debian/_base/applications/tdesvn/debian/rules index edc3001cb..b142b22ec 100755 --- a/debian/_base/applications/tdesvn/debian/rules +++ b/debian/_base/applications/tdesvn/debian/rules @@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - binary-install/tdesvn-trinity:: # remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so* diff --git a/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk b/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tellico/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/tork/debian/cdbs/debian-tde.mk b/debian/_base/applications/tork/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/tork/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/tork/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk b/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/wlassistant/debian/rules b/debian/_base/applications/wlassistant/debian/rules index 160785a54..1102d407d 100755 --- a/debian/_base/applications/wlassistant/debian/rules +++ b/debian/_base/applications/wlassistant/debian/rules @@ -22,7 +22,3 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true diff --git a/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/applications/yakuake/debian/rules b/debian/_base/applications/yakuake/debian/rules index 1b2078eae..18aa16b96 100755 --- a/debian/_base/applications/yakuake/debian/rules +++ b/debian/_base/applications/yakuake/debian/rules @@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/dependencies/arts/debian/rules b/debian/_base/dependencies/arts/debian/rules index 7f5debe08..c3167d04f 100755 --- a/debian/_base/dependencies/arts/debian/rules +++ b/debian/_base/dependencies/arts/debian/rules @@ -15,10 +15,6 @@ include debian/cdbs/debian-tde.mk DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ diff --git a/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tde-i18n/debian/rules b/debian/_base/tde-i18n/debian/rules index c5ae84be2..2427e42f4 100755 --- a/debian/_base/tde-i18n/debian/rules +++ b/debian/_base/tde-i18n/debian/rules @@ -22,6 +22,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_BUILD_PARALLEL ?= true + ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif diff --git a/debian/_base/tdeaccessibility/debian/cdbs/debian-tde.mk b/debian/_base/tdeaccessibility/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdeaccessibility/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdeaddons/debian/cdbs/debian-tde.mk b/debian/_base/tdeaddons/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdeaddons/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdeaddons/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdeadmin/debian/cdbs/debian-tde.mk b/debian/_base/tdeadmin/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdeadmin/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdeadmin/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdeartwork/debian/cdbs/debian-tde.mk b/debian/_base/tdeartwork/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdeartwork/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdeartwork/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdebase/debian/cdbs/debian-tde.mk b/debian/_base/tdebase/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdebase/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdebase/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdebase/debian/rules b/debian/_base/tdebase/debian/rules index c6bc996b9..adf66de9e 100755 --- a/debian/_base/tdebase/debian/rules +++ b/debian/_base/tdebase/debian/rules @@ -63,10 +63,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_LIBCONFIG="ON" \ -DWITH_PCRE="ON" -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_FIXPERMS_EXCLUDE := \ opt/trinity/bin/kcheckpass \ opt/trinity/bin/tdekbdledsync \ diff --git a/debian/_base/tdebindings/debian/cdbs/debian-tde.mk b/debian/_base/tdebindings/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdebindings/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdebindings/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdeedu/debian/cdbs/debian-tde.mk b/debian/_base/tdeedu/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdeedu/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdeedu/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdegames/debian/cdbs/debian-tde.mk b/debian/_base/tdegames/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdegames/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdegames/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdegraphics/debian/cdbs/debian-tde.mk b/debian/_base/tdegraphics/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdegraphics/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdegraphics/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdegraphics/debian/rules b/debian/_base/tdegraphics/debian/rules index 27c592a81..b20f3d19e 100755 --- a/debian/_base/tdegraphics/debian/rules +++ b/debian/_base/tdegraphics/debian/rules @@ -29,10 +29,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_OPENEXR="ON" \ -DWITH_PDF="ON" -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ diff --git a/debian/_base/tdelibs/debian/cdbs/debian-tde.mk b/debian/_base/tdelibs/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdelibs/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdelibs/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdelibs/debian/rules b/debian/_base/tdelibs/debian/rules index 1a597f2d1..797518c12 100755 --- a/debian/_base/tdelibs/debian/rules +++ b/debian/_base/tdelibs/debian/rules @@ -54,10 +54,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_MAKE_CHECK_TARGET = check -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_FIXPERMS_EXCLUDE := \ opt/trinity/bin/fileshareset \ opt/trinity/bin/kgrantpty \ diff --git a/debian/_base/tdemultimedia/debian/cdbs/debian-tde.mk b/debian/_base/tdemultimedia/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdemultimedia/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdenetwork/debian/cdbs/debian-tde.mk b/debian/_base/tdenetwork/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdenetwork/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdenetwork/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdepim/debian/cdbs/debian-tde.mk b/debian/_base/tdepim/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdepim/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdepim/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdepim/debian/rules b/debian/_base/tdepim/debian/rules index e1ff2b221..b5f18c8e3 100755 --- a/debian/_base/tdepim/debian/rules +++ b/debian/_base/tdepim/debian/rules @@ -47,10 +47,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_MAKE_CHECK_TARGET = check -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_INSTALL_DOCS_ALL := diff --git a/debian/_base/tdesdk/debian/cdbs/debian-tde.mk b/debian/_base/tdesdk/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdesdk/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdesdk/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdetoys/debian/cdbs/debian-tde.mk b/debian/_base/tdetoys/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdetoys/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdetoys/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdeutils/debian/cdbs/debian-tde.mk b/debian/_base/tdeutils/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdeutils/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdeutils/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdevelop/debian/cdbs/debian-tde.mk b/debian/_base/tdevelop/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdevelop/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdevelop/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/debian/_base/tdewebdev/debian/cdbs/debian-tde.mk b/debian/_base/tdewebdev/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/debian/_base/tdewebdev/debian/cdbs/debian-tde.mk +++ b/debian/_base/tdewebdev/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/abakus/debian/rules b/ubuntu/_base/applications/abakus/debian/rules index 1180312f8..8ab9fb501 100755 --- a/ubuntu/_base/applications/abakus/debian/rules +++ b/ubuntu/_base/applications/abakus/debian/rules @@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - debian/abakus.xpm: icons/hi64-app-abakus.png convert -resize 32 $< $@ diff --git a/ubuntu/_base/applications/adept/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/adept/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/adept/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/adept/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kcpuload/debian/rules b/ubuntu/_base/applications/kcpuload/debian/rules index 8a8c4ebb0..7ee0b8693 100755 --- a/ubuntu/_base/applications/kcpuload/debian/rules +++ b/ubuntu/_base/applications/kcpuload/debian/rules @@ -17,9 +17,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/rules b/ubuntu/_base/applications/kgtk-qt3/debian/rules index 8e3edaf95..877cefbb8 100755 --- a/ubuntu/_base/applications/kgtk-qt3/debian/rules +++ b/ubuntu/_base/applications/kgtk-qt3/debian/rules @@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - binary-install/kgtk-qt3-trinity:: mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ diff --git a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/rosegarden/debian/rules b/ubuntu/_base/applications/rosegarden/debian/rules index 47e0616c9..6e3b7df21 100755 --- a/ubuntu/_base/applications/rosegarden/debian/rules +++ b/ubuntu/_base/applications/rosegarden/debian/rules @@ -30,10 +30,6 @@ DEB_COMPRESS_EXCLUDE += .rg .wav .docbook DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - binary-install/rosegarden-trinity:: dh_testdir find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \; diff --git a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/tde-style-qtcurve/debian/rules index 122d7896f..9b96d4f85 100755 --- a/ubuntu/_base/applications/tde-style-qtcurve/debian/rules +++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/rules @@ -26,7 +26,3 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/rules b/ubuntu/_base/applications/tdeio-ftps/debian/rules index 1b2078eae..18aa16b96 100755 --- a/ubuntu/_base/applications/tdeio-ftps/debian/rules +++ b/ubuntu/_base/applications/tdeio-ftps/debian/rules @@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio-locate/debian/rules index 855a20a5b..0f27aed49 100755 --- a/ubuntu/_base/applications/tdeio-locate/debian/rules +++ b/ubuntu/_base/applications/tdeio-locate/debian/rules @@ -23,8 +23,4 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS diff --git a/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tdesvn/debian/rules b/ubuntu/_base/applications/tdesvn/debian/rules index edc3001cb..b142b22ec 100755 --- a/ubuntu/_base/applications/tdesvn/debian/rules +++ b/ubuntu/_base/applications/tdesvn/debian/rules @@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - binary-install/tdesvn-trinity:: # remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so* diff --git a/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/wlassistant/debian/rules b/ubuntu/_base/applications/wlassistant/debian/rules index 160785a54..1102d407d 100755 --- a/ubuntu/_base/applications/wlassistant/debian/rules +++ b/ubuntu/_base/applications/wlassistant/debian/rules @@ -22,7 +22,3 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true diff --git a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/applications/yakuake/debian/rules b/ubuntu/_base/applications/yakuake/debian/rules index 1b2078eae..18aa16b96 100755 --- a/ubuntu/_base/applications/yakuake/debian/rules +++ b/ubuntu/_base/applications/yakuake/debian/rules @@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules index 7f5debe08..c3167d04f 100755 --- a/ubuntu/_base/dependencies/arts/debian/rules +++ b/ubuntu/_base/dependencies/arts/debian/rules @@ -15,10 +15,6 @@ include debian/cdbs/debian-tde.mk DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tde-i18n/debian/rules b/ubuntu/_base/tde-i18n/debian/rules index c5ae84be2..2427e42f4 100755 --- a/ubuntu/_base/tde-i18n/debian/rules +++ b/ubuntu/_base/tde-i18n/debian/rules @@ -22,6 +22,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_BUILD_PARALLEL ?= true + ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif diff --git a/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdebase/debian/rules b/ubuntu/_base/tdebase/debian/rules index 79df1b036..3f02cb040 100755 --- a/ubuntu/_base/tdebase/debian/rules +++ b/ubuntu/_base/tdebase/debian/rules @@ -63,10 +63,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_LIBCONFIG="ON" \ -DWITH_PCRE="ON" -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_FIXPERMS_EXCLUDE := \ opt/trinity/bin/kcheckpass \ opt/trinity/bin/tdekbdledsync \ diff --git a/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdegames/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdegames/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdegames/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdegames/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdegraphics/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdegraphics/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdegraphics/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdegraphics/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdegraphics/debian/rules b/ubuntu/_base/tdegraphics/debian/rules index 27c592a81..b20f3d19e 100755 --- a/ubuntu/_base/tdegraphics/debian/rules +++ b/ubuntu/_base/tdegraphics/debian/rules @@ -29,10 +29,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_OPENEXR="ON" \ -DWITH_PDF="ON" -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ diff --git a/ubuntu/_base/tdelibs/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdelibs/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdelibs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdelibs/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdelibs/debian/rules b/ubuntu/_base/tdelibs/debian/rules index f4b7d6a03..313414ff2 100755 --- a/ubuntu/_base/tdelibs/debian/rules +++ b/ubuntu/_base/tdelibs/debian/rules @@ -53,10 +53,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_MAKE_CHECK_TARGET = check -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_FIXPERMS_EXCLUDE := \ opt/trinity/bin/fileshareset \ opt/trinity/bin/kgrantpty \ diff --git a/ubuntu/_base/tdemultimedia/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdemultimedia/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdemultimedia/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdenetwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdenetwork/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdenetwork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdenetwork/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdepim/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdepim/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdepim/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdepim/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdepim/debian/rules b/ubuntu/_base/tdepim/debian/rules index e1ff2b221..b5f18c8e3 100755 --- a/ubuntu/_base/tdepim/debian/rules +++ b/ubuntu/_base/tdepim/debian/rules @@ -47,10 +47,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ DEB_MAKE_CHECK_TARGET = check -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_INSTALL_DOCS_ALL := diff --git a/ubuntu/_base/tdesdk/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdesdk/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdesdk/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdesdk/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdetoys/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdetoys/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdetoys/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdetoys/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdeutils/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeutils/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdeutils/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdeutils/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdevelop/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdevelop/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdevelop/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdevelop/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ diff --git a/ubuntu/_base/tdewebdev/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdewebdev/debian/cdbs/debian-tde.mk index 4eeb672b0..7a55130b2 100644 --- a/ubuntu/_base/tdewebdev/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/tdewebdev/debian/cdbs/debian-tde.mk @@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif +DEB_BUILD_PARALLEL ?= true + cdbs_configure_flags += \ --with-qt-dir=/usr/share/qt3 \ --disable-rpath \ |