Merge lp:~laney/ubuntu-terminal-app/notshowin-unity into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Iain Lane]

See https://bugs.launchpad.net/ubuntu/+bug/1626457/comments/1 for the rationale.

We should use OnlyShowIn=Unity8, but that is blocked by various bugs, see https://trello.com/c/RI6eK4OA/106-duplicate-terminal-applications-in-unity-7-session-fix-xdg-current-desktop-and-onlyshowin-handling

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Interestingly this fails click-review, if built as a click (which we do for the phone, although armhf, not amd64 as in the example below)...

Now executing: click-review ./com.ubuntu.terminal_0.7.217_amd64.click
Errors
------
 - desktop:validates:terminal
 did not validate: (ValidationError in file '/tmp/review-pp96fg9l/com.ubuntu.terminal.desktop':
- 'Unity7' is not a registered OnlyShowIn value )
 http://askubuntu.com/questions/417377/what-does-desktop-validates-mean/417378

[Iain Lane (laney)]

On Tue, Sep 27, 2016 at 11:08:32AM -0000, Alan Pope 🍺🐧🐱 wrote:
> Interestingly this fails click-review, if built as a click (which we do for the phone, although armhf, not amd64 as in the example below)...
>
> Now executing: click-review ./com.ubuntu.terminal_0.7.217_amd64.click
> Errors
> ------
> - desktop:validates:terminal
> did not validate: (ValidationError in file '/tmp/review-pp96fg9l/com.ubuntu.terminal.desktop':
> - 'Unity7' is not a registered OnlyShowIn value )
> http://askubuntu.com/questions/417377/what-does-desktop-validates-mean/417378

Sigh, desktop-file-validate has a whitelist of allowed names.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Iain Lane (laney)]

On Tue, Sep 27, 2016 at 11:24:25AM -0000, Iain Lane wrote:
> On Tue, Sep 27, 2016 at 11:08:32AM -0000, Alan Pope 🍺🐧🐱 wrote:
> > Interestingly this fails click-review, if built as a click (which we do for the phone, although armhf, not amd64 as in the example below)...
> >
> > Now executing: click-review ./com.ubuntu.terminal_0.7.217_amd64.click
> > Errors
> > ------
> > - desktop:validates:terminal
> > did not validate: (ValidationError in file '/tmp/review-pp96fg9l/com.ubuntu.terminal.desktop':
> > - 'Unity7' is not a registered OnlyShowIn value )
> > http://askubuntu.com/questions/417377/what-does-desktop-validates-mean/417378
>
> Sigh, desktop-file-validate has a whitelist of allowed names.

See https://bugs.freedesktop.org/show_bug.cgi?id=97947

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

=== modified file 'com.ubuntu.terminal.desktop.in.in'
--- com.ubuntu.terminal.desktop.in.in	2016-02-11 20:43:44 +0000
+++ com.ubuntu.terminal.desktop.in.in	2016-09-27 10:50:58 +0000
@@ -8,3 +8,4 @@
 X-Ubuntu-Touch=true
 X-Ubuntu-Default-Department-ID=accessories
 X-Ubuntu-Splash-Color=#111111
+NotShowIn=Unity7
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-09-19 00:44:11 +0000
+++ debian/changelog	2016-09-27 10:50:58 +0000
@@ -1,5 +1,6 @@
 ubuntu-terminal-app (0.7ubuntu1) UNRELEASED; urgency=medium
 
+  [ Luke Yelavich ]
   * Get packaging ready for inclusion in yakkety (LP: #1623845)
   * Update standards version
   * Fix up build dependency formatting
@@ -7,6 +8,11 @@
   * Update copyright
   * Update Vcs-bzr field
 
+  [ Iain Lane ]
+  * com.ubuntu.terminal.desktop.in.in: Add NotShowIn=Unity7 - we have
+    gnome-terminal there, and having two applications called "Terminal" will
+    be confusing.
+
  -- Luke Yelavich <[e-mail]>  Fri, 16 Sep 2016 09:04:28 +1000
 
 ubuntu-terminal-app (0.7) wily; urgency=medium