Merge lp://staging/~ted/snapcraft/qml into lp://staging/~snappy-dev/snapcraft/core

Proposed by Ted Gould
Status: Superseded
Proposed branch: lp://staging/~ted/snapcraft/qml
Merge into: lp://staging/~snappy-dev/snapcraft/core
Diff against target: 285 lines (+190/-5)
10 files modified
examples/qmldemo/demo.qml (+9/-0)
examples/qmldemo/meta/package.yaml (+11/-0)
examples/qmldemo/meta/readme.md (+4/-0)
examples/qmldemo/snapcraft.yaml (+8/-0)
plugins/qml.yaml (+3/-0)
plugins/ubuntu.yaml (+2/-0)
snapcraft/cmds.py (+12/-1)
snapcraft/plugins/copy.py (+1/-1)
snapcraft/plugins/qml.py (+128/-0)
snapcraft/plugins/ubuntu.py (+12/-3)
To merge this branch: bzr merge lp://staging/~ted/snapcraft/qml
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+265615@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-07-23.

To post a comment you must log in.
lp://staging/~ted/snapcraft/qml updated
99. By Ted Gould

Taking the wrapper-path branch

100. By Ted Gould

More wrapper path handling

101. By Ted Gould

Pull through wrapper path updates

102. By Ted Gould

Only pass the file exists error

103. By Ted Gould

Using format for strings

104. By Ted Gould

Instead of detecting a list, add a packages key

105. By Ted Gould

Making a centralized command for putting the architecture in

106. By Ted Gould

Fix the architecture printouts

107. By Ted Gould

Fill in the architecture if not defined

108. By Ted Gould

Put newlines at the end of our scripts

109. By Ted Gould

Merge trunk

110. By Ted Gould

Removing old configuration key

111. By Ted Gould

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

112. By Ted Gould

Switch to only allow 'packages'

113. By Ted Gould

Use the 'or' syntax

114. By Ted Gould

All an implicit package by the name

115. By Ted Gould

Drop the options statement

116. By Ted Gould

Merge trunk (with adaptations)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: