[GIT] 01/01: make qt5 dep qt4 and do only one combined build

[Harald Sitter]

This is an automated email from the git hooks/post-receive script.

apachelogger-guest pushed a commit to branch kubuntu_unstable
in repository qtcurve.

commit 22aee7cde43bb309a4310e563b5f17486db17cec
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Feb 17 09:40:44 2015 +0100

    make qt5 dep qt4 and do only one combined build
    
    upstream decided that what previously wasn't shared between qt5 and 4 needs
    to be shared (or maybe upstream just doesn't QA), either-way, qt5 style
    now depends on the qt4 style
    
    the combined build mostly happens because we can't avoid possible variable
    overlap now anymore, also see https://bugs.kde.org/show_bug.cgi?id=344266
---
 debian/control                    |  4 +++-
 debian/kde-style-qtcurve5.install |  2 +-
 debian/rules                      | 43 +--------------------------------------
 3 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/debian/control b/debian/control
index 85ac1d2..75a0f9f 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,9 @@ Standards-Version: 3.9.5
 
 Package: kde-style-qtcurve5
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: kde-style-qtcurve4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: gtk2-engines-qtcurve
 Description: QtCurve widget style for KDE 5
  This package contains the QtCurve widget style for KDE 5.
diff --git a/debian/kde-style-qtcurve5.install b/debian/kde-style-qtcurve5.install
index c641455..e54f446 100644
--- a/debian/kde-style-qtcurve5.install
+++ b/debian/kde-style-qtcurve5.install
@@ -1,2 +1,2 @@
+#usr/share/kstyle/themes/qtcurve.themerc
 usr/lib/*/qt5
-usr/share/kstyle/themes/qtcurve.themerc
diff --git a/debian/rules b/debian/rules
index 40e7edf..89e1579 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,52 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
-# Split build into qt5 and qt4+gtk+otherthings.
-# KDE5 and KF5 can not be used at the same time as they would override the same
-# variables making the result paths somewhat non-deterministic.
-# Short of repairing the CMake structure to enable for building things at the
-# same time we do two builds.
-# First we build the qt5 component only, then build the qt4 version which
-# for the time being operates as our base level of compatibility.
-# Subsequently we install qt5 and qt4 on top of it. The reason for this is
-# that there is also a very concerning mixing of variables going on with
-# the kde4/qt4 plugin. For example QTC_KDE4_PREFIX will ultimately be injected
-# into the GTK2 style for configuratino lookup and the likes. So in order to
-# preserve compatibility there we consider qt4 the base rather than qt5 as
-# the qt5 version has no such integration into the GTK2 plugin (none that
-# one could find anyway).
-#                                                      - Harald Sitter, Dec 2014
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-QT4_BUILD_DIR = "obj-$(DEB_HOST_MULTIARCH)-qt4"
-
-override_dh_auto_clean:
-	$(overridden_command)
-	rm -rf $(QT5_BUILD_DIR)
-
 override_dh_auto_configure:
 	$(overridden_command) -- \
 		-DENABLE_QT5=on \
-		-DQTC_QT5_ENABLE_KDE=on \
-		-DENABLE_QT4=off \
-			-DQTC_KDE4_PREFIX="" \
-			-DQTC_QT4_STYLE_SUPPORT=off \
-		-DENABLE_GTK2=off \
-		-DENABLE_TEST=off \
-		-DQTC_INSTALL_PO=off
-	$(overridden_command) --builddirectory=$(QT4_BUILD_DIR) -- \
-		-DENABLE_QT5=off \
-		-DQTC_QT5_ENABLE_KDE=off \
+			-DQTC_QT5_ENABLE_KDE=on \
 		-DENABLE_QT4=on \
 			-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
 			-DQTC_QT4_ENABLE_KWIN=off
-
-override_dh_auto_build:
-	$(overridden_command)
-	$(overridden_command) --builddirectory=$(QT4_BUILD_DIR)
-
-override_dh_auto_install:
-	$(overridden_command)
-	$(overridden_command) --builddirectory=$(QT4_BUILD_DIR)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-kde/kde-extras/qtcurve.git