Software Properties

Merge lp:~ilidrissi.amine/software-properties/hide-desktop-file into lp:software-properties

Proposed by Mohamed Amine Ilidrissi on 2010-09-07

Status:	Merged
Merged at revision:	628
Proposed branch:	lp:~ilidrissi.amine/software-properties/hide-desktop-file
Merge into:	lp:software-properties
Diff against target:	27 lines (+8/-1) 2 files modified data/software-properties-gtk.desktop.in (+1/-1) debian/changelog (+7/-0)
To merge this branch:	bzr merge lp:~ilidrissi.amine/software-properties/hide-desktop-file
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Vogt		2010-09-07	Pending
Review via email: mp+34740@code.launchpad.net

This proposal supersedes a proposal from 2010-08-25.

This hides the GNOME desktop menu entry (see related bug).

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

to status/vote changes:

1	=== modified file 'data/software-properties-gtk.desktop.in'
2	--- data/software-properties-gtk.desktop.in 2010-08-25 17:33:52 +0000
3	+++ data/software-properties-gtk.desktop.in 2010-09-07 11:39:43 +0000
4	@@ -5,7 +5,7 @@
5	Exec=gksu --desktop /usr/share/applications/software-properties-gtk.desktop /usr/bin/software-properties-gtk
6	Icon=software-properties
7	Terminal=false
8	-NoDisplay=True
9	+NoDisplay=true
10	X-MultipleArgs=false
11	Type=Application
12	Categories=System;Settings;
13
14	=== modified file 'debian/changelog'
15	--- debian/changelog 2010-09-06 16:27:00 +0000
16	+++ debian/changelog 2010-09-07 11:39:43 +0000
17	@@ -1,3 +1,10 @@
18	+software-properties (0.76.5) UNRELEASED; urgency=low
19	+
20	+ * data/software-properties-gtk.desktop.in: desktop file is now really
21	+ hidden (LP: #624072)
22	+
23	+ -- Mohamed Amine IL Idrissi <ilidrissiamine@gmail.com> Tue, 07 Sep 2010 11:36:11 +0000
24	+
25	software-properties (0.76.4) maverick; urgency=low
26
27	* Add release upgrade option to KDE UI to select between LTS and