Merge lp://staging/~jbicha/onboard/fixes-from-debian into lp://staging/onboard
| Status: | Merged |
|---|---|
| Merged at revision: | 2159 |
| Proposed branch: | lp://staging/~jbicha/onboard/fixes-from-debian |
| Merge into: | lp://staging/onboard |
| Diff against target: |
43 lines (+2/-8) 3 files modified
data/onboard-settings.desktop.in (+0/-3) data/onboard.desktop.in (+1/-4) gnome/Onboard_Indicator@onboard.org/metadata.json (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~jbicha/onboard/fixes-from-debian |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| marmuta | Approve | ||
|
Review via email:
|
|||
Description of the change
I thought it would be simpler to use one merge proposal instead of two.
The onboard extension appears to work with GNOME Shell 3.20. I didn't test with 3.22 (still in Alpha) but I think it's better to assume the extension will work and fix bugs if it doesn't. Otherwise, the package will need to be patched once people start using GNOME Shell or else the extension won't work since GNOME Shell strictly honors the shell-version field.
Since onboard works with a variety of desktop including at least GNOME Shell, Unity, MATE, Xfce, we probably shouldn't mention just GNOME in the comment field of the .desktop. This is inspired by a Debian patch (since onboard is in Debian now).
Since NoDisplay=false is the default, there's no reason to state it explicitly.
Merged it. Thanks again, Jeremy.