[pulseaudio] 01/02: Merge tag 'debian/7.1-2' into debian/jessie

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch debian/jessie
in repository pulseaudio.

commit 8613e46e573e33f8accabe2399a37095acdbd967
Merge: 7e1adb4 ad2ad2c
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Nov 13 10:16:04 2015 -0300

    Merge tag 'debian/7.1-2' into debian/jessie
    
    pulseaudio Debian release 7.1-2

 .tarball-version                                   |  2 +-
 .version                                           |  2 +-
 Makefile.in                                        |  2 +-
 NEWS                                               | 18 +++++++++++++
 configure                                          | 22 ++++++++--------
 configure.ac                                       |  2 +-
 debian/changelog                                   | 15 +++++++++++
 debian/control                                     |  2 ++
 debian/pulseaudio.lintian-overrides                |  1 +
 debian/shlibs.local                                |  4 +--
 debian/tests/build                                 | 30 ++++++++++++++++++++++
 debian/tests/control                               |  2 ++
 man/pulseaudio.1                                   |  2 +-
 man/pulseaudio.1.xml.in                            |  4 ++-
 src/daemon/main.c                                  |  8 ++++++
 src/daemon/systemd/user/pulseaudio.service.in      |  2 ++
 src/modules/alsa/alsa-mixer.c                      |  6 ++---
 src/modules/alsa/alsa-ucm.c                        |  1 -
 src/modules/alsa/mixer/paths/analog-input.conf     |  6 +++++
 .../alsa/mixer/paths/analog-output-lineout.conf    |  8 ++++++
 .../mixer/paths/analog-output-speaker-always.conf  |  4 +++
 .../alsa/mixer/paths/analog-output-speaker.conf    |  4 +++
 src/modules/module-null-sink.c                     |  6 +++--
 src/pulse/version.h                                |  4 +--
 src/pulsecore/pstream.c                            | 11 +++++++-
 src/pulsecore/shm.c                                | 10 +++++---
 26 files changed, 147 insertions(+), 31 deletions(-)

diff --cc debian/changelog
index 4929415,84ec7b4..0b99180
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,24 @@@
+ pulseaudio (7.1-2) unstable; urgency=medium
+ 
+   * Add build-depends on libsoxr-dev to enable soxr resamplers.
+      Closes: #804212
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Fri, 06 Nov 2015 17:15:54 -0300
+ 
+ pulseaudio (7.1-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * Update shlibs file for 7.1
+   * Silence lintian warning about pulsecore: it is internal library
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Sun, 01 Nov 2015 16:27:53 -0300
+ 
 +pulseaudio (7.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Felipe Sateler <fsateler at debian.org>  Thu, 08 Oct 2015 22:46:32 -0300
 +
  pulseaudio (7.0-1) unstable; urgency=medium
  
    [ Luke Yelavich ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git