Merge lp:~ogra/ubuntu-touch-session/fix-dbus-location into lp:ubuntu-touch-session

Proposed by Oliver Grawert
Status: Merged
Approved by: Ricardo Mendoza
Approved revision: 224
Merged at revision: 224
Proposed branch: lp:~ogra/ubuntu-touch-session/fix-dbus-location
Merge into: lp:ubuntu-touch-session
Diff against target: 11 lines (+1/-4)
1 file modified
etc/profile.d/dbus-source.sh (+1/-4)
To merge this branch: bzr merge lp:~ogra/ubuntu-touch-session/fix-dbus-location
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+220064@code.launchpad.net

Commit message

'move to new dbus-session address handling in XDG_RUNTIME_DIR (LP: #1316978)

Description of the change

move to new dbus-session address handling in XDG_RUNTIME_DIR

To post a comment you must log in.
Revision history for this message
Oliver Grawert (ogra) wrote :
Revision history for this message
Oliver Grawert (ogra) wrote :

needs also http://paste.ubuntu.com/7488802/ to land at the same time

180. By Ricardo Salveti

ubuntu-touch-session: adding workaround for lack of scopes on x86
emulator

181. By Michael Terry

Enable split mode by depending on unity8-greeter and making relevant configuration changes, like enabling the spinner for USC.

182. By PS Jenkins bot

Releasing 0.108+14.10.20140529-0ubuntu1

183. By Ted Gould

Name change to ubuntu-app-launch

184. By PS Jenkins bot

Releasing 0.108+14.10.20140601-0ubuntu1

185. By Michael Terry

Don't run lightdm-session if using a Mir session.

186. By PS Jenkins bot

Releasing 0.108+14.10.20140604-0ubuntu1

187. By Michael Terry

Set up XDG_*_DIRS for sessions' convenience. This makes it easier to append directories, without providing the default values.

188. By PS Jenkins bot

Releasing 0.108+14.10.20140605-0ubuntu1

189. By Ricardo Mendoza

Platform API Config

190. By PS Jenkins bot

Releasing 0.108+14.10.20140610-0ubuntu1

191. By Michael Terry

Revert dependency on split greeter. This gives us back the integrated greeter for Touch images, to reduce the level of regressions we are seeing.

192. By PS Jenkins bot

Releasing 0.108+14.10.20140613-0ubuntu1

193. By Oliver Grawert

merge p:~cwayne18/ubuntu-touch-session/custom-xdg-config, add /custom/xdg/config into XDG_CONFIG_DIRS before init --user is started

194. By Oliver Grawert

merge: lp:~mterry/ubuntu-touch-session/boot-animation, enable a boot animation by default for Touch sessions

195. By Oliver Grawert

changelog update for teh last two merges

196. By Oliver Grawert

releasing package ubuntu-touch-session version 0.108+14.10.20140620-0ubuntu1

197. By Marc Deslauriers

* Added apparmor upstart override
  - debian/control: added depends on apparmor package that contains an
    upstart job
  - apparmor.override: since the lightdm override in this package no
    longer waits for runlevel events, we need to have an apparmor
    override to make sure policy is loaded before any session apps.

198. By Ricardo Salveti

* New rebuild forced
* Adding touch specific pulseaudio script file

199. By Ricardo Salveti

releasing package ubuntu-touch-session version 0.108+14.10.20140625-0ubuntu1

200. By Ricardo Salveti

Not yet enabling the pulseaudio touch specific script file

201. By Ricardo Salveti

releasing package ubuntu-touch-session version 0.108+14.10.20140625-0ubuntu2

202. By Ricardo Salveti

Adding generic android.conf and logic for bind mount

203. By Ricardo Salveti

releasing package ubuntu-touch-session version 0.108+14.10.20140625-0ubuntu3

204. By Ricardo Salveti

upstart-session/pulseaudio.conf: enabling touch specific pulse script file

205. By Ricardo Salveti

releasing package ubuntu-touch-session version 0.108+14.10.20140625-0ubuntu4

206. By Alberto Aguirre

Remove usc-wrapper power-off-delay argument

207. By PS Jenkins bot

Releasing 0.108+14.10.20140627-0ubuntu1

208. By Chris Wayne

Setup XDG_DATA_DIRS in lightdm upstart job, so that we can have custom boot animation
Approved by: Michael Terry, Oliver Grawert

209. By PS Jenkins bot

Releasing 0.108+14.10.20140714-0ubuntu1

210. By Ricardo Salveti

Updating pulse script file to support HSP devices

211. By Ricardo Salveti

releasing package ubuntu-touch-session version 0.108+14.10.20140714-0ubuntu2

212. By Michael Terry

Add a pam-config file to configure PAM the way that Touch likes it (with an entry for pam_extrausers with low security options). We previously just manually edited the file, but this way will work better with apt-get upgrade. Fixes: 1348637
Approved by: Steve Langasek

213. By PS Jenkins bot

Releasing 0.108+14.10.20140813.1-0ubuntu1

214. By Alberto Aguirre

Enable use of h/w overlays by unity-system-compositor if available
Approved by: Ricardo Salveti, Ricardo Mendoza

215. By PS Jenkins bot

Releasing 0.108+14.10.20140818-0ubuntu1

216. By Ricardo Salveti

touch.pa: dropping restore for formats and ports and enable voicecall volume control when in voicecall mode

217. By PS Jenkins bot

Releasing 0.108+14.10.20140819-0ubuntu1

218. By Alberto Aguirre

Disable the use of h/w overlays by unity-system-compositor
Approved by: kevin gunn, Oliver Grawert

219. By PS Jenkins bot

Releasing 0.108+14.10.20140826-0ubuntu1

220. By Ricardo Salveti

touch.pa: enabling cork and ducking

Approved by: Jim Hodapp

221. By PS Jenkins bot

Releasing 0.108+14.10.20140904-0ubuntu1

222. By kevin gunn

enable mir use of overlays
Approved by: Alberto Aguirre, Kevin DuBois

223. By PS Jenkins bot

Releasing 0.108+14.10.20140909.1-0ubuntu1

224. By Oliver Grawert

move to new dbus-session address handling in XDG_RUNTIME_DIR (LP: #1316978)

Revision history for this message
Oliver Grawert (ogra) wrote :

> needs https://code.launchpad.net/~ogra/hud/new-dbus-address/+merge/220066
the hud part was completely dropped and is not needed anymore

225. By Oliver Grawert

oops, do not truncate the file we want to read (and drop the code for the obsolete file, it should be gone everywhere by now)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/profile.d/dbus-source.sh'
2--- etc/profile.d/dbus-source.sh 2014-04-01 12:24:32 +0000
3+++ etc/profile.d/dbus-source.sh 2014-09-26 14:42:17 +0000
4@@ -1,6 +1,3 @@
5-# truncate obsolete ~/.dbus-session file if it exists
6-[ -e $HOME/.dbus-session ] && echo >$HOME/.dbus-session
7-
8 # source dbus address from new location
9-[ -e $HOME/.cache/upstart/dbus-session ] && . $HOME/.cache/upstart/dbus-session
10+[ -e $XDG_RUNTIME_DIR/dbus-session ] && . $XDG_RUNTIME_DIR/dbus-session
11 [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && export DBUS_SESSION_BUS_ADDRESS

Subscribers

People subscribed via source and target branches