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

[Mohamed Amine Ilidrissi]

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

[lp:~ilidrissi.amine/software-properties/hide-desktop-file]

622. By Mohamed Amine Ilidrissi on 2010-09-07

merge with trunk.

623. By Mohamed Amine Ilidrissi on 2010-09-07

data/software-properties-gtk.desktop.in: desktop file is now really
hidden (LP: #624072)

Unmerged revisions

=== modified file 'data/software-properties-gtk.desktop.in'
--- data/software-properties-gtk.desktop.in	2010-03-26 10:43:16 +0000
+++ data/software-properties-gtk.desktop.in	2010-08-25 17:41:41 +0000
@@ -5,6 +5,7 @@
 Exec=gksu --desktop /usr/share/applications/software-properties-gtk.desktop /usr/bin/software-properties-gtk
 Icon=software-properties
 Terminal=false
+NoDisplay=True
 X-MultipleArgs=false
 Type=Application
 Categories=System;Settings;

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-23 08:29:41 +0000
+++ debian/changelog	2010-08-25 17:41:41 +0000
@@ -7,7 +7,11 @@
   * po/pt_BR.po:
     - updated, thanks to Sergio Cipolla 
 
- -- Amicahi Rothman <[e-mail]>  Sat, 21 Aug 2010 14:02:22 -0400
+  [ Mohamed Amine IL Idrissi ]
+  * data/software-properties-gtk.desktop.in: Menu entry is now hidden
+    (LP: #624072)
+
+ -- Mohamed Amine IL Idrissi <[e-mail]>  Wed, 25 Aug 2010 17:32:46 +0000
 
 software-properties (0.76) maverick; urgency=low