Application Indicators

Merge lp:~ted/indicator-application/lp1411959-xfce-autostart into lp:indicator-application/15.04

  1. lp1411959-xfce-autostart
  2. Merge into trunk.15.04
Proposed by Ted Gould
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 254
Merged at revision: 253
Proposed branch: lp:~ted/indicator-application/lp1411959-xfce-autostart
Merge into: lp:indicator-application/15.04
Diff against target: 33 lines (+3/-3)
3 files modified
data/indicator-application.desktop.in (+1/-1)
data/upstart/indicator-application.desktop.in (+1/-1)
m4/gcov.m4 (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-application/lp1411959-xfce-autostart
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+247051@code.launchpad.net

Commit message

Remove XFCE from the OnlyShowIn list

Description of the change

Per the request on the bug

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-application-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-application-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-application-ci/17/rebuild

review: Needs Fixing (continuous-integration)
lp:~ted/indicator-application/lp1411959-xfce-autostart updated
254. By Ted Gould

Update gcov.m4

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-application-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-application-ci/18/rebuild

review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

clean and simple.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-application.desktop.in'
2--- data/indicator-application.desktop.in 2014-02-26 16:32:16 +0000
3+++ data/indicator-application.desktop.in 2015-01-27 14:04:35 +0000
4@@ -4,5 +4,5 @@
5 Exec=@pkglibexecdir@/indicator-application-service
6 StartupNotify=false
7 Terminal=false
8-OnlyShowIn=Unity;XFCE;GNOME;
9+OnlyShowIn=Unity;GNOME;
10 AutostartCondition=GNOME3 unless-session gnome
11
12=== modified file 'data/upstart/indicator-application.desktop.in'
13--- data/upstart/indicator-application.desktop.in 2014-02-20 03:31:05 +0000
14+++ data/upstart/indicator-application.desktop.in 2015-01-27 14:04:35 +0000
15@@ -4,5 +4,5 @@
16 Exec=@pkglibexecdir@/indicator-application-service
17 StartupNotify=false
18 Terminal=false
19-OnlyShowIn=Unity;XFCE;
20+OnlyShowIn=Unity;
21 Hidden=true
22
23=== modified file 'm4/gcov.m4'
24--- m4/gcov.m4 2014-01-17 10:59:18 +0000
25+++ m4/gcov.m4 2015-01-27 14:04:35 +0000
26@@ -30,7 +30,7 @@
27 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
28 fi
29
30- lcov_version_list="1.6 1.7 1.8 1.9 1.10"
31+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
32 AC_CHECK_PROG(LCOV, lcov, lcov)
33 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
34

Subscribers

People subscribed via source and target branches