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
=== 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 @@
1zeitgeist-datahub (0.7.0-0ubuntu2) oneiric; urgency=low
2
3 * debian/patches/nodisplay_autostart.patch:
4 - Don't show in "Startup Applications" (LP: #803917)
5
6 -- Michael Terry <mterry@ubuntu.com> Fri, 01 Jul 2011 14:30:07 +0100
7
1zeitgeist-datahub (0.7.0-0ubuntu1) natty; urgency=low8zeitgeist-datahub (0.7.0-0ubuntu1) natty; urgency=low
29
3 * Initial packaging, taken from Debian (LP: #735594).10 * Initial packaging, taken from Debian (LP: #735594).
411
=== 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 @@
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: zeitgeist-datahub/src/zeitgeist-datahub.desktop.in
7===================================================================
8--- zeitgeist-datahub.orig/src/zeitgeist-datahub.desktop.in 2011-07-01 14:29:07.390751086 +0100
9+++ zeitgeist-datahub/src/zeitgeist-datahub.desktop.in 2011-07-01 14:29:17.110751189 +0100
10@@ -8,3 +8,4 @@
11 Type=Application
12 Categories=
13 GenericName=
14+NoDisplay=true
015
=== 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 @@
1nodisplay_autostart.patch

Subscribers

People subscribed via source and target branches