[SCM] pulseaudio packaging branch, master, updated. debian/2.1-2-16-gd36f28c
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Fri Nov 16 20:56:51 UTC 2012
The branch, master has been updated
via d36f28c0d642b98353a1c06beb904863c426207f (commit)
via 20a30cb212b86051bd672eedc383ad406b0f781b (commit)
via fd2ec3e7082632d1afdcfcfac44eb7fbe9ba6d9e (commit)
from 56d2641862646268220436ff4893c7e901ced4da (commit)
- Shortlog ------------------------------------------------------------
d36f28c Sync with Ubuntu:
20a30cb debian/copyright: Update, taken from the ubuntu packaging
fd2ec3e debian/README.Debian: Updated & cleaned up
Summary of changes:
debian/README.Debian | 22 ++++++-----
debian/changelog | 9 ++++-
debian/copyright | 89 +++++++++++++++++++++++++++++++++++++++++-------
debian/pulse-alsa.conf | 37 +++-----------------
4 files changed, 102 insertions(+), 55 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit d36f28c0d642b98353a1c06beb904863c426207f
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Fri Nov 16 21:56:37 2012 +0100
Sync with Ubuntu:
* Sync with Ubuntu:
* debian/copyright: Updated
* debian/pulse-alsa.conf: set "show on" such that the default devices is
displayed as an option
diff --git a/debian/changelog b/debian/changelog
index d4c6058..0a70ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,9 +16,12 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
[ Sjoerd Simons ]
* debian/README.Debian: Updated & cleaned up
- * debian/copyright: Update, taken from the ubuntu packaging
+ * Sync with Ubuntu:
+ * debian/copyright: Updated
+ * debian/pulse-alsa.conf: set "show on" such that the default devices is
+ displayed as an option
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 16 Nov 2012 21:24:06 +0100
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 16 Nov 2012 21:55:46 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/pulse-alsa.conf b/debian/pulse-alsa.conf
index e39406d..be690fc 100644
--- a/debian/pulse-alsa.conf
+++ b/debian/pulse-alsa.conf
@@ -3,38 +3,13 @@
# running.
pcm.!default {
- type pulse
- hint {
- show {
- @func refer
- name defaults.namehint.basic
- }
- description "Playback/recording through the PulseAudio sound server"
- }
+ type pulse
+ hint {
+ show on
+ description "Playback/recording through the PulseAudio sound server"
+ }
}
ctl.!default {
- type pulse
- hint {
- show {
- @func refer
- name defaults.namehint.basic
- }
- description "Playback/recording through the PulseAudio sound server"
- }
+ type pulse
}
-
-pcm.pulse {
- type pulse
- hint {
- description "Playback/recording through the PulseAudio sound server"
- }
-}
-
-ctl.pulse {
- type pulse
- hint {
- description "Playback/recording through the PulseAudio sound server"
- }
-}
-
commit 20a30cb212b86051bd672eedc383ad406b0f781b
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Fri Nov 16 21:24:24 2012 +0100
debian/copyright: Update, taken from the ubuntu packaging
diff --git a/debian/changelog b/debian/changelog
index 227dbe5..d4c6058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
[ Sjoerd Simons ]
* debian/README.Debian: Updated & cleaned up
+ * debian/copyright: Update, taken from the ubuntu packaging
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 16 Nov 2012 21:13:45 +0100
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 16 Nov 2012 21:24:06 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 436731d..970053b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -77,7 +77,7 @@ Copyright:
Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
Copyright (C)1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/pulse/utf8.c
@@ -100,7 +100,7 @@ Files: src/modules/bluetooth/module-bluetooth-{device,discover}.c,
Copyright:
Copyright (C) 2008-2009 Joao Paulo Rechi Vita
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.
File: src/modules/bluetooth/proximity-helper.c
@@ -121,6 +121,30 @@ License: LGPL-2.1+
On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
+File: src/modules/dbus/iface-{client,stream}.c:
+Copyright:
+ Copyright 2009 Tanu Kaskinen
+ Copyright 2009 Vincent Filali-Ansary <filali.v at azurdigitalnetworks.net>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/dbus/module-dbus-protocol.c
+Copyright:
+ Copyright 2009 Tanu Kaskinen
+ Copyright 2006 Lennart Poettering
+ Copyright 2006 Shams E. King
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/dbus/*
+Copyright:
+ Copyright 2009 Tanu Kaskinen
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
Files: src/modules/echo-cancel/adrian*.*
Copyright:
Copyright (C) DFS Deutsche Flugsicherung (2004). All Rights Reserved.
@@ -156,12 +180,28 @@ License: LGPL-2.1+
On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
+File: src/modules/jack/module-jackdbus-detect.c
+Copyright:
+ Written by David Henningsson <david.henningsson at canonical.com>
+ Copyright 2010 Canonical Ltd.
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
Files: src/modules/module-device-manager.*
Copyright:
Copyright 2006-2008 Lennart Poettering
Copyright (C) 2009 Colin Guthrie
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/module-equalizer-sink.c
+Copyright:
+ Copyright 2004-2008 Lennart Poettering
+ Copyright 2009 Jason Newton <nevion at gmail.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/pulsecore/dbus-*.*, src/modules/module-hal-detect.c
@@ -169,7 +209,7 @@ Copyright:
Copyright 2006 Lennart Poettering
Copyright 2006 Shams E. King
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
File: src/modules/ladspa.h
@@ -184,7 +224,7 @@ Files: src/modules/module-always-sink.c, src/modules/rtp/rtsp_client.*
Copyright:
Copyright (C) 2008 Colin Guthrie
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/modules/module-detect.c
@@ -193,7 +233,7 @@ Copyright:
Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
Copyright 2006 Diego Petteno
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/modules/roap/*roap*, src/modules/rtp/headerlist.*
@@ -201,7 +241,7 @@ Copyright:
Copyright 2005-2007 Lennart Poettering
Copyright (C) 2008 Colin Guthrie
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/modules/roap/base64.*
@@ -209,7 +249,7 @@ Copyright:
Copyright (C) 2008 Colin Guthrie
Copyright (C) Kungliga Tekniska Hogskolan
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/modules/module-device-manager.c
@@ -217,7 +257,14 @@ Copyright:
Copyright 2006-2008 Lennart Poettering
Copyright 2009 Colin Guthrie
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-filter-{apply,heuristics}*.c
+Copyright:
+ Copyright 2011 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/modules/module-solaris.c
@@ -226,7 +273,23 @@ Copyright:
Copyright 2006-2007 Pierre Ossman <ossman at cendio.se> for Cendio AB
Copyright 2009 Finn Thain
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+File: src/modules/module-switch-on-connect.c
+Copyright:
+ Copyright 2006 Lennart Poettering
+ Copyright 2009 Canonical Ltd
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/modules/module-virtual-s{ink,ource}.c
+Copyright:
+ Copyright 2010 Intel Corporation
+ Contributor: Pierre-Louis Bossart <pierre-louis.bossart at intel.com>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
Files: src/modules/reserve.*
@@ -258,7 +321,7 @@ Copyright:
Copyright (C) 2006-2008 Lennart Poettering
Copyright (C) 2008 Nokia Corporation
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
File: src/pulsecore/core-util.c
@@ -275,7 +338,7 @@ Copyright:
Copyright (C) 2008 Lennart Poettering
Copyright (C) 2009 Colin Guthrie
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
File: src/pulsecore/ffmpeg/avcodec.h
@@ -298,7 +361,7 @@ Copyright:
Copyright (C) 2004 Joe Marcus Clarke
Copyright (C) 2006-2007 Pierre Ossman <ossman at cendio.se> for Cendio AB
License: LGPL-2.1+
- On Debian systems, the complete text of the LGPL-2 can be found in
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
/usr/share/common-licenses/LGPL-2.1.
File: man/xmltoman
commit fd2ec3e7082632d1afdcfcfac44eb7fbe9ba6d9e
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Fri Nov 16 21:14:07 2012 +0100
debian/README.Debian: Updated & cleaned up
diff --git a/debian/README.Debian b/debian/README.Debian
index 38486e8..84312b0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,12 +1,14 @@
-pulseaudio for Debian
----------------------
+pulseaudio for Debian (and Ubuntu)
+-----------------------------------
-The pulseaudio executable is installed suid root. In the near future, the
-current Suggests for rtkit may be promoted, as upstream developers
-strongly recommend that latter approach instead.
+By default pulseaudio is configured for using a per-user session daemon
+(see comments in /etc/default/pulseaudio). If you wish to prevent per-
+user session daemons from being invoked, remember to edit
+/etc/pulse/client.conf (or create ~/.pulse/client.conf) and ensure that
+"autospawn = no" is present and uncommented.
-PLEASE NOTE: PulseAudio's default configuration uses high quality sample
-rate conversion that may be overly CPU intensive. If PulseAudio's CPU usage
-is unacceptable on your hardware, please change the resample-method option
-in /etc/pulse/daemon.conf to either src-linear or trivial. See daemon.conf
-for more details.
+PulseAudio's default configuration uses high quality sample rate conversion
+that may be overly CPU intensive. If PulseAudio's CPU usage is unacceptable on
+your hardware, please change the resample-method option in
+/etc/pulse/daemon.conf to either src-linear or trivial. See daemon.conf for
+more details.
diff --git a/debian/changelog b/debian/changelog
index 4e2e86e..227dbe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,10 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* LSB headers: Should-Start: Avahi (Closes: #687890)
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 16 Nov 2012 20:51:07 +0100
+ [ Sjoerd Simons ]
+ * debian/README.Debian: Updated & cleaned up
+
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 16 Nov 2012 21:13:45 +0100
pulseaudio (2.1-2) experimental; urgency=low
--
pulseaudio packaging
More information about the pkg-pulseaudio-devel
mailing list