[SCM] pavucontrol packaging branch, master, updated. debian/1.0-1-10-g2dfa61b

leo.cavaille-guest at users.alioth.debian.org leo.cavaille-guest at users.alioth.debian.org
Tue Mar 4 14:51:18 UTC 2014


The branch, master has been updated
  discards  661d494e93c3402a0457c0a51ff6c8445ccc256a (commit)
  discards  8e9dfe309da492124f845f1e319d50131f389da0 (commit)
  discards  73899444b3e59d4b4eef23d66be5620f52ae2a9b (commit)
  discards  39361c3cea918418448a7c0346c40592a2799565 (commit)
  discards  d00aaff8f4da90c1db9f9f4c77096753d8a81b3c (commit)
       via  2dfa61b7dcad51191874b5b0d55516fc5cd4c2ac (commit)
       via  ce1b37c2a7e2d53cc4f2e5e85806d8a08d1b3fbf (commit)
       via  a53e1e0dcbb4fe0181033223e1e6e39cde9f23fe (commit)
       via  b8bedf321bae16e1cda963fff68cb87ef05c5e7c (commit)
       via  b564c80b8290c018ff83588a1f6797e260990598 (commit)
       via  556d26d615682023db4f752567d9265094699586 (commit)
      from  661d494e93c3402a0457c0a51ff6c8445ccc256a (commit)


- Shortlog ------------------------------------------------------------
2dfa61b Added debian/source/format with 3.0 (quilt)
ce1b37c Updated changelog to reflect closing of #735898
a53e1e0 Patch to prevent segmentation fault
b8bedf3 New upstream release
b564c80 Merge tag 'upstream/2.0'

Summary of changes:
-----------------------------------------------------------------------
Details of changes:

commit 2dfa61b7dcad51191874b5b0d55516fc5cd4c2ac
Author: Christer Stenbrenden <christer at uggwar.net>
Date:   Wed Feb 26 10:31:03 2014 +0100

    Added debian/source/format with 3.0 (quilt)

diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

commit ce1b37c2a7e2d53cc4f2e5e85806d8a08d1b3fbf
Author: Christer Stenbrenden <christer at uggwar.net>
Date:   Wed Feb 26 10:25:38 2014 +0100

    Updated changelog to reflect closing of #735898

diff --git a/debian/changelog b/debian/changelog
index cb29cb2..c0786a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pavucontrol (2.0-1) unstable; urgency=medium
 
   * New upstream release
+  * 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
 

