Ubuntu Touch session manager

Merge lp:~mterry/ubuntu-touch-session/simplify-layout into lp:ubuntu-touch-session

  1. simplify-layout
  2. Merge into trunk
Proposed by Michael Terry
Status: Needs review
Proposed branch: lp:~mterry/ubuntu-touch-session/simplify-layout
Merge into: lp:ubuntu-touch-session
Diff against target: 79 lines (+4/-19)
1 file modified
debian/ubuntu-touch-session.install (+4/-19)
To merge this branch: bzr merge lp:~mterry/ubuntu-touch-session/simplify-layout
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+308621@code.launchpad.net

Commit message

SImplify source file layout.

Description of the change

All we do is install files as-is. But we have a lot of install redirects on top-level files. I figured this would be easier to see how each file is used. And avoid any filename conflicts.

To post a comment you must log in.

Unmerged revisions

292. By Michael Terry

Simplify layout

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubuntu-touch-session.install'
2--- debian/ubuntu-touch-session.install 2015-02-07 02:22:15 +0000
3+++ debian/ubuntu-touch-session.install 2016-10-17 11:36:22 +0000
4@@ -1,19 +1,4 @@
5-etc/dbus-1/system.d
6-etc/profile.d
7-startup-scripts/* /usr/bin/
8-*.override /etc/init
9-factory-wipe.conf /etc/init/
10-systemd-overrides/* /lib/systemd/system/
11-ubuntu-touch-session.d/* /etc/ubuntu-touch-session.d/
12-upstart-session/* /usr/share/upstart/sessions/
13-ubuntu-touch-lightdm-session /usr/sbin/
14-ubuntu-touch-session /usr/bin/
15-ubuntu-touch.desktop /usr/share/lightdm/sessions
16-52-ubuntu-touch.conf /usr/share/lightdm/lightdm.conf.d
17-usc-wrapper /usr/share/ubuntu-touch-session/
18-platform-api/application.conf /etc/ubuntu-platform-api/
19-com.ubuntu.touch.NetworkManager.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
20-touch.pa /etc/pulse/
21-touch-client.conf /etc/pulse/
22-touch-stream-restore.table /etc/pulse/
23-touch-extrausers /usr/share/pam-configs/
24+etc
25+lib
26+usr
27+var
28
29=== added directory 'etc/init'
30=== renamed file 'apparmor.override' => 'etc/init/apparmor.override'
31=== renamed file 'factory-wipe.conf' => 'etc/init/factory-wipe.conf'
32=== renamed file 'lightdm.override' => 'etc/init/lightdm.override'
33=== renamed file 'plymouth-log.override' => 'etc/init/plymouth-log.override'
34=== renamed file 'plymouth-shutdown.override' => 'etc/init/plymouth-shutdown.override'
35=== renamed file 'plymouth.override' => 'etc/init/plymouth.override'
36=== added directory 'etc/pulse'
37=== renamed file 'touch-client.conf' => 'etc/pulse/touch-client.conf'
38=== renamed file 'touch-stream-restore.table' => 'etc/pulse/touch-stream-restore.table'
39=== renamed file 'touch.pa' => 'etc/pulse/touch.pa'
40=== renamed directory 'platform-api' => 'etc/ubuntu-platform-api'
41=== renamed directory 'ubuntu-touch-session.d' => 'etc/ubuntu-touch-session.d'
42=== added directory 'lib'
43=== added directory 'lib/systemd'
44=== renamed directory 'systemd-overrides' => 'lib/systemd/system'
45=== removed directory 'startup-scripts'
46=== removed directory 'upstart-session'
47=== added directory 'usr'
48=== added directory 'usr/bin'
49=== renamed file 'startup-scripts/create-online-accounts' => 'usr/bin/create-online-accounts'
50=== renamed file 'ubuntu-touch-session' => 'usr/bin/ubuntu-touch-session'
51=== added directory 'usr/sbin'
52=== renamed file 'ubuntu-touch-lightdm-session' => 'usr/sbin/ubuntu-touch-lightdm-session'
53=== added directory 'usr/share'
54=== added directory 'usr/share/lightdm'
55=== added directory 'usr/share/lightdm/lightdm.conf.d'
56=== renamed file '52-ubuntu-touch.conf' => 'usr/share/lightdm/lightdm.conf.d/52-ubuntu-touch.conf'
57=== added directory 'usr/share/lightdm/sessions'
58=== renamed file 'ubuntu-touch.desktop' => 'usr/share/lightdm/sessions/ubuntu-touch.desktop'
59=== added directory 'usr/share/pam-configs'
60=== renamed file 'touch-extrausers' => 'usr/share/pam-configs/touch-extrausers'
61=== added directory 'usr/share/ubuntu-touch-session'
62=== renamed file 'usc-wrapper' => 'usr/share/ubuntu-touch-session/usc-wrapper'
63=== added directory 'usr/share/upstart'
64=== added directory 'usr/share/upstart/sessions'
65=== renamed file 'upstart-session/bluez-mpris-proxy.conf' => 'usr/share/upstart/sessions/bluez-mpris-proxy.conf'
66=== renamed file 'upstart-session/cameraservice-trust-stored.conf' => 'usr/share/upstart/sessions/cameraservice-trust-stored.conf'
67=== renamed file 'upstart-session/indicator-sound.override' => 'usr/share/upstart/sessions/indicator-sound.override'
68=== renamed file 'upstart-session/maliit-server.conf' => 'usr/share/upstart/sessions/maliit-server.conf'
69=== renamed file 'upstart-session/obexd.conf' => 'usr/share/upstart/sessions/obexd.conf'
70=== renamed file 'upstart-session/ofono-setup.conf' => 'usr/share/upstart/sessions/ofono-setup.conf'
71=== renamed file 'upstart-session/pulseaudio-trust-stored.conf' => 'usr/share/upstart/sessions/pulseaudio-trust-stored.conf'
72=== renamed file 'upstart-session/pulseaudio.conf' => 'usr/share/upstart/sessions/pulseaudio.conf'
73=== renamed file 'upstart-session/xdg-dirs.conf' => 'usr/share/upstart/sessions/xdg-dirs.conf'
74=== added directory 'var'
75=== added directory 'var/lib'
76=== added directory 'var/lib/polkit-1'
77=== added directory 'var/lib/polkit-1/localauthority'
78=== added directory 'var/lib/polkit-1/localauthority/10-vendor.d'
79=== renamed file 'com.ubuntu.touch.NetworkManager.pkla' => 'var/lib/polkit-1/localauthority/10-vendor.d/com.ubuntu.touch.NetworkManager.pkla'

Subscribers

People subscribed via source and target branches