[SCM] signond packaging branch, master, updated. debian/8.57+20150423-3-11-g158dbc8

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/signond.git;a=commitdiff;h=05252fd

The following commit has been merged in the master branch:
commit 05252fdd31534744377a30fe589909743d88826f
Author: Diane Trout <diane at ghic.org>
Date:   Sun Jun 26 10:22:05 2016 -0700

    Upstream no longer supports Qt4, so stop building Qt4 packages.
---
 debian/changelog |  1 +
 debian/control   | 27 ---------------------------
 debian/rules     | 18 +++---------------
 3 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 597ee90..3a7eb1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ signond (8.59-1) UNRELEASED; urgency=medium
   * Update Standards-Version to 3.9.8.0. No changes needed.
   * Update debian/docs for renamed README.md
   * New upstream release.
+  * Upstream no longer supports Qt4, so stop building Qt4 packages.
 
   [ Scott Kitterman ]
   * Fix FTBFS when building just architecture independent packages by making
diff --git a/debian/control b/debian/control
index d8093e4..f296b78 100644
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,9 @@ Build-Depends: dbus-x11,
                graphviz,
                libdbus-1-dev,
                libproxy-dev,
-               libqt4-dev (>= 4.6),
-               libqt4-sql-sqlite,
                libqt5sql5-sqlite,
                libssl-dev,
                pkg-config,
-               qt4-dev-tools,
-               qt4-qmake,
                qt5-qmake,
                qtbase5-dev,
                qtchooser,
@@ -27,29 +23,6 @@ Homepage: https://gitlab.com/accounts-sso/signond
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/signond.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/signond.git
 
-Package: libsignon-qt-dev
-Section: libdevel
-Architecture: any
-Depends: libqt4-dev (>= 4.5),
-         libsignon-qt1 (= ${binary:Version}),
-         ${misc:Depends},
-Description: Single Sign On framework - qt development files
- Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
- platforms.
- .
- Headers and static libraries for the libsignon-qt library.
-
-Package: libsignon-qt1
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Single Sign On framework - qt shared libraries
- Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
- platforms.
- .
- This package contains Qt4 shared libraries to be used by applications.
-
 Package: libsignon-qt5-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 73df6c5..2b0a483 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -11,15 +9,12 @@ export DH_OPTIONS
 export NO_DOCS := no
 export QMAKE_LIBDIR=/usr/lib
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+export QT_SELECT=qt5
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DOXYGEN_VERSION := $(shell dpkg --status doxygen | grep Version | cut -f 2 -d ' ')
 
 override_dh_auto_configure:
-	mkdir -p build/qt4 build/qt5
-	QT_SELECT=qt4 \
-	dh_auto_configure -Bbuild/qt4 -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		BUILD_DIR=build/qt4 \
-		"QMAKE_CXXFLAGS=$(CFLAGS)" ../../signon.pro
+	mkdir -p build/qt5
 	QT_SELECT=qt5 \
 	dh_auto_configure -Bbuild/qt5 -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		BUILD_DIR=build/qt5 \
@@ -27,20 +22,13 @@ override_dh_auto_configure:
 		"QMAKE_CXXFLAGS=$(CFLAGS)" ../../signon.pro
 
 override_dh_auto_build:
-	QT_SELECT=qt4 dh_auto_build -Bbuild/qt4
 	QT_SELECT=qt5 dh_auto_build -Bbuild/qt5
 
 override_dh_auto_clean:
-	dh_auto_clean -Bbuild/qt4
 	dh_auto_clean -Bbuild/qt5
 	-rm src/signond/backupifadaptor.*
 
 override_dh_auto_install-arch:
-	dh_auto_install -Bbuild/qt4 -plibsignon-qt1
-	dh_auto_install -Bbuild/qt4 -plibsignon-qt-dev
-	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4
-	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQtConfig.cmake debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQt4Config.cmake
-	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQtConfigVersion.cmake debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQt4ConfigVersion.cmake
 	dh_auto_install -Bbuild/qt5
 
 override_dh_install:
@@ -48,7 +36,7 @@ override_dh_install:
 	rm -f debian/tmp/usr/include/signon-plugins/*test*.h
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libsignon-qt*.*a
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/signon/libexampleplugin.so
-	dh_install --fail-missing
+	dh_install -Bbuild/qt5 --fail-missing
 	dh_doxygen -i
 
 override_dh_gencontrol:

-- 
signond packaging