[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#853112: unblock: qmmp/1.1.6-1.1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package qmmp so oss4-dev gets closer to leaving the
critical path. Debdiff attachd.

unblock qmmp/1.1.6-1.1

Thanks,
    S
diffstat for qmmp-1.1.6 qmmp-1.1.6

 changelog |    8 ++++++++
 control   |    2 +-
 rules     |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff -Nru qmmp-1.1.6/debian/changelog qmmp-1.1.6/debian/changelog
--- qmmp-1.1.6/debian/changelog	2017-01-16 19:03:58.000000000 +0000
+++ qmmp-1.1.6/debian/changelog	2017-01-29 12:00:10.000000000 +0000
@@ -1,3 +1,11 @@
+qmmp (1.1.6-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop build-dependency on oss4-dev on Linux kernel (Closes: #852986)
+    - d/rules: explicitly disable OSS4 on Linux, for predictability
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 29 Jan 2017 12:00:10 +0000
+
 qmmp (1.1.6-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru qmmp-1.1.6/debian/control qmmp-1.1.6/debian/control
--- qmmp-1.1.6/debian/control	2017-01-16 19:03:58.000000000 +0000
+++ qmmp-1.1.6/debian/control	2017-01-29 12:00:10.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Matteo Cypriani <mcy@lm7.fr>
 Build-Depends: debhelper (>= 10), cmake, pkg-config, qtbase5-dev (>= 5.4),
   libqt5x11extras5-dev (>= 5.4), qttools5-dev-tools (>= 5.4),
-  qtchooser, libx11-dev, oss4-dev, libmad0-dev, libvorbis-dev,
+  qtchooser, libx11-dev, oss4-dev [!linux-any], libmad0-dev, libvorbis-dev,
   libogg-dev, libasound2-dev [linux-any], libtag1-dev (>= 1.10),
   libcurl4-gnutls-dev, qtmultimedia5-dev (>= 5.4), libmms-dev,
   libflac-dev, libmpcdec-dev, libjack-jackd2-dev, libsoxr-dev,
diff -Nru qmmp-1.1.6/debian/rules qmmp-1.1.6/debian/rules
--- qmmp-1.1.6/debian/rules	2017-01-16 19:03:58.000000000 +0000
+++ qmmp-1.1.6/debian/rules	2017-01-29 12:00:10.000000000 +0000
@@ -9,7 +9,7 @@
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	EXTRA_CMAKE_ARGS = -DUSE_HAL:BOOL=FALSE
+	EXTRA_CMAKE_ARGS = -DUSE_HAL:BOOL=FALSE -DUSE_OSS4:BOOL=FALSE
 else
 	EXTRA_CMAKE_ARGS = -DUSE_ALSA:BOOL=FALSE -DUSE_UDISKS:BOOL=FALSE
 endif

Reply to: