[SCM] cantata/master: Switch build to Qt5

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1335d54b8396f58b12d012d747047182ecdbd1f0
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Feb 7 23:52:45 2016 +1100

    Switch build to Qt5

diff --git a/debian/control b/debian/control
index a5cf550..f944c66 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Stuart Prescott <stuart at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
                graphicsmagick,
-               kdelibs5-dev,
                libavcodec-dev,
                libavformat-dev,
                libavutil-dev,
@@ -15,25 +14,28 @@ Build-Depends: cmake,
                libmusicbrainz5-dev (>= 5.1.0+git20150707),
                libmpg123-dev,
                libmtp-dev (>= 1.0.0),
-               libphonon-dev,
-               libqjson-dev,
-               libqt4-dev,
-               libqxt-dev,
+               libphonon4qt5-dev,
+               libqt5svg5-dev,
                libspeex-dev,
                libspeexdsp-dev,
                libtag-extras-dev,
                libtag1-dev,
+               libudev-dev,
+               libvlc-dev,
+               libvlccore-dev,
                libx11-dev,
                pkg-config,
-               pkg-kde-tools
+               pkg-kde-tools,
+               qtbase5-dev,
+               qttools5-dev-tools
 Standards-Version: 3.9.6
 Homepage: https://github.com/CDrummond/cantata
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/cantata.git
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/cantata.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/cantata.git
 
 Package: cantata
 Architecture: any
-Depends: kde-style-oxygen, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: liburi-perl
 Provides: mpd-client
 Suggests: mpd
diff --git a/debian/copyright b/debian/copyright
index 3b640b6..31012ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Files-Excluded:
     3rdparty/qjson
     3rdparty/qtsingleapplication
     3rdparty/qxt
-    3rdparty/solid-lite
     windows/icu
 Comment: Unneeded 3rd party source code removed
 License: GPL-3+
@@ -19,6 +18,28 @@ Copyright: 2011-2016 Craig Drummond <craig.p.drummond at gmail.com>
            2007-2011 Armin Walland
 License: GPL-2+
 
+Files: 3rdparty/solid-lite
+Copyright:
+  2005-2010, Kevin Ottens <ervin at kde.org>
+  2009-2012, Lukas Tinkl <ltinkl at redhat.com>
+  2010, Michael Zanetti <mzanetti at kde.org>
+  2009, Harald Fernengel <harry at kdevelop.org>
+  2010, Rafael Fernández López <ereslibre at kde.org>
+  2009-2010, Pino Toscano <pino at kde.org>
+  2006, Davide Bettio <davide.bettio at kdemail.net>
+  2007, Jeff Mitchell <kde-dev at emailgoeshere.com>
+  2009, Benjamin K. Stuhl <bks24 at cornell.edu>
+  2007, Kevin Krammer <kevin.krammer at gmx.at>
+  2012, Dan Vrátil <dvratil at redhat.com>
+  2012, Patrick von Reth <vonreth at kde.org>
+  2010, Mario Bensi <mbensi at ipsquad.net>
+License: LGPL-2.1+
+
+Files: 3rdparty/solid-lite/predicate_parser.c
+ 3rdparty/solid-lite/predicate_parser.h
+Copyright: 1984, 1989-1990, 2000-2006, Free Software Foundation, Inc.
+License: GPL-2+
+
 Files: 3rdparty/qtiocompressor/*
 Copyright: 2009 Nokia Corporation
 License: LGPL-2.1 or GPL-3
diff --git a/debian/rules b/debian/rules
index 26b609d..f7dbe87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export QT_SELECT=5
+
 %:
-	dh $@ --with kde
+	dh $@ --parallel --with kde
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_HTTP_SERVER=OFF -DENABLE_KDE=ON
+	dh_auto_configure -- -DENABLE_HTTP_SERVER=OFF
 
 override_dh_auto_install:
 	install -d debian/tmp
@@ -22,5 +24,4 @@ override_dh_installexamples:
 	chmod -x $(CURDIR)/debian/cantata/usr/share/doc/cantata/examples/cantata-dynamic.systemd
 
 override_dh_auto_clean:
-	rm -rf 3rdparty/qjson 3rdparty/qtsingleapplication 3rdparty/solid-lite
 	dh_auto_clean

-- 
cantata packaging