Merge lp:~veebers/autopilot/fixing-packaging-for-image-removal into lp:autopilot

Proposed by Christopher Lee
Status: Needs review
Proposed branch: lp:~veebers/autopilot/fixing-packaging-for-image-removal
Merge into: lp:autopilot
Diff against target: 29 lines (+0/-14)
3 files modified
apparmor/click.rules (+0/-12)
debian/autopilot-touch.dirs (+0/-1)
debian/autopilot-touch.install (+0/-1)
To merge this branch: bzr merge lp:~veebers/autopilot/fixing-packaging-for-image-removal
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
PS Jenkins bot continuous-integration Needs Fixing
Thomi Richards (community) Approve
Oliver Grawert (community) Approve
prod-platform-qa continuous-integration Pending
Review via email: mp+239183@code.launchpad.net

Commit message

Remove autopilot-touch.install to make it a meta package.

Description of the change

Updating of packaging for removal of autopilot from the image.

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

looks very good, this is what we need to fix the smoketests.

review: Approve
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)

Unmerged revisions

516. By Christopher Lee

Also remove the .dirs file

515. By Christopher Lee

Actually remove file

514. By Christopher Lee

Removing autopilot-touch.install as the file is offered by a different package (removal of APfrom image)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'apparmor'
2=== removed file 'apparmor/click.rules'
3--- apparmor/click.rules 2014-05-23 09:35:07 +0000
4+++ apparmor/click.rules 1970-01-01 00:00:00 +0000
5@@ -1,12 +0,0 @@
6-dbus (receive, send)
7- bus=session
8- path=/com/canonical/Autopilot/**,
9-# Allow writes to various (application-specific) XDG directories
10- owner @{HOME}/autopilot/fakeenv/*/.cache/@{APP_PKGNAME}/ rw, # subdir of XDG_CACHE_HOME
11- owner @{HOME}/autopilot/fakeenv/*/.cache/@{APP_PKGNAME}/** mrwkl,
12- owner @{HOME}/autopilot/fakeenv/*/.config/@{APP_PKGNAME}/ rw, # subdir of XDG_CONFIG_HOME
13- owner @{HOME}/autopilot/fakeenv/*/.config/@{APP_PKGNAME}/** mrwkl,
14- owner @{HOME}/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/ rw, # subdir of XDG_DATA_HOME
15- owner @{HOMEDIRS}/*/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/** mrwklix,
16- owner @{HOME}/autopilot/fakeenv/*/confined/@{APP_PKGNAME}/ rw, # subdir of XDG_RUNTIME_DIR
17- owner @{HOME}/autopilot/fakeenv/*/confined/@{APP_PKGNAME}/** mrwkl,
18
19=== removed file 'debian/autopilot-touch.dirs'
20--- debian/autopilot-touch.dirs 2013-09-20 19:06:30 +0000
21+++ debian/autopilot-touch.dirs 1970-01-01 00:00:00 +0000
22@@ -1,1 +0,0 @@
23-usr/share/autopilot-touch/apparmor
24
25=== removed file 'debian/autopilot-touch.install'
26--- debian/autopilot-touch.install 2013-09-20 19:06:30 +0000
27+++ debian/autopilot-touch.install 1970-01-01 00:00:00 +0000
28@@ -1,1 +0,0 @@
29-apparmor/click.rules usr/share/autopilot-touch/apparmor

Subscribers

People subscribed via source and target branches