[SCM] QCA2 library packaging branch, kubuntu_unstable_utopic, updated. debian/2.0.3-6-47-g891f77d

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=c836c73

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit c836c73e5536636cbb5324d81a15b765ceb396eb
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Dec 2 10:58:03 2014 +0100

    revise rules and fix mkspecs and ditch pointless and wrong mkspecs patch
    
    rules:
    - reorder a bit
    - explicitly force qt4_build off on qt5 builds
    - explicitly set mkspecs install dir for both qt4 and qt5 builds using
      the related cmake cache path variable
    
    -dev.install:
    fix mkspecs paths accordingly
    
    throw out mkspecs patch which resulted in incorrect paths for all builds
---
 debian/libqca-qt5-2-dev.install         |  2 +-
 debian/libqca2-dev.install              |  2 +-
 debian/patches/kubuntu_mkspecs-dir.diff | 22 ----------------------
 debian/patches/series                   |  1 -
 debian/rules                            | 15 ++++++++++++---
 5 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/debian/libqca-qt5-2-dev.install b/debian/libqca-qt5-2-dev.install
index 0d53973..ce74d6c 100644
--- a/debian/libqca-qt5-2-dev.install
+++ b/debian/libqca-qt5-2-dev.install
@@ -1,5 +1,5 @@
 usr/include/QtCrypto
 usr/lib/*/cmake/Qca/
 usr/lib/*/libqca-qt5.so
-usr/lib/*/mkspecs/features/crypto.prf
+usr/lib/*/qt5/mkspecs/features/crypto.prf
 usr/lib/*/pkgconfig/qca2-qt5.pc
diff --git a/debian/libqca2-dev.install b/debian/libqca2-dev.install
index d7fc812..4f5462a 100644
--- a/debian/libqca2-dev.install
+++ b/debian/libqca2-dev.install
@@ -2,4 +2,4 @@ usr/include/QtCrypto
 usr/lib/*/cmake/
 usr/lib/*/libqca.so
 usr/lib/*/pkgconfig/qca2.pc
-usr/share/qt4/mkspecs/mkspecs/features/crypto.prf
+usr/share/qt4/mkspecs/features/crypto.prf
diff --git a/debian/patches/kubuntu_mkspecs-dir.diff b/debian/patches/kubuntu_mkspecs-dir.diff
deleted file mode 100644
index ad6d221..0000000
--- a/debian/patches/kubuntu_mkspecs-dir.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: fix mkspecs install dir
-Author: Jonathan Riddell
-Origin: me
-Bug: https://bugs.kde.org/show_bug.cgi?id=341289
-Last-Update: 2014-11-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- qca/CMakeLists.txt~	2014-11-06 08:15:45.000000000 +0000
-+++ qca/CMakeLists.txt	2014-11-26 11:51:46.624782953 +0000
-@@ -169,7 +169,11 @@
-   set(QCA_PLUGINS_INSTALL_DIR "${LIB_INSTALL_DIR}/${QCA_LIB_NAME}" CACHE PATH "Directory where qca plugins will install")
-   set(QCA_BINARY_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Directory where qca plugins will install")
-   set(QCA_LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Directory where qca library will install")
--  set(QCA_FEATURE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/mkspecs/features" CACHE PATH "Directory where qca feature file will install")
-+  if(QT4_BUILD)
-+    set(QCA_FEATURE_INSTALL_DIR "${QT_MKSPECS_DIR}/mkspecs/features" CACHE PATH "Directory where qca feature file will install")
-+  else()
-+    set(QCA_FEATURE_INSTALL_DIR "${LIB_INSTALL_DIR}/mkspecs/features" CACHE PATH "Directory where qca feature file will install")
-+  endif()
-   set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca public headers will install")
-   set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca headers will install")
-   set(QCA_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${QCA_LIB_NAME}/html" CACHE PATH "Directory where qca documentation will install")
diff --git a/debian/patches/series b/debian/patches/series
index f0683c2..f9b23b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 define_qca_export.diff
 pipeunittest_more_wait.diff
 hurd_msync.diff
-kubuntu_mkspecs-dir.diff
 kubuntu_ignore_filewatch_test.diff
diff --git a/debian/rules b/debian/rules
index 59b9296..437838b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,10 @@ libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-QT5_BUILD_DIR = "obj-$(DEB_HOST_MULTIARCH)-qt5"
+
+# Separate Qt 5 build entirely to avoid one build overriding the other.
 QT5_PACKAGES = $(shell grep Package: debian/control | grep qt5 | grep -v '\-dbg' | sed -e 's/Package: //g')
+QT5_BUILD_DIR = "obj-$(DEB_HOST_MULTIARCH)-qt5"
 QT5_DH_EXCLUDE := $(foreach package, $(QT5_PACKAGES), -N $(package))
 QT5_DH_INCLUDE := $(foreach package, $(QT5_PACKAGES), -p $(package))
 
@@ -16,8 +18,15 @@ override_dh_auto_clean:
 	rm -rf $(QT5_BUILD_DIR) debian/tmp-qt5
 
 override_dh_auto_configure:
-	$(overridden_command)                                   -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DQT4_BUILD=true
-	$(overridden_command) --builddirectory=$(QT5_BUILD_DIR) -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DQCA_SUFFIX="qt5"
+	$(overridden_command) -- \
+		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
+		-DQT4_BUILD=true \
+		-DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/
+	$(overridden_command) --builddirectory=$(QT5_BUILD_DIR) -- \
+		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
+		-DQT4_BUILD=false \
+		-DQCA_FEATURE_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features \
+		-DQCA_SUFFIX="qt5"
 
 override_dh_auto_build:
 	$(overridden_command)

-- 
QCA2 library packaging