diff -Nru pulseaudio-12.2/debian/changelog pulseaudio-12.2/debian/changelog --- pulseaudio-12.2/debian/changelog 2018-10-09 17:15:42.000000000 +0800 +++ pulseaudio-12.2/debian/changelog 2018-11-27 16:35:03.000000000 +0800 @@ -1,3 +1,14 @@ +pulseaudio (1:12.2-2ubuntu0) disco; urgency=medium + + * Merged with Debian git (12.2-2 + 8ec20f69): + - Do not build esound compatibility anymore (Closes: #561780). + - Add volume-test.patch to replace 0050-disable-volume-test.patch, so + now we can run the test instead of disabling it (LP: #1785556). + - d/changelog & d/control: fix lintian complaint about + file-contains-trailing-whitespace. + + -- Daniel van Vugt Tue, 27 Nov 2018 16:35:03 +0800 + pulseaudio (1:12.2-0ubuntu4) cosmic; urgency=medium * No change rebuild for launchpad translations import diff -Nru pulseaudio-12.2/debian/compat pulseaudio-12.2/debian/compat --- pulseaudio-12.2/debian/compat 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/compat 1970-01-01 08:00:00.000000000 +0800 @@ -1 +0,0 @@ -10 diff -Nru pulseaudio-12.2/debian/control pulseaudio-12.2/debian/control --- pulseaudio-12.2/debian/control 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/control 2018-11-27 16:35:03.000000000 +0800 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Pulseaudio maintenance team Uploaders: Sjoerd Simons , Felipe Sateler -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper-compat (= 11), check, dh-exec, dpkg-dev (>= 1.17.14), @@ -46,7 +46,7 @@ libx11-xcb-dev, libxcb1-dev, libxtst-dev -Standards-Version: 4.1.3 +Standards-Version: 4.2.1 Rules-Requires-Root: no Vcs-Browser: https://git.launchpad.net/~ubuntu-audio-dev/pulseaudio Vcs-Git: https://git.launchpad.net/~ubuntu-audio-dev/pulseaudio @@ -110,23 +110,6 @@ pax11publish - Store/retrieve PulseAudio default server/sink/source settings in the X11 root window. -Package: pulseaudio-esound-compat -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: pulseaudio (<< 0.9.7) -Conflicts: esound -Replaces: esound -Provides: esound -Description: PulseAudio ESD compatibility layer - PulseAudio, previously known as Polypaudio, is a sound server for POSIX and - WIN32 systems. It is a drop in replacement for the ESD sound server with - much better latency, mixing/re-sampling quality and overall architecture. - . - This package contains the ESD compatibility components used by some - older versions of complete desktop environments, e.g., GNOME, and - many useful applications. It enables a PulseAudio sound server to - fully replace ESD. - Package: pulseaudio-module-zeroconf Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, avahi-daemon @@ -275,4 +258,3 @@ . This package provides the pre-load library used to redirect applications using OSS through pulseaudio. - diff -Nru pulseaudio-12.2/debian/patches/0050-disable-volume-test.patch pulseaudio-12.2/debian/patches/0050-disable-volume-test.patch --- pulseaudio-12.2/debian/patches/0050-disable-volume-test.patch 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/patches/0050-disable-volume-test.patch 1970-01-01 08:00:00.000000000 +0800 @@ -1,20 +0,0 @@ -Description: Disable volume-test - It seems to be faulty and failing, even using pure upstream releases. -Author: Daniel van Vugt -Bug: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/559 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1785556 -Forwarded: no -Last-Update: 2018-08-06 - -diff --git a/src/Makefile.am b/src/Makefile.am -index f4464d253..4bc2590c0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -269,7 +269,6 @@ TESTS_default = \ - resampler-test \ - smoother-test \ - thread-test \ -- volume-test \ - mix-test \ - proplist-test \ - cpu-mix-test \ diff -Nru pulseaudio-12.2/debian/patches/series pulseaudio-12.2/debian/patches/series --- pulseaudio-12.2/debian/patches/series 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/patches/series 2018-11-27 16:35:03.000000000 +0800 @@ -1,3 +1,5 @@ +volume-test.patch + # Ubuntu specific config/fixes 0001-volume-config-changes.patch 0006-load-module-x11-bell.patch @@ -5,7 +7,6 @@ 0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch 0030-load-module-switch-on-connect.patch memfd-glibc2.27.patch -0050-disable-volume-test.patch # Ubuntu Snap policy support 0406-tagstruct-add-copy-method.patch diff -Nru pulseaudio-12.2/debian/patches/volume-test.patch pulseaudio-12.2/debian/patches/volume-test.patch --- pulseaudio-12.2/debian/patches/volume-test.patch 1970-01-01 08:00:00.000000000 +0800 +++ pulseaudio-12.2/debian/patches/volume-test.patch 2018-11-27 16:35:03.000000000 +0800 @@ -0,0 +1,39 @@ +Description: Allow rounding without having to allow a random number of errors + in tests/volume-test.c +Bug: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/559 +Origin: upstream, https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/7 +Bug-Debian: https://bugs.debian.org/906504 +Last-update: 2018-09-09 +Reviewed-by: Joseph Herlant +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/tests/volume-test.c ++++ b/src/tests/volume-test.c +@@ -131,7 +131,11 @@ + if (p1 < p && p - p1 > md) + md = p - p1; + +- if (p1 != p || p2 != p) ++ /* As the hardware, the compiler version and the compilation flags ++ * may sometimes generate rounding errors, we allow p1 and p2 to have ++ * a difference of + or - 1. Note that those are uint32_t, so unsigned. ++ */ ++ if ((p > 0 && p1 < p-1) || p1 > p+1 || (p > 0 && p2 < p-1) || p2 > p+1) + mdn++; + } + } +@@ -139,13 +143,7 @@ + pa_log("max deviation: %lu n=%lu", (unsigned long) md, (unsigned long) mdn); + + fail_unless(md <= 1); +- +- /* mdn counts the times there were rounding errors during the test. The +- * number of rounding errors seems to vary slightly depending on the +- * hardware. The original limit was 251 errors, but it was increased to 253 +- * when the test was failing on Tanu's laptop. +- * See https://bugs.freedesktop.org/show_bug.cgi?id=72374 */ +- fail_unless(mdn <= 253); ++ fail_unless(mdn <= 0); + } + END_TEST + diff -Nru pulseaudio-12.2/debian/pulseaudio-esound-compat.install pulseaudio-12.2/debian/pulseaudio-esound-compat.install --- pulseaudio-12.2/debian/pulseaudio-esound-compat.install 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/pulseaudio-esound-compat.install 1970-01-01 08:00:00.000000000 +0800 @@ -1,7 +0,0 @@ -usr/bin/esdcompat -usr/lib/pulse-*/modules/libprotocol-esound.so -usr/lib/pulse-*/modules/module-esound-compat-spawnfd.so -usr/lib/pulse-*/modules/module-esound-compat-spawnpid.so -usr/lib/pulse-*/modules/module-esound-protocol-tcp.so -usr/lib/pulse-*/modules/module-esound-protocol-unix.so -usr/share/man/man1/esdcompat.1 diff -Nru pulseaudio-12.2/debian/pulseaudio-esound-compat.links pulseaudio-12.2/debian/pulseaudio-esound-compat.links --- pulseaudio-12.2/debian/pulseaudio-esound-compat.links 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/pulseaudio-esound-compat.links 1970-01-01 08:00:00.000000000 +0800 @@ -1,2 +0,0 @@ -usr/bin/esdcompat usr/bin/esd -usr/share/man/man1/esdcompat.1.gz usr/share/man/man1/esd.1.gz diff -Nru pulseaudio-12.2/debian/pulseaudio.init.example pulseaudio-12.2/debian/pulseaudio.init.example --- pulseaudio-12.2/debian/pulseaudio.init.example 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/pulseaudio.init.example 2018-11-27 16:35:03.000000000 +0800 @@ -1,6 +1,6 @@ #!/bin/sh -e ### BEGIN INIT INFO -# Provides: pulseaudio esound +# Provides: pulseaudio # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Should-Start: avahi-daemon udev network-manager diff -Nru pulseaudio-12.2/debian/pulseaudio.install pulseaudio-12.2/debian/pulseaudio.install --- pulseaudio-12.2/debian/pulseaudio.install 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/pulseaudio.install 2018-11-27 16:35:03.000000000 +0800 @@ -31,7 +31,6 @@ usr/lib/pulse-*/modules/module-combine.so usr/lib/pulse-*/modules/module-default-device-restore.so usr/lib/pulse-*/modules/module-detect.so -usr/lib/pulse-*/modules/module-esound-sink.so usr/lib/pulse-*/modules/module-http-protocol-tcp.so usr/lib/pulse-*/modules/module-http-protocol-unix.so usr/lib/pulse-*/modules/module-intended-roles.so diff -Nru pulseaudio-12.2/debian/rules pulseaudio-12.2/debian/rules --- pulseaudio-12.2/debian/rules 2018-08-29 21:18:41.000000000 +0800 +++ pulseaudio-12.2/debian/rules 2018-11-27 16:35:03.000000000 +0800 @@ -24,6 +24,7 @@ --with-systemduserunitdir=\$${prefix}/lib/systemd/user \ --enable-snap \ --disable-bluez4 \ + --disable-esound \ --enable-gsettings \ --disable-gconf