Merge lp:~jbicha/landscape-client/dont-show-in-gnome-system-settings into lp:~landscape/landscape-client/trunk

[Jeremy Bícha]

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. Landscape Management (if installed) will still be accessible from GNOME Shell's Activities Overview (their version of Unity's Dash).

And here's the freedesktop standard for Keywords:
http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html#key-keywords

[Jeremy Bícha (jbicha)]

Whoever packages landscape-client, please update debian/landscape-client-ui-install.install to install the new .desktop also. I didn't touch the debian/ directory for this merge proposal as it looks like it's out of date compared to what is actually in the Ubuntu archives.

[David Britton (dpb)]

On 11/09/2012 09:01 AM, Jeremy Bicha wrote:
> Whoever packages landscape-client, please update debian/landscape-client-ui-install.install to install the new .desktop also. I didn't touch the debian/ directory for this merge proposal as it looks like it's out of date compared to what is actually in the Ubuntu archives.
>

landscape-client is a part of two recipes. Both describe it as simply
being:

   # bzr-builder format 0.3 deb-version {debupstream}+bzr{revno}-0ubuntu0
   lp:landscape-client

No packaging branch, etc.

There is some version number manipulation that happens when it
eventually gets pushed into ubuntu, but the debian dir in trunk is the
right place to modify things.

Also, please file a bug for this MP and link them together.

--
David Britton <email address hidden>

[Jeremy Bícha (jbicha)]

> landscape-client is a part of two recipes. Both describe it as simply
> being:
>
> # bzr-builder format 0.3 deb-version {debupstream}+bzr{revno}-0ubuntu0
> lp:landscape-client
>
> No packaging branch, etc.
>
> There is some version number manipulation that happens when it
> eventually gets pushed into ubuntu, but the debian dir in trunk is the
> right place to modify things.

Ok, could you explain why debian/changelog in lp:landscape-client is so dramatically different than what apt-get changelog gives me?

[lp:~jbicha/landscape-client/dont-show-in-gnome-system-settings]

587. By Jeremy Bícha on 2012-11-09

Don't show Landscape in System Settings when running GNOME
Also, Keywords is now a freedesktop standard so update the syntax and
make them translatable

[Andreas Hasenack (ahasenack)]

The changelog in the ubuntu archive is the right one, as is the whole debian/ structure. What we have in lp:landscape-client is for trunk development builds.

[Dean Henrichsmeyer (dean)]

The Landscape service is for Ubuntu. The usefulness of Landscape is the same whether you run Unity, GNOME, or no graphical environment at all. That being said, there's no reason to hide it when GNOME is run.

review: Disapprove

[Jeremy Bícha (jbicha)]

Dean, maybe you misunderstood what this merge proposal does.

Ubuntu has hacked System Settings to show extra panels that the GNOME developers explicitly don't want. The Ubuntu GNOME Remix wants to ship System Settings without those hacks. This merge proposal will continue to show Landscape in the Activities Overview (GNOME Shell's version of the Dash) but not in System Settings when running GNOME.

Landscape isn't really integrated into System Settings any way, as pop-up windows don't fit with the design and aren't very user-friendly. And nobody hacked KDE to show Landscape in the KDE System Settings app.

[Jeremy Bícha (jbicha)]

For Raring, my patches were accepted to move Software Sources and Ubuntu One out of System Settings when run in GNOME. Landscape is the only hold-out.

Two exceptions are Backup & Privacy which integrate into System Settings unlike Landscape (bug #962980). Privacy in particular is getting added to System Settings 3.8 (although it currently is tracker-specific and not written for zeitgeist or Unity). Backup should be part of core GNOME.

Unmerged revisions

587. By Jeremy Bícha on 2012-11-09

Don't show Landscape in System Settings when running GNOME
Also, Keywords is now a freedesktop standard so update the syntax and
make them translatable

=== added file 'applications/landscape-client-settings-gnome.desktop.in'
--- applications/landscape-client-settings-gnome.desktop.in	1970-01-01 00:00:00 +0000
+++ applications/landscape-client-settings-gnome.desktop.in	2012-11-09 22:37:22 +0000
@@ -0,0 +1,16 @@
+[Desktop Entry]
+_Name=Landscape Service
+_Comment=Landscape Management Service Preferences
+Exec=landscape-client-ui-install
+Icon=preferences-management-service
+Terminal=False
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Component=sample
+X-GNOME-Bugzilla-Version=1.0.0
+_Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;
+X-Ubuntu-Gettext-Domain=landscape-client

=== modified file 'applications/landscape-client-settings.desktop.in' (properties changed: +x to -x)
--- applications/landscape-client-settings.desktop.in	2012-08-27 15:35:05 +0000
+++ applications/landscape-client-settings.desktop.in	2012-11-09 22:37:22 +0000
@@ -7,11 +7,11 @@
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
-OnlyShowIn=GNOME;Unity;
+OnlyShowIn=Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=sample
 X-GNOME-Bugzilla-Version=1.0.0
 X-GNOME-Settings-Panel=sample
-X-GNOME-Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;
+_Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;
 X-Ubuntu-Gettext-Domain=landscape-client

=== modified file 'debian/landscape-client-ui-install.install'
--- debian/landscape-client-ui-install.install	2012-03-22 18:43:44 +0000
+++ debian/landscape-client-ui-install.install	2012-11-09 22:37:22 +0000
@@ -1,4 +1,5 @@
 usr/bin/landscape-client-ui-install
 usr/share/applications/landscape-client-settings.desktop
+usr/share/applications/landscape-client-settings-gnome.desktop
 usr/share/icons/hicolor/scalable/apps/preferences-management-service.svg
 usr/share/locale

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-03-23 10:04:18 +0000
+++ po/POTFILES.in	2012-11-09 22:37:22 +0000
@@ -4,5 +4,6 @@
 landscape/ui/view/configuration.py
 landscape/ui/view/ui/landscape-client-settings.glade
 applications/landscape-client-settings.desktop.in
+applications/landscape-client-settings-gnome.desktop.in
 polkit-1/com.canonical.LandscapeClientSettings.policy.in
 scripts/landscape-client-ui-install

=== modified file 'setup.cfg'
--- setup.cfg	2012-03-27 08:30:15 +0000
+++ setup.cfg	2012-11-09 22:37:22 +0000
@@ -4,6 +4,7 @@
 [build_i18n]
 domain=landscape-client
 xml_files=[("share/polkit-1/actions/", ["polkit-1/com.canonical.LandscapeClientSettings.policy.in"])]
-desktop_files=[("share/applications", ["applications/landscape-client-settings.desktop.in"])]
+desktop_files=[("share/applications", ["applications/landscape-client-settings.desktop.in"]),
+               ("share/applications", ["applications/landscape-client-settings-gnome.desktop.in"])]
 merge_po=True