Merge lp:~jbicha/software-properties/dont-show-in-gnome-system-settings into lp:software-properties

Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 819
Proposed branch: lp:~jbicha/software-properties/dont-show-in-gnome-system-settings
Merge into: lp:software-properties
Diff against target: 67 lines (+24/-0)
5 files modified
data/software-properties-gnome.desktop.in (+14/-0)
data/software-properties-gtk.desktop.in (+1/-0)
debian/changelog (+7/-0)
debian/software-properties-gtk.install (+1/-0)
setup.cfg (+1/-0)
To merge this branch: bzr merge lp:~jbicha/software-properties/dont-show-in-gnome-system-settings
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+133396@code.launchpad.net

Description of the change

For the Ubuntu GNOME Remix, we want to showcase a pure GNOME experience on Ubuntu. We'd like to hide the extra System Settings panels Ubuntu has hacked on. Software Sources will still be accessible from GNOME Shell's Activities Overview (their version of Unity's Dash).

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looked good, merged in, uploading

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/software-properties-gnome.desktop.in'
2--- data/software-properties-gnome.desktop.in 1970-01-01 00:00:00 +0000
3+++ data/software-properties-gnome.desktop.in 2012-11-08 03:29:31 +0000
4@@ -0,0 +1,14 @@
5+[Desktop Entry]
6+_Name=Software Sources
7+_GenericName=Software Sources
8+_Comment=Configure the sources for installable software and updates
9+Exec=software-properties-gtk
10+Icon=software-properties
11+Terminal=false
12+X-MultipleArgs=false
13+Type=Application
14+OnlyShowIn=GNOME;
15+Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;
16+MimeType=text/x-apt-sources-list;
17+X-KDE-SubstituteUID=true
18+X-Ubuntu-Gettext-Domain=software-properties
19
20=== modified file 'data/software-properties-gtk.desktop.in'
21--- data/software-properties-gtk.desktop.in 2012-07-18 13:12:13 +0000
22+++ data/software-properties-gtk.desktop.in 2012-11-08 03:29:31 +0000
23@@ -7,6 +7,7 @@
24 Terminal=false
25 X-MultipleArgs=false
26 Type=Application
27+NotShowIn=GNOME;
28 Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
29 X-GNOME-Settings-Panel=software-properties
30 MimeType=text/x-apt-sources-list;
31
32=== modified file 'debian/changelog'
33--- debian/changelog 2012-11-01 10:08:42 +0000
34+++ debian/changelog 2012-11-08 03:29:31 +0000
35@@ -1,3 +1,10 @@
36+software-properties (0.92.12) UNRELEASED; urgency=low
37+
38+ * Add software-properties-gnome.desktop.in to keep Software Sources
39+ from showing in System Settings on GNOME
40+
41+ -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 07 Nov 2012 22:13:18 -0500
42+
43 software-properties (0.92.11) raring; urgency=low
44
45 * Force the python3 shebang to /usr/bin/python3.
46
47=== modified file 'debian/software-properties-gtk.install'
48--- debian/software-properties-gtk.install 2012-06-21 21:49:48 +0000
49+++ debian/software-properties-gtk.install 2012-11-08 03:29:31 +0000
50@@ -4,4 +4,5 @@
51 debian/tmp/usr/share/mime/packages
52 debian/tmp/usr/share/icons
53 debian/tmp/usr/share/applications/software-properties-gtk.desktop
54+debian/tmp/usr/share/applications/software-properties-gnome.desktop
55 #debian/tmp/usr/share/gnome/help/software-properties
56
57=== modified file 'setup.cfg'
58--- setup.cfg 2011-07-11 10:48:09 +0000
59+++ setup.cfg 2012-11-08 03:29:31 +0000
60@@ -3,6 +3,7 @@
61 domain=software-properties
62 desktop_files=[("share/applications",
63 ("data/software-properties-gtk.desktop.in",
64+ "data/software-properties-gnome.desktop.in",
65 "data/software-properties-kde.desktop.in",),
66 )
67 ]

Subscribers

People subscribed via source and target branches

to status/vote changes: