lp:~ted/ubuntu-app-launch/xmir-support

Branch merges

Merged into lp:ubuntu-app-launch/15.10 at revision 205

Christopher Townsend: Approve on 2015-08-13

Charles Kerr (community): Approve on 2015-08-11

PS Jenkins bot: Approve (continuous-integration) on 2015-08-11

Diff: 795 lines (+445/-171)

20 files modified

CMakeLists.txt (+11/-1)
exec-line-exec-trace.tp (+6/-0)
exec-line-exec.c (+14/-0)
libubuntu-app-launch/click-exec.c (+8/-0)
libubuntu-app-launch/desktop-exec.c (+8/-0)
tests/CMakeLists.txt (+6/-0)
tests/applications/noxmir.desktop (+8/-0)
tests/applications/xmir.desktop (+8/-0)
tests/click-app-dir/.click/info/com.test.mir.manifest (+11/-0)
tests/click-app-dir/noxmir.desktop (+8/-0)
tests/click-app-dir/xmir.desktop (+8/-0)
tests/exec-util-test.cc (+178/-170)
tests/link-farm/com.test.mir_mir_1.desktop (+1/-0)
tests/link-farm/com.test.mir_nomir_1.desktop (+1/-0)
tests/xmir-helper-exec.sh (+3/-0)
tests/xmir-helper-test.in (+25/-0)
tests/xmir-mock.sh (+22/-0)
upstart-jobs/application-click.conf.in (+1/-0)
upstart-jobs/application-legacy.conf.in (+1/-0)
xmir-helper.c (+117/-0)

api

Superseded for merging into lp:ubuntu-app-launch/15.04

Indicator Applet Developers: Pending requested 2015-04-22

Diff: 1717 lines (+1193/-77) (has conflicts)

29 files modified

CMakeLists.txt (+22/-2)
cmake/UseGdbusCodegen.cmake (+21/-20)
data/com.canonical.UbuntuAppLaunch.SocketDemangler.xml (+8/-0)
debian/changelog (+22/-0)
debian/control (+2/-1)
debian/libubuntu-app-launch2.symbols (+2/-0)
exec-line-exec-trace.tp (+6/-0)
exec-line-exec.c (+14/-0)
libubuntu-app-launch/CMakeLists.txt (+11/-3)
libubuntu-app-launch/click-exec.c (+8/-0)
libubuntu-app-launch/desktop-exec.c (+8/-0)
libubuntu-app-launch/ubuntu-app-launch.c (+363/-6)
libubuntu-app-launch/ubuntu-app-launch.h (+43/-1)
libubuntu-app-launch/ubuntu-app-launch.pc.in (+1/-1)
socket-demangler.c (+124/-0)
tests/CMakeLists.txt (+15/-1)
tests/libual-test.cc (+197/-27)
tests/mir-mock.cpp (+106/-0)
tests/mir-mock.h (+12/-0)
tests/socket-tool.c (+28/-0)
tests/xmir-helper-exec.sh (+3/-0)
tests/xmir-helper-test.in (+25/-0)
tests/xmir-mock.sh (+27/-0)
ubuntu-app-test/CMakeLists.txt (+0/-8)
ubuntu-app-test/ubuntu-app-test (+0/-6)
upstart-jobs/application-click.conf.in (+3/-0)
upstart-jobs/application-legacy.conf.in (+3/-0)
xmir-helper.c (+118/-0)
zg-report-app.c (+1/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

141. By Ted Gould on 2015-08-17

Don't set a default value for XMIR_ENABLE

140. By Ted Gould on 2015-08-11

Remove std=c11

139. By Ted Gould on 2015-08-11

Mention varargs

138. By Ted Gould on 2015-08-11

Changing the click mir tests over

137. By Ted Gould on 2015-08-11

Porting some more cases

136. By Ted Gould on 2015-08-11

Refactor test into a helper function

135. By Ted Gould on 2015-08-06

Remove the -rootless flag

134. By Ted Gould on 2015-07-02

Adding a click test, with all the joy that brings

133. By Ted Gould on 2015-07-01

Desktop tests for setting the xmir values

132. By Ted Gould on 2015-07-01

Adding in rootless