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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-29 02:31:18 +0000
3+++ debian/changelog 2011-07-01 12:02:49 +0000
4@@ -1,12 +1,17 @@
5 pulseaudio (1:0.9.23-0ubuntu2) UNRELEASED; urgency=low
6
7+ [ Daniel T Chen ]
8 * Add the following patches backported from upstream git:
9 - aa7bc32 (parecord: Automatically detect file format from extension)
10 [series patch 0208]
11 - 226ddb1 (alsa-sink: fix mmap_write() work_done) [series patch 0209]
12 * Update debian/copyright to cover echo-cancel files.
13
14- -- Daniel T Chen <crimsun@ubuntu.com> Tue, 28 Jun 2011 19:59:08 -0600
15+ [ Michael Terry ]
16+ * 0016-nodisplay-autostart.patch:
17+ - Don't show in "Startup Applications" (LP: #803917)
18+
19+ -- Michael Terry <mterry@ubuntu.com> Fri, 01 Jul 2011 12:56:15 +0100
20
21 pulseaudio (1:0.9.23-0ubuntu1) oneiric; urgency=low
22
23
24=== added file 'debian/patches/0016-nodisplay-autostart.patch'
25--- debian/patches/0016-nodisplay-autostart.patch 1970-01-01 00:00:00 +0000
26+++ debian/patches/0016-nodisplay-autostart.patch 2011-07-01 12:02:49 +0000
27@@ -0,0 +1,14 @@
28+Description: Clean up Startup Applications dialog by hiding default apps
29+Author: Michael Terry <michael.terry@canonical.com>
30+Bug-Ubuntu: https://launchpad.net/bugs/803917
31+Forwarded: not-needed
32+
33+Index: pulseaudio/src/daemon/pulseaudio.desktop.in
34+===================================================================
35+--- pulseaudio.orig/src/daemon/pulseaudio.desktop.in 2011-07-01 12:54:23.961825964 +0100
36++++ pulseaudio/src/daemon/pulseaudio.desktop.in 2011-07-01 12:54:53.437826276 +0100
37+@@ -10,3 +10,4 @@
38+ Categories=
39+ GenericName=
40+ X-GNOME-Autostart-Delay=8
41++NoDisplay=true
42
43=== modified file 'debian/patches/series'
44--- debian/patches/series 2011-06-29 02:31:18 +0000
45+++ debian/patches/series 2011-07-01 12:02:49 +0000
46@@ -15,6 +15,7 @@
47 0013-Load-RAOP-Zeroconf-by-default.patch
48 0014-alsa-mixer-Add-separate-profile-for-Nvidia.patch
49 0015-alsa-mixer-Add-workaround-for-some-USB-headsets.patch
50+0016-nodisplay-autostart.patch
51
52 # Patches from upstream/patches that need to be sent upstream
53 0200-gold.patch

Subscribers

People subscribed via source and target branches