Merge branch 'master' into remove-vamp

9 files changed, 149 insertions, 157 deletions

diff --git a/build/debian/changelog b/build/debian/changelog
index 157dd78db8..7be287a008 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,3 +1,33 @@
+mixxx (2.1.4-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+
+ -- Be <be@mixxx.org>  Mon, 30 Aug 2018 07:47:00 +0500
+
+mixxx (2.1.3-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+
+ -- Be <be@mixxx.org>  Mon, 20 Aug 2018 12:53:15 +0500
+
+mixxx (2.1.2-0ubuntu1) artful; urgency=medium
+
+  * New upstream release.
+
+ -- RJ Ryan <rryan@mixxx.org>  Fri, 10 Aug 2018 13:11:21 +0300
+
+mixxx (2.1.1-0ubuntu1) artful; urgency=medium
+
+  * New upstream release.
+
+ -- RJ Ryan <rryan@mixxx.org>  Thu, 17 May 2018 20:42:25 +0200
+
+mixxx (2.1.0-0ubuntu1) artful; urgency=medium
+
+  * New upstream release.
+
+ -- RJ Ryan <rryan@mixxx.org>  Sun, 15 Apr 2018 15:06:39 -0700
+
 mixxx (2.0.0-0ubuntu1) precise; urgency=medium
 
   * New upstream release.
diff --git a/build/debian/compat b/build/debian/compat
index b8626c4cff..ec635144f6 100644
--- a/build/debian/compat
+++ b/build/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/build/debian/control b/build/debian/control
index c9a0661a0f..b26aa9483f 100644
--- a/build/debian/control
+++ b/build/debian/control
@@ -1,13 +1,28 @@
 Source: mixxx
 Section: sound
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-XSBC-Original-Maintainer: RJ Ryan <rryan@mixxx.org>
-Build-Depends: debhelper (>= 4.0.0),
+Maintainer: RJ Skerry-Ryan <rryan@mixxx.org>
+Build-Depends: debhelper (>= 9),
                pkg-config,
                docbook-to-man,
                libglu1-mesa-dev,
-               libqt4-opengl-dev | libqt4-dev (>= 4.6.0),
+# qt5-default depends on qtbase5-dev, which includes headers for
+# QtConcurrent
+# QtCore
+# QtGui
+# QtNetwork
+# QtPlatformHeaders
+# QtPrintSupport
+# QtSql
+# QtWidgets
+# QtXml
+               qt5-default (>= 5.2.0),
+# We additionally need headers for QtOpenGL, QtScript, and QtSvg.
+               qtscript5-dev,
+               libqt5opengl5-dev,
+               libqt5svg5-dev,
+# Only needed for running tests that use SQLite.
+               libqt5sql5-sqlite,
                scons,
                libjack-dev,
                portaudio19-dev,
@@ -17,13 +32,11 @@ Build-Depends: debhelper (>= 4.0.0),
                libsndfile1-dev,
                libasound2-dev,
                libvorbis-dev,
-               libsoundtouch1-dev,
                libmp4v2-dev,
                libfaad-dev,
                libportmidi-dev,
                libtag1-dev,
                libshout-dev,
-               libqtwebkit-dev,
                libprotobuf-dev,
                protobuf-compiler,
                libusb-1.0-0-dev,
@@ -33,22 +46,26 @@ Build-Depends: debhelper (>= 4.0.0),
                libsqlite3-dev,
                libsoundtouch-dev,
                libhidapi-dev,
-               libupower-glib-dev
-Standards-Version: 3.7.3
+               libupower-glib-dev,
+               liblilv-dev,
+               libmp3lame-dev,
+# for running mixxx-test
+               xvfb
+Standards-Version: 3.9.8
 Homepage: http://www.mixxx.org/
 
 Package: mixxx
 Section: sound
-Architecture: any
+Architecture: linux-any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libqt4-opengl,
-         libqt4-svg,
-         libqt4-xmlpatterns,
-         libqt4-webkit,
-         libqt4-sql,
-         libqt4-sql-sqlite
-Recommends: libmp3lame0
+         libqt5opengl5,
+         libqt5svg5,
+         libqt5xml5,
+         libqt5sql5,
+         libqt5sql5-sqlite,
+# for pasuspender
+         pulseaudio-utils
 Suggests: pdf-viewer
 Replaces: mixxx-data
 Description: Free Digital DJ software. Start making live DJ mixes today.
@@ -93,3 +110,15 @@ Description: Free Digital DJ software. Start making live DJ mixes today.
   - Multiple simultaneous MIDI/HID controllers
   - Multi-core CPU support
   - 24-bit/96000 Hz playback and capture
+
+Package: mixxx-test
+Section: sound
+Architecture: linux-any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libqt5opengl5,
+         libqt5svg5,
+         libqt5xml5,
+         libqt5sql5,
+         libqt5sql5-sqlite
+Description: The Mixxx test suite.
\ No newline at end of file
diff --git a/build/debian/copyright b/build/debian/copyright
index c2680577b0..1e5a248d56 100644
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -1,22 +1,27 @@
-This package was debianized by Paul Brossier <piem@altern.org> on
-Fri, 26 Nov 2004 12:55:35 +0000.
-
-It was downloaded from http://mixxx.sourceforge.net/
-
-  gplot and vbrheadersdk have been removed from the original archive as
-  they do not comply with the Debian Free Software Guidelines (DFSG).
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Mixxx
+Upstream-Contact:
+ RJ Skerry-Ryan <rryan@mixxx.org>
+Source: https://downloads.mixxx.org/
 
+Files: *
 Copyright:
-  Mixxx
-    Copyright (C) 2000-2016 Haste Andersen and Mixxx developers
-
-Upstream Authors: Tue Haste Andersen <haste@diku.dk>
-              and Ken Haste Andersen <kha@dfu.min.dk>
-
-License:
-
-Mixxx is released under the GNU General Public License Version 2 or above:
+ 2001-2018 Mixxx development team
+License: GPL-2+
 
- You are free to distribute this software under the terms of the GNU General
- Public License. On Debian systems, the complete text of the GNU General Public
- License can be found in the file `/usr/share/common-licenses/GPL'.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+Comment:
+ On Debian systems the full text of the GNU General Public
+ License can be found in the `/usr/share/common-licenses/GPL-2' file.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build/debian/menu b/build/debian/menu
index c945aa3d19..b1ff680748 100644
--- a/build/debian/menu
+++ b/build/debian/menu
@@ -2,6 +2,6 @@
   needs="X11" \
   section="Apps/Sound" \
   title="Mixxx" \
-  command="/usr/bin/pasuspender /usr/bin/mixxx" \
+  command="/usr/bin/pasuspender -- /usr/bin/mixxx" \
   icon="/usr/share/pixmaps/mixxx.xpm" \
   icon16x16="/usr/share/pixmaps/mixxx-16.xpm"
diff --git a/build/debian/mixxx-test.install b/build/debian/mixxx-test.install
new file mode 100644
index 0000000000..38754b9969
--- /dev/null
+++ b/build/debian/mixxx-test.install
@@ -0,0 +1,2 @@
+usr/bin/mixxx-test
+usr/share/mixxx-test/test_results.xml
\ No newline at end of file
diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
index 45323b5c15..fc89fa6da1 100644
--- a/build/debian/mixxx.desktop
+++ b/build/debian/mixxx.desktop
@@ -3,9 +3,9 @@ Version=1.0
 Name=Mixxx
 GenericName=Digital DJ interface
 Comment=A digital DJ interface
-Exec=pasuspender mixxx
+Exec=pasuspender -- mixxx
 Terminal=false
-Icon=mixxx-icon
+Icon=mixxx_icon
 Type=Application
 StartupNotify=true
 Categories=Qt;AudioVideo;Audio;
diff --git a/build/debian/mixxx.install b/build/debian/mixxx.install
index e0ddb4cb60..429d081733 100644
--- a/build/debian/mixxx.install
+++ b/build/debian/mixxx.install
@@ -1,4 +1,4 @@
-usr/bin
+usr/bin/mixxx
 usr/share/pixmaps
 usr/share/applications
 usr/share/mixxx
diff --git a/build/debian/rules b/build/debian/rules
index c63ff0b953..81aad95fba 100755
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -1,138 +1,64 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Documentation: https://www.debian.org/doc/debian-policy/ch-source.html#main-building-script-debian-rules
 
-# no thanks dpkg-buildpackage, we will handle our own C++ optimizations
-DEB_BUILD_OPTIONS= noopt
-
-# optimize=portable
-# for sse2 CPUs (>= Pentium 4) which is the minimum requiremnt for using Mixxx
-# this will set CCFLAGS=-mtune=generic -msse2 -mfpmath=sse
-# If you need a pure i386 code which is the Debian standard use
-# optimize=legacy (not recomended)
-# this sets CCFLAGS=-mtune=generic only
-# virtualize=0 switches of keeping build files in the cache folder
-MIXXX_SCONS_FLAGS = optimize=portable virtualize=0 mad=1 localecompare=1 qt_sqlite_plugin=0 build=$(MIXXX_BUILD)
+# Build flags are passed in from the SConscript. The following line is replaced
+# via exact-string matching so do not change it!
+MIXXX_SCONS_FLAGS = ""
 
 # If ARCH is set to a different architecture when running pbuilder, pbuilder
 # will be set to create an environment to build packages for the architecture
 # specified in ARCH.
 ifneq (,$(findstring i386,$(ARCH)))
-	MIXXX_SCONS_FLAGS += machine=x86
+  MIXXX_SCONS_FLAGS += machine=x86
 endif
 ifneq (,$(findstring amd64,$(ARCH)))
-	MIXXX_SCONS_FLAGS += machine=x86_64
+  MIXXX_SCONS_FLAGS += machine=x86_64
 endif
 
-# detect number of processors
-NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-ifeq ($(NCPUS),-1)
-	NCPUS:=1
-endif
-ifeq ($(NCPUS),0)
-	NCPUS:=1
+# parallel builds for scons
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MIXXX_SCONS_FLAGS += -j$(NUMJOBS)
 endif
 
-MIXXX_SCONS_FLAGS += -j$(NCPUS) prefix=/usr install_root=$(CURDIR)/debian/tmp/usr
-SCONS = scons
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-stamp
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+  MIXXX_SCONS_FLAGS += test=1
+endif
 
-build-stamp: configure-stamp
-	dh_testdir
+MIXXX_SCONS_FLAGS += prefix=/usr
+MIXXX_SCONS_FLAGS += install_root=$(CURDIR)/debian/tmp/usr
 
-	mkdir -p $(CURDIR)/debian/tmp/usr
+%:
+	dh $@ --parallel
 
-	# Add here commands to compile the package.
-	($(SCONS) $(MIXXX_SCONS_FLAGS))
+override_dh_auto_build:
+	scons $(MIXXX_SCONS_FLAGS)
 	docbook-to-man debian/mixxx.sgml > mixxx.1
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -f mixxx.1
-
-	# Add here commands to clean up after the build process.
-	($(SCONS) $(MIXXX_SCONS_FLAGS) -c)
-	# hand cleaning!
-	rm -rf src/.{configure.def,moc,obj,summary.log,ui} src/{mixxx,a.out,Makefile}
-	rm -f build/*.pyc
-	rm -f .sconsign.dblite
-	rm -rf .sconf_temp
-	rm -f $(CURDIR)/debian/tmp
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	mkdir -p $(CURDIR)/debian/tmp/usr
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/mixxx
-	# Add here commands to install the package into debian/mixxx.
-	$(SCONS) $(MIXXX_SCONS_FLAGS) install
-	#the scons prefix path is in MIXXX_SCONS_FLAGS at the top of this file.
-	#(cd src; $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp)
-
-	dh_install --sourcedir=$(CURDIR)/debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-        # Install mixxx.mixxx-usb.udev.
-	dh_installudev --name=mixxx-usb
-#	dh_install
-	dh_installmenu
-	dh_desktop
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman mixxx.1
-	dh_link
-# We don't want our binaries stripped.
-#	dh_strip
-	dh_compress -Xpdf
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps -- --ignore-missing-info #This command complains about libQtXml.so.4 as of Ubuntu 8.10 (Intrepid), unless I tell it to ignore missing info. I don't understand why - Albert 04/13/2009
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	xvfb-run -- ./mixxx-test --gtest_output=xml:test_results.xml
+endif
 
-binary: binary-indep binary-arch
-# .PHONY: build clean binary-indep binary-arch binary install configure
-.PHONY: build binary-indep binary-arch binary install configure
+override_dh_auto_clean:
+	scons $(MIXXX_SCONS_FLAGS) -c || true
+	rm -rf .sconf_temp/ cache/ linux_build/
+	dh_clean .sconsign.dblite cachecustom.py \
+		config.log src/build.h build/*.pyc mixxx.1
+	dh_auto_clean
+
+override_dh_auto_install:
+	scons $(MIXXX_SCONS_FLAGS) install
+	mkdir $(CURDIR)/debian/tmp/usr/share/mixxx-test
+	cp test_results.xml $(CURDIR)/debian/tmp/usr/share/mixxx-test/
+	cp mixxx-test $(CURDIR)/debian/tmp/usr/bin
+	find $(CURDIR)/debian/tmp \( -name COPYING -o -name Thumbs.db \
+		-o -name shifter.sh -o -name '*.xsl' -o -name '*.php' \) \
+		-exec rm -f {} \;
+	find $(CURDIR)/debian/tmp -name '*.js' -exec chmod -x {} \;
+	find $(CURDIR)/debian/tmp/usr/share/mixxx/ -type f -exec chmod -x {} \;
+
+override_dh_gencontrol:
+	dh_gencontrol -- $(SUBSTVARS)