[SCM] pavucontrol packaging branch, master, updated. debian/1.0-1-15-g053079c

[leo.cavaille-guest at users.alioth.debian.org]

The branch, master has been updated
       via  053079ca400c2401d4a16068f3d450b0f08a2d0e (commit)
       via  2494dcfb6e23a0a78c52b0f82cfb700454f34d79 (commit)
       via  e764e5dab3d0ccaf9e3eaebaaad1bc940fe85c85 (commit)
      from  6c2de7cc3058c118db32c6854e498064e8b4d641 (commit)


- Shortlog ------------------------------------------------------------
053079c Avoid patch to delete pa_stream_peek call
2494dcf Bump to new standard version, parameters for upload
e764e5d New release fixes #712551

Summary of changes:
 debian/changelog                                        |  4 ++--
 debian/control                                          |  4 ++--
 ...001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch | 17 ++++++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 053079ca400c2401d4a16068f3d450b0f08a2d0e
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Tue Mar 4 19:22:53 2014 +0100

    Avoid patch to delete pa_stream_peek call

diff --git a/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch b/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch
index 8e68d81..2f404de 100644
--- a/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch
+++ b/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch
@@ -6,18 +6,17 @@ Subject: Don't crash if pa_stream_peek returns NULL
  src/mainwindow.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index be6fb93..3e69af0 100644
 --- a/src/mainwindow.cc
 +++ b/src/mainwindow.cc
-@@ -483,8 +483,8 @@ static void read_callback(pa_stream *s, size_t length, void *userdata) {
-     const void *data;
-     double v;
+@@ -488,6 +488,11 @@
+         return;
+     }
  
--    if (pa_stream_peek(s, &data, &length) < 0) {
--        show_error(_("Failed to read data from stream"));
 +    if (!data) {
 +        pa_stream_drop(s);
-         return;
-     }
++        return;
++    }
++
+     assert(length > 0);
+     assert(length % sizeof(float) == 0);
  

commit 2494dcfb6e23a0a78c52b0f82cfb700454f34d79
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Tue Mar 4 19:14:15 2014 +0100

    Bump to new standard version, parameters for upload

diff --git a/debian/changelog b/debian/changelog
index 92897fd..493a951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pavucontrol (2.0-1) unstable; urgency=medium
+pavucontrol (2.0-1) unstable; urgency=high
 
   * New upstream release (Closes: #712551)
   * Don't crash if pa_stream_peek returns NULL (Closes: #735898)
diff --git a/debian/control b/debian/control
index faa80a9..eea3aae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pavucontrol
 Section: sound
 Priority: optional
 Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
-Uploaders: Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Sjoerd Simons <sjoerd at debian.org>, Léo Cavaillé <leo at cavaille.net>
 Build-Depends: debhelper (>= 5), cdbs, autotools-dev,
                libpulse-dev (>= 0.9.15),
                libgtkmm-3.0-dev,
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5), cdbs, autotools-dev,
                quilt,
                libcanberra-gtk3-dev (>= 0.16),
                intltool
-Standards-Version: 3.7.2
+Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/pavucontrol.git
 Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/pavucontrol.git
 Homepage: http://0pointer.de/lennart/projects/pavucontrol/

commit e764e5dab3d0ccaf9e3eaebaaad1bc940fe85c85
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Tue Mar 4 18:24:17 2014 +0100

    New release fixes #712551

diff --git a/debian/changelog b/debian/changelog
index c0786a1..92897fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 pavucontrol (2.0-1) unstable; urgency=medium
 
-  * New upstream release
+  * New upstream release (Closes: #712551)
   * Don't crash if pa_stream_peek returns NULL (Closes: #735898)
 
  -- Christer Stenbrenden <christer at uggwar.net>  Thu, 20 Feb 2014 22:54:16 +0100

-- 
pavucontrol packaging