[SCM] mixxx/master: Update B-D and use QT5 as default

[mati75-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 440ed5f156bdabcca5779888d32ed6974555012a
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sun Jan 24 22:30:26 2016 +0100

    Update B-D and use QT5 as default

diff --git a/debian/changelog b/debian/changelog
index 8b1805a..244ba06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ mixxx (2.0.0~dfsg-1) UNRELEASED; urgency=medium
   * Update debian/repack.sh script to latest version.
   * Remove obsolete menu file.
   * Update debian/repack.local for new upstream version.
+  * debian/control:
+    - Add to B-D: libsqlite3-dev, librubberband-dev,libchromaprint-dev.
+    - Use QT5. (Closes: #766959, #784496)
+  * debian/rules:
+    - Switch to QT5.
 
  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Sun, 24 Jan 2016 17:57:23 +0100
 
diff --git a/debian/control b/debian/control
index a038e4a..093527a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,12 @@ Build-Depends:
  libogg-dev,
  libportmidi-dev [linux-any],
  libprotobuf-dev,
- libqt4-opengl-dev | libqt4-dev,
- libqtwebkit-dev,
+ qttools5-dev-tools,
+ libqt5opengl5-dev,
+ libqt5webkit5-dev,
+ libqt5svg5-dev,
+ qtscript5-dev,
+ libqt5xmlpatterns5-dev,
  libshout-dev,
  libsndfile1-dev,
  libsoundtouch-dev (>= 1.5.0),
@@ -36,7 +40,10 @@ Build-Depends:
  protobuf-compiler,
  python-scour,
  scons,
- vamp-plugin-sdk
+ vamp-plugin-sdk,
+ libsqlite3-dev,
+ librubberband-dev,
+ libchromaprint-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/mixxx.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/mixxx.git
@@ -45,7 +52,7 @@ Homepage: http://www.mixxx.org/
 Package: mixxx
 Architecture: linux-any
 Depends:
- libqt4-sql-sqlite,
+ libqt5sql5-sqlite,
  mixxx-data (= ${source:Version}),
  ${dist:Depends},
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 3b13584..c54ebdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,15 @@ export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
+export QT_SELECT=qt5
+
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 	SUBSTVARS = -Vdist:Depends="pulseaudio-utils"
 else
 	SUBSTVARS = -Vdist:Depends=""
 endif
 
-SCONS_OPTS = install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt4 prefix=/usr
+SCONS_OPTS = qt5=1 install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt5 prefix=/usr
 SCONS_OPTS += machine=$(DEB_HOST_ARCH)
 
 %:
@@ -34,7 +36,7 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	scons $(SCONS_OPTS) -c || true
 	rm -rf .sconf_temp/ cache/ linux_build/
-	dh_clean .sconsign.dblite build/qt4.pyc cachecustom.py \
+	dh_clean .sconsign.dblite build/qt5.pyc cachecustom.py \
 		config.log src/build.h build/*.pyc mixxx.1 mixxx.xpm
 	dh_auto_clean
 

-- 
mixxx packaging