Merge lp:~larryprice/acolyterm/jenkins into lp:acolyterm

[Larry Price]

Update codebase to work with jenkins.

Update codebase to work with jenkins.

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:210
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/47/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/39/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/47/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

211. By Larry Price on 2016-06-17

more names that needed updating

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:211
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/48/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/40/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/49/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

212. By Larry Price on 2016-06-17

updating changelog with new name

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:212
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/49/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/41/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/50/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

213. By Larry Price on 2016-06-17

updating changelog with new entry

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:213
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/50/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/42/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/51/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

214. By Larry Price on 2016-06-17

removing qt5-default and updating standards

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:214
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/51/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/43/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/52/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/6/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

215. By Larry Price on 2016-06-17

trying to get things native

216. By Larry Price on 2016-06-17

verbose output

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:216
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/52/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/44/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/53/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

217. By Larry Price on 2016-06-17

redoing changelog entirely and resetting version number to 0.1

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:217
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/53/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/45/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/54/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

218. By Larry Price on 2016-06-17

shooting in the dark

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:218
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/54/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/46/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/55/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

219. By Larry Price on 2016-06-17

Updating changelog again

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:219
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/55/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/47/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-0-fetch/56/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

220. By Larry Price on 2016-06-17

adding bzr builddeb with no split

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:220
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/11/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/56/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/48/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/57
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/47
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/47
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/40/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/40/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/40/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/40/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

221. By Larry Price on 2016-06-20

undoing a few changes

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:221
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/12/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/57/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/49/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/58
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/48
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/48
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/41/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/41/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/41/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/41/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

222. By Larry Price on 2016-06-20

rename terminal to acolyterm in cmake

223. By Larry Price on 2016-06-20

renaming some cmake objects

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:223
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/13/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/58/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/50/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/59
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/49
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/49
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/42/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/42/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/42/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/42/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

224. By Larry Price on 2016-06-20

removing awkward installs to see where that gets me

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:224
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/14/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/59
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/28
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/28
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/28
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/28
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/51/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/60
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/50
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/50
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/43
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/43/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/43
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/43/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/43
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/43/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/43
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/43/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/14/rebuild

