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

[Michael Terry]

See bug https://launchpad.net/bugs/803917

[David Henningsson (diwic)]

@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)]

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

=== 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 @@
 pulseaudio (1:0.9.23-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Daniel T Chen ]
   * Add the following patches backported from upstream git:
     - aa7bc32 (parecord: Automatically detect file format from extension)
       [series patch 0208]
     - 226ddb1 (alsa-sink: fix mmap_write() work_done) [series patch 0209]
   * Update debian/copyright to cover echo-cancel files.
 
- -- Daniel T Chen <[e-mail]>  Tue, 28 Jun 2011 19:59:08 -0600
+  [ Michael Terry ]
+  * 0016-nodisplay-autostart.patch:
+    - Don't show in "Startup Applications" (LP: #803917)
+
+ -- Michael Terry <[e-mail]>  Fri, 01 Jul 2011 12:56:15 +0100
 
 pulseaudio (1:0.9.23-0ubuntu1) oneiric; urgency=low
 
 
=== 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 @@
+Description: Clean up Startup Applications dialog by hiding default apps
+Author: Michael Terry <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/803917
+Forwarded: not-needed
+
+Index: pulseaudio/src/daemon/pulseaudio.desktop.in
+===================================================================
+--- pulseaudio.orig/src/daemon/pulseaudio.desktop.in	2011-07-01 12:54:23.961825964 +0100
++++ pulseaudio/src/daemon/pulseaudio.desktop.in	2011-07-01 12:54:53.437826276 +0100
+@@ -10,3 +10,4 @@
+ Categories=
+ GenericName=
+ X-GNOME-Autostart-Delay=8
++NoDisplay=true
 
=== 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 @@
 0013-Load-RAOP-Zeroconf-by-default.patch
 0014-alsa-mixer-Add-separate-profile-for-Nvidia.patch
 0015-alsa-mixer-Add-workaround-for-some-USB-headsets.patch
+0016-nodisplay-autostart.patch
 
 # Patches from upstream/patches that need to be sent upstream
 0200-gold.patch