Merge lp:~mterry/pulseaudio/nodisplay-autostart into lp:~ubuntu-audio-dev/pulseaudio/ubuntu.oneiric

Proposed by Michael Terry on 2011-07-01
Status: Merged
Approved by: Luke Yelavich on 2011-07-01
Approved revision: 368
Merged at revision: 368
Proposed branch: lp:~mterry/pulseaudio/nodisplay-autostart
Merge into: lp:~ubuntu-audio-dev/pulseaudio/ubuntu.oneiric
Diff against target: 53 lines (+21/-1)
3 files modified
debian/changelog (+6/-1)
debian/patches/0016-nodisplay-autostart.patch (+14/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~mterry/pulseaudio/nodisplay-autostart
Reviewer Review Type Date Requested Status
Ubuntu Audio Development Team 2011-07-01 Pending
Review via email: mp+66588@code.launchpad.net

Description of the change

To post a comment you must log in.
David Henningsson (diwic) wrote :

@mterry, do you think this is something that should go upstream as well, or do you see this as Ubuntu specific, and why?

Michael Terry (mterry) wrote :

Ubuntu specific for now. GNOME has rejected our patch to have the "Startup Applications" editor respect NoDisplay. :-/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-06-29 02:31:18 +0000
+++ debian/changelog 2011-07-01 12:02:49 +0000
@@ -1,12 +1,17 @@
1pulseaudio (1:0.9.23-0ubuntu2) UNRELEASED; urgency=low1pulseaudio (1:0.9.23-0ubuntu2) UNRELEASED; urgency=low
22
3 [ Daniel T Chen ]
3 * Add the following patches backported from upstream git:4 * Add the following patches backported from upstream git:
4 - aa7bc32 (parecord: Automatically detect file format from extension)5 - aa7bc32 (parecord: Automatically detect file format from extension)
5 [series patch 0208]6 [series patch 0208]
6 - 226ddb1 (alsa-sink: fix mmap_write() work_done) [series patch 0209]7 - 226ddb1 (alsa-sink: fix mmap_write() work_done) [series patch 0209]
7 * Update debian/copyright to cover echo-cancel files.8 * Update debian/copyright to cover echo-cancel files.
89
9 -- Daniel T Chen <crimsun@ubuntu.com> Tue, 28 Jun 2011 19:59:08 -060010 [ Michael Terry ]
11 * 0016-nodisplay-autostart.patch:
12 - Don't show in "Startup Applications" (LP: #803917)
13
14 -- Michael Terry <mterry@ubuntu.com> Fri, 01 Jul 2011 12:56:15 +0100
1015
11pulseaudio (1:0.9.23-0ubuntu1) oneiric; urgency=low16pulseaudio (1:0.9.23-0ubuntu1) oneiric; urgency=low
1217
1318
=== added file 'debian/patches/0016-nodisplay-autostart.patch'
--- debian/patches/0016-nodisplay-autostart.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/0016-nodisplay-autostart.patch 2011-07-01 12:02:49 +0000
@@ -0,0 +1,14 @@
1Description: Clean up Startup Applications dialog by hiding default apps
2Author: Michael Terry <michael.terry@canonical.com>
3Bug-Ubuntu: https://launchpad.net/bugs/803917
4Forwarded: not-needed
5
6Index: pulseaudio/src/daemon/pulseaudio.desktop.in
7===================================================================
8--- pulseaudio.orig/src/daemon/pulseaudio.desktop.in 2011-07-01 12:54:23.961825964 +0100
9+++ pulseaudio/src/daemon/pulseaudio.desktop.in 2011-07-01 12:54:53.437826276 +0100
10@@ -10,3 +10,4 @@
11 Categories=
12 GenericName=
13 X-GNOME-Autostart-Delay=8
14+NoDisplay=true
015
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-06-29 02:31:18 +0000
+++ debian/patches/series 2011-07-01 12:02:49 +0000
@@ -15,6 +15,7 @@
150013-Load-RAOP-Zeroconf-by-default.patch150013-Load-RAOP-Zeroconf-by-default.patch
160014-alsa-mixer-Add-separate-profile-for-Nvidia.patch160014-alsa-mixer-Add-separate-profile-for-Nvidia.patch
170015-alsa-mixer-Add-workaround-for-some-USB-headsets.patch170015-alsa-mixer-Add-workaround-for-some-USB-headsets.patch
180016-nodisplay-autostart.patch
1819
19# Patches from upstream/patches that need to be sent upstream20# Patches from upstream/patches that need to be sent upstream
200200-gold.patch210200-gold.patch

Subscribers

People subscribed via source and target branches