The Sound Menu

Merge lp:~dobey/indicator-sound/no-more-autostart into lp:indicator-sound

  1. no-more-autostart
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 546
Merged at revision: 546
Proposed branch: lp:~dobey/indicator-sound/no-more-autostart
Merge into: lp:indicator-sound
Diff against target: 85 lines (+1/-59)
4 files modified
data/CMakeLists.txt (+0/-41)
data/indicator-sound.desktop.in (+0/-9)
data/indicator-sound.upstart.desktop.in (+0/-9)
debian/indicator-sound.maintscript (+1/-0)
To merge this branch: bzr merge lp:~dobey/indicator-sound/no-more-autostart
Reviewer Review Type Date Requested Status
Xavi Garcia Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+316503@code.launchpad.net

Commit message

Remove old autostart files.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:546
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1610/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1617
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1395/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1395/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1395/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1395/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1395/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1395/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/6/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:546
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1613/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1620
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1398/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1398/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1398/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1398/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1398/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1398/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

Looks like something weird is causing integration tests to fail in Jenkins. I'm not sure if this indicator ever passed those tests in Jenkins, at this point though. The tests pass locally, but there does appear to be some flakiness as I get a single failure out of maybe 30 runs or so.

Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2016-12-07 16:52:01 +0000
+++ data/CMakeLists.txt 2017-02-06 20:31:26 +0000
@@ -69,47 +69,6 @@
69)69)
7070
71###########################71###########################
72# XDG Autostart
73###########################
74
75set(
76 INDICATOR_SOUND_XDG_AUTOSTART
77 "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
78)
79
80configure_file(
81 "indicator-sound.desktop.in"
82 ${INDICATOR_SOUND_XDG_AUTOSTART}
83 @ONLY
84)
85
86install(
87 FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
88 DESTINATION "/etc/xdg/autostart"
89)
90
91###########################
92# Upstart XDG Autostart Override
93###########################
94
95set(
96 INDICATOR_SOUND_UPSTART_XDG_AUTOSTART
97 "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.upstart.desktop"
98)
99
100configure_file(
101 "indicator-sound.upstart.desktop.in"
102 ${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}
103 @ONLY
104)
105
106install(
107 FILES "${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}"
108 DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/xdg/autostart"
109 RENAME "indicator-sound.desktop"
110)
111
112###########################
113# GSettings72# GSettings
114###########################73###########################
11574
11675
=== removed file 'data/indicator-sound.desktop.in'
--- data/indicator-sound.desktop.in 2015-01-20 17:23:31 +0000
+++ data/indicator-sound.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Sound
4Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
5OnlyShowIn=Unity;GNOME;Pantheon;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9AutostartCondition=GNOME3 unless-session gnome
100
=== removed file 'data/indicator-sound.upstart.desktop.in'
--- data/indicator-sound.upstart.desktop.in 2015-01-20 17:23:31 +0000
+++ data/indicator-sound.upstart.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Sound
4Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
5OnlyShowIn=Unity;Pantheon;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9Hidden=true
100
=== added file 'debian/indicator-sound.maintscript'
--- debian/indicator-sound.maintscript 1970-01-01 00:00:00 +0000
+++ debian/indicator-sound.maintscript 2017-02-06 20:31:26 +0000
@@ -0,0 +1,1 @@
1rm_conffile /etc/xdg/autostart/indicator-sound.desktop 0replaceme~

Subscribers

People subscribed via source and target branches