review: Approve (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

225. By Larry Price on 2016-06-20

attempting to add autopilot

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:225
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/60
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=test_acolyterm.py/29
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=test_acolyterm.py/29
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=test_acolyterm.py/29
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=test_acolyterm.py/29
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/52/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/61
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/51
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/51
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/44
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/44/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/44
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/44/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/44
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/44/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/44
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/44/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/15/rebuild

review: Approve (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

226. By Larry Price on 2016-06-20

adding qtdeclarative installs back

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:226
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/61/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/53/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/62
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/52
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/52
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/45/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/45/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/45/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/45/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

227. By Larry Price on 2016-06-20

add missing deps

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:227
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/17/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/62
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=test_acolyterm.py/30
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=test_acolyterm.py/30
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=test_acolyterm.py/30
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=test_acolyterm.py/30
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/54/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/63
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/53
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/53
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/46
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/46/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/46
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/46/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/46
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/46/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/46
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/46/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/17/rebuild

review: Approve (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

228. By Larry Price on 2016-06-20

working on autopilot tests

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:228
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/18/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/63
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=acolyterm/33
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=acolyterm/33
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=acolyterm/33
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=acolyterm/33
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/55/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/64
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/54
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/54
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/47
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/47/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/47
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/47/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/47
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/47/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/47
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/47/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/18/rebuild

review: Approve (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

229. By Larry Price on 2016-06-20

autopkgtest stuff

230. By Larry Price on 2016-06-21

updating autopkgtest depends

231. By Larry Price on 2016-06-21

adding deps

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:231
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/19/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/64
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=acolyterm/38
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=acolyterm/38
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=acolyterm/38
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=acolyterm/38
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/56/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/65
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/55
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/55
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/48
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/48/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/48
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/48/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/48
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/48/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/48
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/48/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/19/rebuild

review: Approve (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

232. By Larry Price on 2016-06-21

attempting to mimic system settings online accounts

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:232
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/20/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/65
    UNSTABLE: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=autopilot/41
    UNSTABLE: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=autopilot/41
    UNSTABLE: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=autopilot/41
    UNSTABLE: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=autopilot/41
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/57/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/66
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/56
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/56
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/49
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/49/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/49
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/49/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/49
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/49/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/49
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/49/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

233. By Larry Price on 2016-06-21

giving up on autopkgtest

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:233
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/21/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/66
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=autopilot/42
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=autopilot/42
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=autopilot/42
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=autopilot/42
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/58/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/67
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/57
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/57
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/50
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/50/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/50
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/50/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/50
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/50/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/50
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/50/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/21/rebuild

review: Approve (continuous-integration)

[lp:~larryprice/acolyterm/jenkins]

234. By Larry Price on 2016-06-21

fixing make autopilot

235. By Larry Price on 2016-06-21

adding back in autopilot dep

236. By Larry Price on 2016-06-21

updating copyrights

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:234
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/22/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/67/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/59/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/68
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/58
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/58
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/51/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/51/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/51/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/51/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:236
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/23/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/68
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=autopilot/43
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=autopilot/43
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=autopilot/43
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=autopilot/43
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/60/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/69
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/59
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/59
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/52
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/52/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/52
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/52/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/52
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/52/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/52
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/52/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/23/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

jenkins passes so we're good to go

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2016-06-21 17:48:56 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-16 20:27:27 +0000
+++ CMakeLists.txt	2016-06-21 17:48:56 +0000
@@ -12,12 +12,11 @@
 option(INSTALL_TESTS "Install the tests on make install" on)
 option(CLICK_MODE "Installs to a contained location" on)
 
-set(APP_NAME terminal)
+set(APP_NAME acolyterm)
 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
 set(APP_HARDCODE acolyterm)
 set(MAIN_QML acolyterm.qml)
 set(ICON_FILE terminal64.png)
-set(AUTOPILOT_DIR ubuntu_terminal_app)
 set(EXEC "${APP_NAME}")
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 
@@ -62,7 +61,7 @@
          RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
          *.json *.json.in *.apparmor)
 
-    add_custom_target(com_ubuntu_terminal_CLICKFiles ALL SOURCES ${CLICK_FILES})
+    add_custom_target(com_ubuntu_acolyterm_CLICKFiles ALL SOURCES ${CLICK_FILES})
 else(CLICK_MODE)
     execute_process(
         COMMAND qmake -query QT_INSTALL_QML

=== modified file 'README.autopilot.md'
--- README.autopilot.md	2016-03-08 13:54:33 +0000
+++ README.autopilot.md	2016-06-21 17:48:56 +0000
@@ -23,7 +23,7 @@
 
 *  Branch the code
 
-    $ bzr branch lp:ubuntu-terminal-app
+    $ bzr branch lp:acolyterm
 
 *  Navigate to the tests/autopilot directory.
 
@@ -31,15 +31,15 @@
 
 *  run all tests.
 
-    $ autopilot3 run -vv ubuntu_terminal_app
+    $ autopilot3 run -vv acolyterm
 
 * to list all tests:
 
-    $ autopilot3 list ubuntu_terminal_app
+    $ autopilot3 list acolyterm
 
  To run only one test
 
-    $ autopilot3 run -vv ubuntu_terminal_app.tests.test_name
+    $ autopilot3 run -vv acolyterm.tests.test_name
 
 * Debugging tests using autopilot vis
 
@@ -59,11 +59,11 @@
 
 *  Branch the code, for example,
 
-    $ bzr branch lp:ubuntu-terminal-app
+    $ bzr branch lp:acolyterm
 
 *  Navigate to the source directory.
 
-    $ cd ubuntu-terminal-app
+    $ cd acolyterm
 
 *  Build a click package
 
@@ -71,4 +71,4 @@
 
 *  Run the tests on device (assumes only one click package in the directory)
 
-    $ adt-run . *.click --- ssh -s adb -- -p <PASSWORD>
\ No newline at end of file
+    $ adt-run . *.click --- ssh -s adb -- -p <PASSWORD>

=== modified file 'README.md'
--- README.md	2015-08-02 13:00:09 +0000
+++ README.md	2016-06-21 17:48:56 +0000
@@ -30,7 +30,7 @@
    password
 4. Once created, you'll need to add the build dependencies for the app:
   - Click on the Maintain button on your chroot
-  - On the terminal prompt that is started, type 
+  - On the terminal prompt that is started, type
     apt-get install libpam0g-dev:armhf
   - Close the terminal when the installation finishes
 5. Now you can either do a clean checkout and wait to be prompted by Qt Creator
@@ -63,7 +63,7 @@
 
 Due to Qt Creator's bug #1312094 in launchpad.net, there needs to be a manual
 workaround done before the app can run on the device:
- 
+
 1. Modify the desktop.in file: change the Exec line to read:
    Exec=lib/arm-linux-gnueabihf/bin/@EXEC@
 
@@ -147,4 +147,4 @@
 Once the app has been built, you can go to the build directory and run:
 
     cd tests/autopilot
-    autopilot run ubuntu_terminal_app
+    autopilot run acolyterm

=== modified file 'README.translations'
--- README.translations	2014-10-25 04:42:31 +0000
+++ README.translations	2016-06-21 17:48:56 +0000
@@ -31,5 +31,5 @@
 
 Translations for core apps follow the standard [gettext format][].
 
- [Launchpad Translations]: https://translations.launchpad.net/ubuntu-terminal-app
+ [Launchpad Translations]: https://translations.launchpad.net/acolyterm
  [gettext format]: https://www.gnu.org/software/gettext/

=== added file 'debian/acolyterm-autopilot.install'
--- debian/acolyterm-autopilot.install	1970-01-01 00:00:00 +0000
+++ debian/acolyterm-autopilot.install	2016-06-21 17:48:56 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/dist-packages/acolyterm/

=== added file 'debian/acolyterm.install'
--- debian/acolyterm.install	1970-01-01 00:00:00 +0000
+++ debian/acolyterm.install	2016-06-21 17:48:56 +0000
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/share/*

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-04 08:41:27 +0000
+++ debian/changelog	2016-06-21 17:48:56 +0000
@@ -1,3 +1,9 @@
+acolyterm (0.1) xenial; urgency=high
+
+  * Forking ubuntu-terminal-app into acolyterm
+
+ -- Larry Price <[e-mail]>  Mon, 20 Jun 2016 09:15:00 -0400
+
 ubuntu-terminal-app (0.7) wily; urgency=medium
 
   * Bumped changelog version (LP: #1468385)
@@ -7,10 +13,10 @@
 ubuntu-terminal-app (0.5ubuntu2) trusty; urgency=medium
 
   [ Alan Pope ]
-  * Add -qt5 command line option (LP: #1288885)  
+  * Add -qt5 command line option (LP: #1288885)
 
   [ David Planella ]
-  * Merge konsole plugin into the app's repo. 
+  * Merge konsole plugin into the app's repo.
 
  -- David Planella <[e-mail]>  Sun, 27 Apr 2014 12:08:04 +0200
 

=== modified file 'debian/control'
--- debian/control	2016-03-15 14:20:16 +0000
+++ debian/control	2016-06-21 17:48:56 +0000
@@ -1,21 +1,22 @@
-Source: ubuntu-terminal-app
+Source: acolyterm
 Priority: extra
-Maintainer: Ubuntu App Cats <[e-mail]>
+Maintainer: Libertine Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                debhelper (>= 9),
                python3-all,
                gettext,
                intltool,
                libpam0g-dev,
+               qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
-               qt5-default,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Section: misc
-Homepage: https://launchpad.net/ubuntu-terminal-app
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/trunk
+Homepage: https://launchpad.net/acolyterm
+Vcs-Bzr: https://code.launchpad.net/~libertine-team/acolyterm/trunk
 
-Package: ubuntu-terminal-app
+Package: acolyterm
 Section: misc
 Architecture: any
 Depends: ${misc:Depends},
@@ -25,8 +26,8 @@
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qml-module-qtsysteminfo (>= 5.0~),
-Description: Terminal application
- Core Terminal application
+Description: Terminal helper
+ Core Terminal helper
 
 Package: qtdeclarative5-qmltermwidget1.0
 Architecture: any
@@ -48,13 +49,14 @@
  This package contains a plugin that enables QML apps to do
  password authentication via the PAM API.
 
-Package: ubuntu-terminal-app-autopilot
+Package: acolyterm-autopilot
 Architecture: all
 Depends: ${misc:Depends},
-         libautopilot-qt,
+         autopilot-qt5,
          libqt5test5,
          python3-autopilot,
-         ubuntu-terminal-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
+         click-dev,
+         acolyterm (>= ${source:Version}),
 Description: Autopilot tests for Terminal Application
  This package contains the autopilot tests for the Terminal

=== modified file 'debian/copyright'
--- debian/copyright	2014-10-25 04:42:31 +0000
+++ debian/copyright	2016-06-21 17:48:56 +0000
@@ -1,18 +1,13 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ubuntu-terminal-app
-Source: https://launchpad.net/ubuntu-terminal-app
+Upstream-Name: acolyterm
+Source: https://launchpad.net/acolyterm
 
 Files: *
-Copyright: 2013 Canonical Ltd.
-           2013 Dmitry Zagnoyko <[e-mail]>
-           2013 Omer Akram <[e-mail]>
-           2013 Paolo Rotolo <[e-mail]>
-           2013 Riccardo Padovani <[e-mail]>
-           2013 Sam Hewitt <[e-mail]>
+Copyright: 2013-2016 Canonical Ltd.
 License: GPL-3
 
 Files: debian/*
-Copyright: 2013 Canonical Ltd.
+Copyright: 2013-2016 Canonical Ltd.
 License: LGPL-3
 
 License: GPL-3

=== removed file 'debian/ubuntu-terminal-app-autopilot.install'
--- debian/ubuntu-terminal-app-autopilot.install	2014-10-25 04:42:31 +0000
+++ debian/ubuntu-terminal-app-autopilot.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/dist-packages/ubuntu_terminal_app/

=== removed file 'debian/ubuntu-terminal-app.install'
--- debian/ubuntu-terminal-app.install	2014-10-25 04:42:31 +0000
+++ debian/ubuntu-terminal-app.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/bin/*
-usr/share/*

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-06-16 20:27:27 +0000
+++ manifest.json.in	2016-06-21 17:48:56 +0000
@@ -1,5 +1,5 @@
 {
-    "description": "Terminal application",
+    "description": "Terminal helper",
     "framework": "ubuntu-sdk-15.04.4",
     "architecture": "@CLICK_ARCH@",
     "hooks": {
@@ -12,7 +12,7 @@
     "maintainer": "Libertine Developers <[e-mail]>",
     "name": "com.ubuntu.acolyterm",
     "title": "acolyterm",
-    "version": "0.7.@BZR_REVNO@",
+    "version": "0.1.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2016-03-15 14:18:34 +0000
+++ src/app/CMakeLists.txt	2016-06-21 17:48:56 +0000
@@ -1,17 +1,17 @@
 file(GLOB_RECURSE QML_SRCS *.qml *.js *.json)
 
-set(terminal_SRCS
+set(acolyterm_SRCS
     main.cpp
     fileio.cpp
     ${QML_SRCS}
 )
 
-add_executable(terminal ${terminal_SRCS})
+add_executable(acolyterm ${acolyterm_SRCS})
 
-qt5_use_modules(terminal Gui Qml Quick Widgets)
+qt5_use_modules(acolyterm Gui Qml Quick Widgets)
 
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-add_custom_target(terminal-qmlfiles ALL
+add_custom_target(acolyterm-qmlfiles ALL
     COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${QMLFILES}
 )
@@ -19,7 +19,7 @@
 
 install(DIRECTORY qml DESTINATION ${DATA_DIR})
 if(CLICK_MODE)
-  install(TARGETS terminal DESTINATION ${BIN_DIR})
+  install(TARGETS acolyterm DESTINATION ${BIN_DIR})
 else()
-  install(TARGETS terminal RUNTIME DESTINATION bin)
+  install(TARGETS acolyterm RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-02-24 23:23:36 +0000
+++ tests/CMakeLists.txt	2016-06-21 17:48:56 +0000
@@ -1,1 +1,16 @@
-add_subdirectory(autopilot)
+set(AUTOPILOT_DIR acolyterm)
+
+execute_process (
+  COMMAND python3 -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"
+  COMMAND sed -r -e "s|/usr/(local/)?||g"
+  OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install (
+  DIRECTORY autopilot/${AUTOPILOT_DIR}
+  DESTINATION ${PYTHON_PACKAGE_DIR}
+)
+
+add_custom_target(autopilot
+    COMMAND PYTHONPATH=$ENV{PYTHONPATH}:../${COMMON_PYTHONPATH} BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/autopilot
+)

=== removed file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2015-02-24 23:23:36 +0000
+++ tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-if(INSTALL_TESTS)
-execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
-    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-install(DIRECTORY ${AUTOPILOT_DIR}
-    DESTINATION ${PYTHON_PACKAGE_DIR}
-    )
-endif(INSTALL_TESTS)

=== added directory 'tests/autopilot/acolyterm'
=== added file 'tests/autopilot/acolyterm/__init__.py'
--- tests/autopilot/acolyterm/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/acolyterm/__init__.py	2016-06-21 17:48:56 +0000
@@ -0,0 +1,41 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013-2016 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Acolyterm app autopilot helpers."""
+
+import ubuntuuitoolkit
+
+
+class AcolytermApp(object):
+
+    """Autopilot helper object for the terminal application."""
+
+    def __init__(self, app_proxy):
+        self.app = app_proxy
+        self.main_view = self.app.select_single(MainView)
+
+    @property
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """Autopilot custom proxy object for the MainView."""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True)

=== added directory 'tests/autopilot/acolyterm/tests'
=== added file 'tests/autopilot/acolyterm/tests/__init__.py'
--- tests/autopilot/acolyterm/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/acolyterm/tests/__init__.py	2016-06-21 17:48:56 +0000
@@ -0,0 +1,162 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013-2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+"""Acolyterm app autopilot tests."""
+
+import os
+import fixtures
+import logging
+import tempfile
+import gi
+
+from autopilot import logging as autopilot_logging
+from autopilot.testcase import AutopilotTestCase
+import ubuntuuitoolkit
+
+import acolyterm
+gi.require_version('Click', '0.4')
+from gi.repository import Click
+
+
+logger = logging.getLogger(__name__)
+
+
+class AcolytermTestCase(AutopilotTestCase):
+    """
+    A common testcase class that provides useful methods for the acolyterm
+    app.
+    """
+
+    local_build_location = os.path.dirname(os.environ["BUILD_DIR"])
+    sdk_build_location = os.path.join(os.path.dirname(local_build_location),
+                                      os.path.basename(local_build_location)
+                                      + '-build')
+
+    local_build_location_qml = os.path.join(
+        local_build_location, 'src', 'app', 'qml', 'acolyterm.qml')
+    local_build_location_binary = os.path.join(local_build_location,
+                                               'src', 'app', 'acolyterm')
+
+    sdk_build_location_qml = os.path.join(
+        sdk_build_location, 'src', 'app', 'qml', 'acolyterm.qml')
+    sdk_build_location_binary = os.path.join(sdk_build_location,
+                                             'src', 'app', 'acolyterm')
+    installed_location_binary = os.path.join('usr', 'bin',
+                                             'acolyterm')
+    installed_location_qml = os.path.join('usr', 'share',
+                                          'acolyterm', 'qml',
+                                          'acolyterm.qml')
+
+    def setUp(self):
+        super(AcolytermTestCase, self).setUp()
+        launcher_method, _ = self.get_launcher_method_and_type()
+        self.app = acolyterm.AcolytermApp(launcher_method())
+
+    def get_launcher_method_and_type(self):
+        if os.path.exists(self.local_build_location_binary):
+            launcher = self.launch_test_local
+            test_type = 'local'
+        elif os.path.exists(self.sdk_build_location_binary):
+            launcher = self.launch_test_sdk
+            test_type = 'sdk'
+        elif os.path.exists(self.installed_location_binary):
+            launcher = self.launch_test_installed
+            test_type = 'deb'
+        else:
+            launcher = self.launch_test_click
+            test_type = 'click'
+        return launcher, test_type
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        plugin_location = os.path.join(self.local_build_location,
+                                       'src', 'plugin')
+        self.useFixture(fixtures.EnvironmentVariable(
+            'QML2_IMPORT_PATH', newvalue=plugin_location))
+        return self.launch_test_application(
+            self.local_build_location_binary,
+            app_type='qt',
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_sdk(self):
+        plugin_location = os.path.join(self.sdk_build_location,
+                                       'src', 'plugin')
+        self.useFixture(fixtures.EnvironmentVariable(
+            'QML2_IMPORT_PATH', newvalue=plugin_location))
+
+        return self.launch_test_application(
+            self.sdk_build_location_binary,
+            app_type='qt',
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_installed(self):
+        return self.launch_test_application(
+            self.installed_location_binary,
+            '-q', self.installed_location_qml,
+            app_type='qt',
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_click(self):
+        # We need to pass the "--forceAuth false" argument to the acolyterm app
+        # binary, but ubuntu-app-launch doesn't pass arguments to the exec line
+        # on the desktop file. So we make a test desktop file that has the
+        # "--forceAuth false"  on the exec line.
+        desktop_file_path = self.write_sandbox_desktop_file()
+        desktop_file_name = os.path.basename(desktop_file_path)
+        application_name, _ = os.path.splitext(desktop_file_name)
+        return self.launch_upstart_application(
+            application_name,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    def write_sandbox_desktop_file(self):
+        desktop_file_dir = self.get_local_desktop_file_directory()
+        desktop_file = self.get_named_temporary_file(
+            suffix='.desktop', dir=desktop_file_dir)
+        desktop_file.write('[Desktop Entry]\n')
+        version, installed_path = self.get_installed_version_and_directory()
+        acolyterm_sandbox_exec = (
+            'aa-exec-click -p com.ubuntu.acolyterm_acolyterm_{}'
+            ' -- acolyterm --forceAuth false'.format(version))
+        desktop_file_dict = {
+            'Type': 'Application',
+            'Name': 'acolyterm',
+            'Exec': acolyterm_sandbox_exec,
+            'Icon': 'Not important',
+            'Path': installed_path
+        }
+        for key, value in desktop_file_dict.items():
+            desktop_file.write('{key}={value}\n'.format(key=key, value=value))
+        desktop_file.close()
+        logger.debug(acolyterm_sandbox_exec)
+        for key, value in desktop_file_dict.items():
+            logger.debug("%s: %s" % (key, value))
+        return desktop_file.name
+
+    def get_local_desktop_file_directory(self):
+        return os.path.join(
+            os.path.expanduser('~'), '.local', 'share', 'applications')
+
+    def get_named_temporary_file(
+            self, dir=None, mode='w+t', delete=False, suffix=''):
+        # Discard files with underscores which look like an APP_ID to Unity
+        # See https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1329141
+        chars = tempfile._RandomNameSequence.characters.strip("_")
+        tempfile._RandomNameSequence.characters = chars
+        return tempfile.NamedTemporaryFile(
+            dir=dir, mode=mode, delete=delete, suffix=suffix)
+
+    def get_installed_version_and_directory(self):
+        db = Click.DB()
+        db.read()
+        package_name = 'com.ubuntu.acolyterm'
+        registry = Click.User.for_user(db, name=os.environ.get('USER'))
+        version = registry.get_version(package_name)
+        directory = registry.get_path(package_name)
+        return version, directory

=== added file 'tests/autopilot/acolyterm/tests/test_acolyterm.py'
--- tests/autopilot/acolyterm/tests/test_acolyterm.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/acolyterm/tests/test_acolyterm.py	2016-06-21 17:48:56 +0000
@@ -0,0 +1,17 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013-2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+"""Terminal app autopilot tests."""
+
+from acolyterm.tests import AcolytermTestCase
+
+
+class TestMainWindow(AcolytermTestCase):
+    def test_example_test(self):
+        """Just launch app, assert on main view"""
+        main_view = self.app.main_view
+        self.assertTrue(main_view)

=== removed directory 'tests/autopilot/ubuntu_terminal_app'
=== removed file 'tests/autopilot/ubuntu_terminal_app/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/__init__.py	2016-03-07 21:11:34 +0000
+++ tests/autopilot/ubuntu_terminal_app/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-"""Terminal app autopilot helpers."""
-
-import ubuntuuitoolkit
-
-
-class TerminalApp(object):
-
-    """Autopilot helper object for the terminal application."""
-
-    def __init__(self, app_proxy):
-        self.app = app_proxy
-        self.main_view = self.app.select_single(MainView)
-
-    @property
-    def pointing_device(self):
-        return self.app.pointing_device
-
-
-class MainView(ubuntuuitoolkit.MainView):
-
-    """Autopilot custom proxy object for the MainView."""
-
-    def __init__(self, *args):
-        super(MainView, self).__init__(*args)
-        self.visible.wait_for(True)

=== removed directory 'tests/autopilot/ubuntu_terminal_app/tests'
=== removed file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2016-03-08 13:54:33 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Terminal app autopilot tests."""
-
-import os.path
-import fixtures
-import logging
-import tempfile
-import gi
-
-from autopilot import logging as autopilot_logging
-from autopilot.testcase import AutopilotTestCase
-import ubuntuuitoolkit
-
-import ubuntu_terminal_app
-gi.require_version('Click', '0.4')
-from gi.repository import Click
-
-
-logger = logging.getLogger(__name__)
-
-
-class TerminalTestCase(AutopilotTestCase):
-
-    """A common testcase class that provides useful methods for the terminal
-    app.
-
-    """
-
-    local_build_location = os.path.dirname(os.path.dirname(os.getcwd()))
-    sdk_build_location = os.path.join(os.path.dirname(local_build_location),
-                                      os.path.basename(local_build_location)
-                                      + '-build')
-
-    local_build_location_qml = os.path.join(
-        local_build_location, 'src', 'app', 'qml', 'ubuntu-terminal-app.qml')
-    local_build_location_binary = os.path.join(local_build_location,
-                                               'src', 'app', 'terminal')
-    sdk_build_location_qml = os.path.join(
-        sdk_build_location, 'src', 'app', 'qml', 'ubuntu-terminal-app.qml')
-    sdk_build_location_binary = os.path.join(sdk_build_location,
-                                             'src', 'app', 'terminal')
-    installed_location_binary = os.path.join('usr', 'bin',
-                                             'ubuntu-terminal-app')
-    installed_location_qml = os.path.join('usr', 'share',
-                                          'ubuntu-terminal-app', 'qml',
-                                          'ubuntu-terminal-app.qml')
-
-    def setUp(self):
-        super(TerminalTestCase, self).setUp()
-        launcher_method, _ = self.get_launcher_method_and_type()
-        self.app = ubuntu_terminal_app.TerminalApp(launcher_method())
-
-    def get_launcher_method_and_type(self):
-        if os.path.exists(self.local_build_location_binary):
-            launcher = self.launch_test_local
-            test_type = 'local'
-        elif os.path.exists(self.sdk_build_location_binary):
-            launcher = self.launch_test_sdk
-            test_type = 'sdk'
-        elif os.path.exists(self.installed_location_binary):
-            launcher = self.launch_test_installed
-            test_type = 'deb'
-        else:
-            launcher = self.launch_test_click
-            test_type = 'click'
-        return launcher, test_type
-
-    @autopilot_logging.log_action(logger.info)
-    def launch_test_local(self):
-        plugin_location = os.path.join(self.local_build_location,
-                                       'src', 'plugin')
-        self.useFixture(fixtures.EnvironmentVariable(
-            'QML2_IMPORT_PATH', newvalue=plugin_location))
-        return self.launch_test_application(
-            self.local_build_location_binary,
-            app_type='qt',
-            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
-
-    @autopilot_logging.log_action(logger.info)
-    def launch_test_sdk(self):
-        plugin_location = os.path.join(self.sdk_build_location,
-                                       'src', 'plugin')
-        self.useFixture(fixtures.EnvironmentVariable(
-            'QML2_IMPORT_PATH', newvalue=plugin_location))
-
-        return self.launch_test_application(
-            self.sdk_build_location_binary,
-            app_type='qt',
-            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
-
-    @autopilot_logging.log_action(logger.info)
-    def launch_test_installed(self):
-        return self.launch_test_application(
-            self.installed_location_binary,
-            '-q', self.installed_location_qml,
-            app_type='qt',
-            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
-
-    @autopilot_logging.log_action(logger.info)
-    def launch_test_click(self):
-        # We need to pass the "--forceAuth false" argument to the terminal app
-        # binary, but ubuntu-app-launch doesn't pass arguments to the exec line
-        # on the desktop file. So we make a test desktop file that has the
-        # "--forceAuth false"  on the exec line.
-        desktop_file_path = self.write_sandbox_desktop_file()
-        desktop_file_name = os.path.basename(desktop_file_path)
-        application_name, _ = os.path.splitext(desktop_file_name)
-        return self.launch_upstart_application(
-            application_name,
-            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
-
-    def write_sandbox_desktop_file(self):
-        desktop_file_dir = self.get_local_desktop_file_directory()
-        desktop_file = self.get_named_temporary_file(
-            suffix='.desktop', dir=desktop_file_dir)
-        desktop_file.write('[Desktop Entry]\n')
-        version, installed_path = self.get_installed_version_and_directory()
-        terminal_sandbox_exec = (
-            'aa-exec-click -p com.ubuntu.terminal_terminal_{}'
-            ' -- terminal --forceAuth false'.format(version))
-        desktop_file_dict = {
-            'Type': 'Application',
-            'Name': 'terminal',
-            'Exec': terminal_sandbox_exec,
-            'Icon': 'Not important',
-            'Path': installed_path
-        }
-        for key, value in desktop_file_dict.items():
-            desktop_file.write('{key}={value}\n'.format(key=key, value=value))
-        desktop_file.close()
-        logger.debug(terminal_sandbox_exec)
-        for key, value in desktop_file_dict.items():
-            logger.debug("%s: %s" % (key, value))
-        return desktop_file.name
-
-    def get_local_desktop_file_directory(self):
-        return os.path.join(
-            os.path.expanduser('~'), '.local', 'share', 'applications')
-
-    def get_named_temporary_file(
-            self, dir=None, mode='w+t', delete=False, suffix=''):
-        # Discard files with underscores which look like an APP_ID to Unity
-        # See https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1329141
-        chars = tempfile._RandomNameSequence.characters.strip("_")
-        tempfile._RandomNameSequence.characters = chars
-        return tempfile.NamedTemporaryFile(
-            dir=dir, mode=mode, delete=delete, suffix=suffix)
-
-    def get_installed_version_and_directory(self):
-        db = Click.DB()
-        db.read()
-        package_name = 'com.ubuntu.terminal'
-        registry = Click.User.for_user(db, name=os.environ.get('USER'))
-        version = registry.get_version(package_name)
-        directory = registry.get_path(package_name)
-        return version, directory

=== removed file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2016-03-07 21:11:34 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Terminal app autopilot tests."""
-
-from ubuntu_terminal_app.tests import TerminalTestCase
-
-
-class TestMainWindow(TerminalTestCase):
-    def test_example_test(self):
-        """Just launch app, assert on main view"""
-        main_view = self.app.main_view
-        self.assertTrue(main_view)