commit a53e1e0dcbb4fe0181033223e1e6e39cde9f23fe
Author: Christer Stenbrenden <christer at uggwar.net>
Date:   Tue Feb 25 22:16:11 2014 +0100

    Patch to prevent segmentation fault
    
    pa_stream_peek can return NULL, even though it's unusual. In the upcoming
    version of PulseAudio this has been clarified in the documentation.
    
    In that case, don't crash, just call pa_stream_drop so that the pointer
    moves forward.

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
new file mode 100644
index 0000000..8e68d81
--- /dev/null
+++ b/debian/patches/0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch
@@ -0,0 +1,23 @@
+From: Christer Stenbrenden <christer at uggwar.net>
+Date: Tue, 25 Feb 2014 22:14:13 +0100
+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;
+ 
+-    if (pa_stream_peek(s, &data, &length) < 0) {
+-        show_error(_("Failed to read data from stream"));
++    if (!data) {
++        pa_stream_drop(s);
+         return;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..8572b85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Don-t-crash-if-pa_stream_peek-returns-NULL.patch

commit b8bedf321bae16e1cda963fff68cb87ef05c5e7c
Author: Christer Stenbrenden <christer at uggwar.net>
Date:   Thu Feb 20 23:03:58 2014 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 38748be..cb29cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pavucontrol (2.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Christer Stenbrenden <christer at uggwar.net>  Thu, 20 Feb 2014 22:54:16 +0100
+
 pavucontrol (1.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/doc/README b/doc/README
index cb15783..89774f6 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-                        PulseAudio Volume Control 0.99.2
+                         PulseAudio Volume Control 2.0
 
    Copyright 2006-2009 Lennart Poettering, 2009-2011 Colin Guthrie
    <mzcnihpbageby (at) 0pointer (dot) de>
@@ -26,83 +26,91 @@ License
 
 News
 
+   Fri Mar 8 2013:
+
+   [10]Version 2.0 released.
+
+   Tue Sep 27 2011:
+
+   [11]Version 1.0 released.
+
    Thu Sep 15 2011:
 
-   [10]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
+   [12]Version 0.99.2 (v1 RC2) released; digitial receiver UI.
 
    Tue Aug 2 2011:
 
-   [11]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
+   [13]Version 0.99.1 (v1 RC1) released; gtk3 support; source output
    volume support; key command handling; bugfixes.
 
    Wed Oct 14 2009:
 
-   [12]Version 0.9.10 released; minor fixes; translation updates.
+   [14]Version 0.9.10 released; minor fixes; translation updates.
 
    Thu Sep 10 2009:
 
-   [13]Version 0.9.9 released; allow configuring device ports; various
+   [15]Version 0.9.9 released; allow configuring device ports; various
    updates.
 
    Mon Apr 13 2009:
 
-   [14]Version 0.9.8 released; allow configuring card profiles; various
+   [16]Version 0.9.8 released; allow configuring card profiles; various
    updates.
 
    Tue Sep 9 2008:
 
-   [15]Version 0.9.7 released; show volume meter for each stream and
+   [17]Version 0.9.7 released; show volume meter for each stream and
    device.
 
    Fri Mar 28 2008:
 
-   [16]Version 0.9.6 released; draw radio buttons instead of check boxes
+   [18]Version 0.9.6 released; draw radio buttons instead of check boxes
    when moving streams; fix crasher when connecting to a PA server that
    has no default sink/source configured.
 
    Tue Oct 30 2007:
 
-   [17]Version 0.9.5 released; rework UI; add context menu option to kill
+   [19]Version 0.9.5 released; rework UI; add context menu option to kill
    a playback stream; add context menu option to select the default
    device; use prettier channel names; filter non-application streams by
    default; support muting streams
 
    Sat Aug 26 2006:
 
-   [18]Version 0.9.4 released; add the ability to move a stream to another
+   [20]Version 0.9.4 released; add the ability to move a stream to another
    device while it is playing; limit the list of sinks/sources shown by
    their type; other cleanups
 
    Mon Jul 24 2006:
 
-   [19]Version 0.9.3 released; show client names only if they are set
+   [21]Version 0.9.3 released; show client names only if they are set
 
    Sat Jul 8 2006:
 
-   [20]Version 0.9.2 released; update for [21]PulseAudio 0.9.2
+   [22]Version 0.9.2 released; update for [23]PulseAudio 0.9.2
 
    Fri Jun 2 2006:
 
-   [22]Version 0.9.1 released; add a .desktop file; update icons
+   [24]Version 0.9.1 released; add a .desktop file; update icons
    everywhere
 
    Sat May 27 2006:
 
-   [23]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
+   [25]Version 0.9.0 released; update for Polypaudio 0.9.0; show client
    name of playback streams; make volume slider more responsive
 
    Fri Apr 21 2006:
 
-   [24]Version 0.8 released; initial release
+   [26]Version 0.8 released; initial release
 
 Overview
 
    PulseAudio Volume Control (pavucontrol) is a simple GTK based volume
-   control tool ("mixer") for the [25]PulseAudio sound server. In contrast
+   control tool ("mixer") for the [27]PulseAudio sound server. In contrast
    to classic mixer tools this one allows you to control both the volume
    of hardware devices and of each playback stream separately.
 
-   Everybody loves [26]screenshots.
+   Everybody loves [28]screenshots.
 
 Current Status
 
@@ -121,9 +129,9 @@ Requirements
    Unix versions) since it uses GNU autoconf for source code
    configuration.
 
-   pavucontrol requires [27]gtkmm and glademmm installed.
+   pavucontrol requires [29]gtkmm and glademmm installed.
 
-   Obviously pavucontrol requires an installation of [28]PulseAudio
+   Obviously pavucontrol requires an installation of [30]PulseAudio
    (version 0.9.16).
 
 Installation
@@ -140,12 +148,12 @@ Acknowledgements
 Download
 
    The newest release is always available from
-   [29]http://freedesktop.org/software/pulseaudio/pavucontrol/
+   [31]http://freedesktop.org/software/pulseaudio/pavucontrol/
 
-   The current release is [30]0.99.2
+   The current release is [32]2.0
 
-   Get pavucontrol's development sources from the [31]GIT [32]repository
-   ([33]gitweb):
+   Get pavucontrol's development sources from the [33]GIT [34]repository
+   ([35]gitweb):
 git clone git://git.0pointer.de/pavucontrol
      __________________________________________________________________
 
@@ -155,36 +163,38 @@ git clone git://git.0pointer.de/pavucontrol
 
 References
 
-   1. README#license
-   2. README#news
-   3. README#overview
-   4. README#status
-   5. README#documentation
-   6. README#requirements
-   7. README#installation
-   8. README#acks
-   9. README#download
-  10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
-  11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
-  12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
-  13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
-  14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
-  15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
-  16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
-  17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
-  18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
-  19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
-  20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
-  21. http://pulseaudio.org/
-  22. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
-  23. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
-  24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
-  25. http://0pointer.de/lennart/projects/pulseaudio/
-  26. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
-  27. http://gtkmm.sf.net/
-  28. http://pulseaudio.org/
-  29. http://freedesktop.org/software/pulseaudio/pavucontrol/
-  30. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
-  31. http://git-scm.org/
-  32. git://git.0pointer.de/pavucontrol
-  33. http://git.0pointer.de/?p=pavucontrol.git
+   1. file:///srv/christer/src/debian/pavucontrol/doc/README.html#license
+   2. file:///srv/christer/src/debian/pavucontrol/doc/README.html#news
+   3. file:///srv/christer/src/debian/pavucontrol/doc/README.html#overview
+   4. file:///srv/christer/src/debian/pavucontrol/doc/README.html#status
+   5. file:///srv/christer/src/debian/pavucontrol/doc/README.html#documentation
+   6. file:///srv/christer/src/debian/pavucontrol/doc/README.html#requirements
+   7. file:///srv/christer/src/debian/pavucontrol/doc/README.html#installation
+   8. file:///srv/christer/src/debian/pavucontrol/doc/README.html#acks
+   9. file:///srv/christer/src/debian/pavucontrol/doc/README.html#download
+  10. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.xz
+  11. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-1.0.tar.xz
+  12. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.2.tar.gz
+  13. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.99.1.tar.gz
+  14. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.10.tar.gz
+  15. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.9.tar.gz
+  16. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.8.tar.gz
+  17. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.7.tar.gz
+  18. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.6.tar.gz
+  19. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.5.tar.gz
+  20. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.4.tar.gz
+  21. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.3.tar.gz
+  22. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.2.tar.gz
+  23. http://pulseaudio.org/
+  24. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.1.tar.gz
+  25. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.9.0.tar.gz
+  26. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-0.8.tar.gz
+  27. http://0pointer.de/lennart/projects/pulseaudio/
+  28. http://freedesktop.org/software/pulseaudio/pavucontrol//screenshot.png
+  29. http://gtkmm.sf.net/
+  30. http://pulseaudio.org/
+  31. http://freedesktop.org/software/pulseaudio/pavucontrol/
+  32. http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.gz
+  33. http://git-scm.org/
+  34. git://git.0pointer.de/pavucontrol
+  35. http://git.0pointer.de/?p=pavucontrol.git

commit b564c80b8290c018ff83588a1f6797e260990598
Merge: 75e05dac5b24119f4f9422fa1b67636370ded1db 556d26d615682023db4f752567d9265094699586
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Tue Mar 4 14:50:23 2014 +0100

    Merge tag 'upstream/2.0'
    
    Upstream version 2.0


-- 
pavucontrol packaging



More information about the pkg-pulseaudio-devel mailing list