[SCM] mixxx/master: Revert to Qt 4

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 41fdd94c54718433fea24449c097a5df9e1cce1c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jan 26 18:56:23 2016 +0100

    Revert to Qt 4
    
    Upstream says that the Qt 5 port is not ready for production use.

diff --git a/debian/control b/debian/control
index b812ad6..1ae9ba6 100644
--- a/debian/control
+++ b/debian/control
@@ -29,10 +29,7 @@ Build-Depends:
  libopusfile-dev,
  libportmidi-dev [linux-any],
  libprotobuf-dev,
- libqt5opengl5-dev,
- libqt5svg5-dev,
- libqt5webkit5-dev,
- libqt5xmlpatterns5-dev,
+ libqt4-opengl-dev | libqt4-dev,
  librubberband-dev,
  libshout-dev,
  libsndfile1-dev,
@@ -45,8 +42,6 @@ Build-Depends:
  portaudio19-dev,
  protobuf-compiler,
  python-scour,
- qtscript5-dev,
- qttools5-dev-tools,
  scons,
  vamp-plugin-sdk,
  chrpath
@@ -58,7 +53,6 @@ Homepage: http://www.mixxx.org/
 Package: mixxx
 Architecture: linux-any
 Depends:
- libqt5sql5-sqlite,
  mixxx-data (= ${source:Version}),
  ${dist:Depends},
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 5d6449b..e946b46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,6 @@ export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-export QT_SELECT=qt5
-
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 	SUBSTVARS = -Vdist:Depends="pulseaudio-utils"
 else
@@ -22,12 +20,13 @@ SCONS_OPTS  = release=1
 SCONS_OPTS += qt_sqlite_plugin=0
 SCONS_OPTS += virtualize=0
 SCONS_OTPS += localecompare=1
-# destdir
+# destdir, prefix and machine
+SCONS_OPTS += prefix=/usr
 SCONS_OPTS += install_root=$(CURDIR)/debian/tmp/usr
-# Qt
-SCONS_OPTS += qt5=1
-SCONS_OPTS += qtdir=/usr/share/qt5 prefix=/usr
 SCONS_OPTS += machine=$(DEB_HOST_ARCH)
+# Qt
+SCONS_OPTS += qt5=0
+SCONS_OPTS += qtdir=/usr/share/qt4
 # disable use of __DATE__ and __TIME__
 SCONS_OPTS += buildtime=0
 # build with OpenGL ES 2 on armel and armhf
@@ -47,7 +46,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/qt5.pyc cachecustom.py \
+	dh_clean .sconsign.dblite cachecustom.py \
 		config.log src/build.h build/*.pyc mixxx.1 mixxx.xpm
 	dh_auto_clean
 

-- 
mixxx packaging