lp:~ted/snapcraft/qml

Branch merges

Merged into lp:~snappy-dev/snapcraft/core at revision 126

Michael Terry (community): Approve on 2015-08-05

Leo Arias: Needs Fixing on 2015-07-23

Diff: 379 lines (+179/-17)

17 files modified

examples/qmldemo/demo.qml (+9/-0)
examples/qmldemo/meta/package.yaml (+10/-0)
examples/qmldemo/meta/readme.md (+4/-0)
examples/qmldemo/snapcraft.yaml (+8/-0)
integration-tests/data/assemble/binary1.after (+1/-1)
plugins/ubuntu.yaml (+3/-1)
snapcraft/cmds.py (+2/-2)
snapcraft/plugins/copy.py (+1/-1)
snapcraft/plugins/jdk.py (+1/-1)
snapcraft/plugins/python2.py (+1/-1)
snapcraft/plugins/python3.py (+1/-1)
snapcraft/plugins/qml.py (+125/-0)
snapcraft/plugins/tests/test_ubuntu.py (+1/-1)
snapcraft/plugins/ubuntu.py (+8/-4)
snapcraft/tests/test_cmds.py (+1/-1)
snapcraft/tests/test_ubuntu_plugin.py (+1/-1)
snapcraft/tests/test_yaml.py (+2/-2)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

116. By Ted Gould on 2015-08-05

Merge trunk (with adaptations)

115. By Ted Gould on 2015-08-05

Drop the options statement

114. By Ted Gould on 2015-08-05

All an implicit package by the name

113. By Ted Gould on 2015-08-05

Use the 'or' syntax

112. By Ted Gould on 2015-08-05

Switch to only allow 'packages'

111. By Ted Gould on 2015-08-05

Drop our version of these commands to take the ones from trunk

110. By Ted Gould on 2015-08-05

Removing old configuration key

109. By Ted Gould on 2015-08-05

Merge trunk

108. By Ted Gould on 2015-07-30

Put newlines at the end of our scripts

107. By Ted Gould on 2015-07-30

Fill in the architecture if not defined