Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3

# Conflicts:
#	build/debian/control
#	build/debian/rules

2 files changed, 2 insertions, 5 deletions

diff --git a/build/debian/control b/build/debian/control
index 0947cb8203..165f7aac28 100644
--- a/build/debian/control
+++ b/build/debian/control
@@ -33,11 +33,11 @@ Build-Depends: debhelper (>= 9),
                libsndfile1-dev,
                libasound2-dev,
                libvorbis-dev,
-               libmp4v2-dev,
                libfaad-dev,
                libportmidi-dev,
                libtag1-dev,
                libshout-dev,
+               libssl-dev,
                libprotobuf-dev,
                protobuf-compiler,
                libusb-1.0-0-dev,
diff --git a/build/debian/rules b/build/debian/rules
index 7191d81a7b..25f157c66f 100755
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -6,18 +6,15 @@
 # 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 = ""
-MIXXX_BUILD_FOLDER = "linux_build"
 
 # 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_BUILD_FOLDER = "lin32_build"
 endif
 ifneq (,$(findstring amd64,$(ARCH)))
     MIXXX_SCONS_FLAGS += machine=x86_64
-    MIXXX_BUILD_FOLDER = "lin64_build"
 endif
 
 # parallel builds for scons
@@ -52,7 +49,7 @@ endif
 
 override_dh_auto_clean:
 	scons $(MIXXX_SCONS_FLAGS) -c || true
-	rm -rf .sconf_temp/ cache/ $(MIXXX_BUILD_FOLDER)/
+	rm -rf .sconf_temp/ cache/ lin*_build/
 	dh_clean .sconsign.dblite cachecustom.py \
 		config.log src/build.h build/*.pyc mixxx.1 lib/*/lib/*.a
 	dh_auto_clean