[Pkg-owncloud-commits] [qtkeychain] 01/04: building lib for QT4 and QT5

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit e17c2d7d606530bb538fa500b0ec52ce32c65cda
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu Mar 20 14:22:17 2014 +0100

    building lib for QT4 and QT5
---
 debian/control                 | 28 ++++++++++++++++++++++++++++
 debian/libqt5keychain0.install |  2 ++
 debian/libqtkeychain0.install  |  3 ++-
 debian/qt5keychain-dev.install |  3 +++
 debian/qtkeychain-dev.install  |  4 ++--
 debian/rules                   | 19 +++++++++++++++++--
 6 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 5818cb7..b8c0a05 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Sandro Knauß <bugs at sandroknauss.de>
 Build-Depends: cmake,
                debhelper (>= 8.0.0),
                hardening-wrapper,
+               qttools5-dev-tools (>= 5.2.1), qttools5-dev (>= 5.2.1),
                libqt4-dev,
                pkg-kde-tools
 Standards-Version: 3.9.5
@@ -35,3 +36,30 @@ Description: Development files for qtkeychain
  It can use KWallet or GNOME Keyring, if one of them is available.
  If none of them is available, qtkeychain will report an error or writes
  with explicit request the password unencrypted at a file.
+
+Package: libqt5keychain0
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Recommends: gnome-keyring | kwalletmanager
+Description: Qt API to store passwords (QT5 version)
+ It can use KWallet or GNOME Keyring, if one of them is available.
+ If none of them is available, qtkeychain will report an error or writes
+ with explicit request the password unencrypted at a file.
+ .
+ This is the Version built for QT5
+
+Package: qt5keychain-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: libqt5keychain0 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for qtkeychain (QT5 version)
+ A Qt API to store passwords
+ .
+ It can use KWallet or GNOME Keyring, if one of them is available.
+ If none of them is available, qtkeychain will report an error or writes
+ with explicit request the password unencrypted at a file.
+ .
+ This is the Version built for QT5
diff --git a/debian/libqt5keychain0.install b/debian/libqt5keychain0.install
new file mode 100644
index 0000000..015f153
--- /dev/null
+++ b/debian/libqt5keychain0.install
@@ -0,0 +1,2 @@
+usr/lib/*/libqt5keychain.so.*
+usr/share/qt5
diff --git a/debian/libqtkeychain0.install b/debian/libqtkeychain0.install
index 3ddde58..2f4e313 100644
--- a/debian/libqtkeychain0.install
+++ b/debian/libqtkeychain0.install
@@ -1 +1,2 @@
-usr/lib/*/lib*.so.*
+usr/lib/*/libqtkeychain.so.*
+usr/share/qt4
diff --git a/debian/qt5keychain-dev.install b/debian/qt5keychain-dev.install
new file mode 100644
index 0000000..fc9c46c
--- /dev/null
+++ b/debian/qt5keychain-dev.install
@@ -0,0 +1,3 @@
+usr/include/qt5keychain
+usr/lib/*/cmake/Qt5Keychain/*.cmake
+usr/lib/*/libqt5keychain.so
diff --git a/debian/qtkeychain-dev.install b/debian/qtkeychain-dev.install
index 3ba8307..6e101f3 100644
--- a/debian/qtkeychain-dev.install
+++ b/debian/qtkeychain-dev.install
@@ -1,3 +1,3 @@
-usr/include/*
+usr/include/qtkeychain
 usr/lib/*/cmake/QtKeychain/*.cmake
-usr/lib/*/lib*.so
+usr/lib/*/libqtkeychain.so
diff --git a/debian/rules b/debian/rules
index e733411..d1d38ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export QT_SELECT := qt4
 
 export DEB_BUILD_HARDENING=1
 export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidden
@@ -11,5 +9,22 @@ export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidd
 %:
 	dh $@ --parallel --with kde --with pkgkde_symbolshelper
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build-qt5
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DBUILD_WITH_QT4=On
+	dh_auto_configure --builddirectory=build-qt5 --
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-qt5
+
+override_dh_auto_install:
+	dh_auto_install
+	dh_auto_install --builddirectory=build-qt5
+
 override_dh_install:
 	dh_install --list-missing
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git