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

Proposed by Michael Terry on 2011-07-01
Status: Merged
Merged at revision: 11
Proposed branch: lp:~mterry/zeitgeist-datahub/nodisplay-autostart
Merge into: lp:~zeitgeist-packagers/zeitgeist-datahub/ubuntu
Diff against target: 40 lines (+22/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/nodisplay_autostart.patch (+14/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~mterry/zeitgeist-datahub/nodisplay-autostart
Reviewer Review Type Date Requested Status
Zeitgeist Debian/Ubuntu Packagers 2011-07-01 Pending
Review via email: mp+66605@code.launchpad.net
To post a comment you must log in.

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-03-16 12:17:32 +0000
3+++ debian/changelog 2011-07-01 13:33:49 +0000
4@@ -1,3 +1,10 @@
5+zeitgeist-datahub (0.7.0-0ubuntu2) oneiric; urgency=low
6+
7+ * debian/patches/nodisplay_autostart.patch:
8+ - Don't show in "Startup Applications" (LP: #803917)
9+
10+ -- Michael Terry <mterry@ubuntu.com> Fri, 01 Jul 2011 14:30:07 +0100
11+
12 zeitgeist-datahub (0.7.0-0ubuntu1) natty; urgency=low
13
14 * Initial packaging, taken from Debian (LP: #735594).
15
16=== added directory 'debian/patches'
17=== added file 'debian/patches/nodisplay_autostart.patch'
18--- debian/patches/nodisplay_autostart.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/nodisplay_autostart.patch 2011-07-01 13:33:49 +0000
20@@ -0,0 +1,14 @@
21+Description: Clean up Startup Applications dialog by hiding default apps
22+Author: Michael Terry <michael.terry@canonical.com>
23+Bug-Ubuntu: https://launchpad.net/bugs/803917
24+Forwarded: not-needed
25+
26+Index: zeitgeist-datahub/src/zeitgeist-datahub.desktop.in
27+===================================================================
28+--- zeitgeist-datahub.orig/src/zeitgeist-datahub.desktop.in 2011-07-01 14:29:07.390751086 +0100
29++++ zeitgeist-datahub/src/zeitgeist-datahub.desktop.in 2011-07-01 14:29:17.110751189 +0100
30+@@ -8,3 +8,4 @@
31+ Type=Application
32+ Categories=
33+ GenericName=
34++NoDisplay=true
35
36=== added file 'debian/patches/series'
37--- debian/patches/series 1970-01-01 00:00:00 +0000
38+++ debian/patches/series 2011-07-01 13:33:49 +0000
39@@ -0,0 +1,1 @@
40+nodisplay_autostart.patch

Subscribers

People subscribed via source and target branches