Merge lp:~cjwatson/launchpad/git-recipe-create-text into lp:launchpad

Proposed by Colin Watson on 2016-01-20
Status: Merged
Merged at revision: 17902
Proposed branch: lp:~cjwatson/launchpad/git-recipe-create-text
Merge into: lp:launchpad
Diff against target: 20 lines (+6/-4)
1 file modified
lib/lp/code/templates/sourcepackagerecipe-new.pt (+6/-4)
To merge this branch: bzr merge lp:~cjwatson/launchpad/git-recipe-create-text
Reviewer Review Type Date Requested Status
Colin Watson Approve on 2016-01-20
Review via email: mp+283326@code.launchpad.net

Commit message

Adjust the introductory text on sourcepackagerecipe-new.pt to account for Git recipes.

Description of the change

Adjust the introductory text on sourcepackagerecipe-new.pt to account for Git recipes.

To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/templates/sourcepackagerecipe-new.pt'
2--- lib/lp/code/templates/sourcepackagerecipe-new.pt 2012-02-01 15:31:32 +0000
3+++ lib/lp/code/templates/sourcepackagerecipe-new.pt 2016-01-20 16:18:53 +0000
4@@ -23,10 +23,12 @@
5
6 <div metal:fill-slot="main">
7
8- <div>
9- <p>A "recipe" is a description of the steps bzr-builder should take to
10- construct a source package from the various bzr branches. Its format
11- specifies:</p>
12+ <div tal:define="is_bzr context/bzr_identity|nothing">
13+ <p>A "recipe" is a description of the steps Launchpad's package builder
14+ should take to construct a source package from the various
15+ <tal:bzr condition="is_bzr">bzr</tal:bzr>
16+ <tal:git condition="not: is_bzr">git</tal:git>
17+ branches. Its format specifies:</p>
18 <ul class="bulleted">
19 <li>where to use the code from (trunk branch, beta branch, etc.), where to get the packaging from (separate branch? ubuntu branch?)</li>
20 <li>the correct package version (so users will still be able to upgrade to the stable version of the distro once it gets released)</li>