Merge lp:~mterry/zeitgeist-datahub/nodisplay-autostart into lp:~zeitgeist-packagers/zeitgeist-datahub/ubuntu

[Michael Terry]

See https://bugs.launchpad.net/ubuntu/+source/zeitgeist-datahub/+bug/803917

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-16 12:17:32 +0000
+++ debian/changelog	2011-07-01 13:33:49 +0000
@@ -1,3 +1,10 @@
+zeitgeist-datahub (0.7.0-0ubuntu2) oneiric; urgency=low
+
+  * debian/patches/nodisplay_autostart.patch:
+    - Don't show in "Startup Applications" (LP: #803917)
+
+ -- Michael Terry <[e-mail]>  Fri, 01 Jul 2011 14:30:07 +0100
+
 zeitgeist-datahub (0.7.0-0ubuntu1) natty; urgency=low
 
   * Initial packaging, taken from Debian (LP: #735594).
 
=== added directory 'debian/patches'
=== added file 'debian/patches/nodisplay_autostart.patch'
--- debian/patches/nodisplay_autostart.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/nodisplay_autostart.patch	2011-07-01 13:33: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: zeitgeist-datahub/src/zeitgeist-datahub.desktop.in
+===================================================================
+--- zeitgeist-datahub.orig/src/zeitgeist-datahub.desktop.in	2011-07-01 14:29:07.390751086 +0100
++++ zeitgeist-datahub/src/zeitgeist-datahub.desktop.in	2011-07-01 14:29:17.110751189 +0100
+@@ -8,3 +8,4 @@
+ Type=Application
+ Categories=
+ GenericName=
++NoDisplay=true
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-07-01 13:33:49 +0000
@@ -0,0 +1,1 @@
+nodisplay_autostart.patch