Merge lp:~etulfetulf/software-properties/software-properties-fix-916982 into lp:software-properties

[Greg A]

[Brian Murray (brian-murray)]

A deliberate change was made by the desktop team to hide software-properties-gtk as it can be accessed from update-manager and software-center. You can learn more about this change in the specification at https://blueprints.launchpad.net/ubuntu/+spec/desktop-p-control-center-cleanup and perhaps in the following diff http://launchpadlibrarian.net/89584324/software-properties_0.82_0.82.2.diff.gz.

For future reference, it would have been good to include a changelog entry, in debian/changelog, documenting the change you made and why. You can easily add a changelog entry using the command dch -i.

review: Disapprove

[Greg A (etulfetulf)]

I understand that the decision was made to remove Software Properties from System Settings (this is discussed in the blueprint).

However, this branch is about a separate matter: allowing Software Properties to appear in the Dash search (as discussed in Bug 916982).

For this reason, I would ask you to reconsider this merge.

review: Needs Resubmitting

Unmerged revisions

753. By Greg A on 2012-04-21

Add changelog entry

752. By Greg A on 2012-04-12

Allow Software Sources to show in Unity dash (LP: #916982)

=== modified file 'data/software-properties-gtk.desktop.in'
--- data/software-properties-gtk.desktop.in	2012-01-11 16:19:47 +0000
+++ data/software-properties-gtk.desktop.in	2012-04-12 15:47:43 +0000
@@ -5,7 +5,7 @@
 Exec=software-properties-gtk
 Icon=software-properties
 Terminal=false
-NoDisplay=true
+NoDisplay=false
 X-MultipleArgs=false
 Type=Application
 Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;