[Pkg-voip-commits] r8840 - in /mumble/trunk/debian: changelog control patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch patches/series

[thorvald at alioth.debian.org]

Author: thorvald
Date: Fri Mar 25 07:41:45 2011
New Revision: 8840

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8840
Log:
* Prefer libboost1.46-dev to libboost-dev.
  Closes: #618092
* Add patch from Conor Curran to fix PulseAudio role.
  Closes: #615994

Added:
    mumble/trunk/debian/patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/patches/series

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=8840&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Fri Mar 25 07:41:45 2011
@@ -1,3 +1,12 @@
+mumble (1.2.3-2) UNRELEASED; urgency=low
+
+  * Prefer libboost1.46-dev to libboost-dev.
+    Closes: #618092
+  * Add patch from Conor Curran to fix PulseAudio role.
+    Closes: #615994
+
+ -- Thorvald Natvig <thorvald at debian.org>  Fri, 25 Mar 2011 07:45:13 +0100
+
 mumble (1.2.3-1) unstable; urgency=low
 
   [ Patrick Matthäi ]

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=8840&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Fri Mar 25 07:41:45 2011
@@ -5,7 +5,8 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Patrick Matthäi <pmatthaei at debian.org>, Thorvald Natvig <thorvald at debian.org>
 Build-Depends: debhelper (>= 7.0.8), po-debconf,
- libboost-dev (>= 1.36.0), libboost-python-dev (>= 1.36.0),
+ libboost1.46-dev | libboost-dev (>= 1.42.0),
+ libboost-python1.46-dev | libboost-python-dev (>= 1.42.0),
  libqt4-dev (>= 4.5.0), libqt4-opengl-dev (>= 4.5.0),
  libasound2-dev, libpulse-dev [!hurd-i386],
  libogg-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev (>= 0.7.0), libsndfile1-dev,

Added: mumble/trunk/debian/patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch?rev=8840&op=file
==============================================================================
--- mumble/trunk/debian/patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch (added)
+++ mumble/trunk/debian/patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch Fri Mar 25 07:41:45 2011
@@ -1,0 +1,34 @@
+From 18e6fe86e1561fc2dca6ca4a583255b76328e715 Mon Sep 17 00:00:00 2001
+From: ronoc <conor at forwind.net>
+Date: Fri, 4 Mar 2011 15:57:13 +0000
+Subject: [PATCH] Set the correct pulse audio properties, for the icon, app name and the media role on the pulse connection. This will help other apps identify mumble at runtime and be able to determine mumble's purpose.
+
+---
+ src/mumble/PulseAudio.cpp |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp
+index f5fec60..cbd9ec6 100644
+--- a/src/mumble/PulseAudio.cpp
++++ b/src/mumble/PulseAudio.cpp
+@@ -99,7 +99,16 @@ PulseAudioSystem::PulseAudioSystem() {
+ 	pam = pa_threaded_mainloop_new();
+ 	pa_mainloop_api *api = pa_threaded_mainloop_get_api(pam);
+ 
+-	pacContext = pa_context_new(api, "Mumble");
++	pa_proplist     *proplist;
++
++	proplist = pa_proplist_new ();
++	pa_proplist_sets (proplist, PA_PROP_APPLICATION_NAME, "Mumble");
++	pa_proplist_sets (proplist, PA_PROP_APPLICATION_ID, "net.sourceforge.mumble.mumble");
++	pa_proplist_sets (proplist, PA_PROP_APPLICATION_ICON_NAME, "mumble");
++	pa_proplist_sets (proplist, PA_PROP_MEDIA_ROLE, "phone");
++ 
++	pacContext = pa_context_new_with_proplist (api, NULL, proplist);
++	pa_proplist_free (proplist);
+ 
+ 	pa_context_set_subscribe_callback(pacContext, subscribe_callback, this);
+ 
+-- 
+1.7.4.1
+

Modified: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=8840&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Fri Mar 25 07:41:45 2011
@@ -1,0 +1,1 @@
+0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch