Launchpad itself

Merge lp:~flacoste/launchpad/rollback-14337 into lp:launchpad

  1. rollback-14337
  2. Merge into devel
Proposed by Francis J. Lacoste
Status: Merged
Approved by: Francis J. Lacoste
Approved revision: no longer in the source branch.
Merged at revision: 14357
Proposed branch: lp:~flacoste/launchpad/rollback-14337
Merge into: lp:launchpad
Diff against target: 130 lines (+97/-7)
3 files modified
lib/lp/code/browser/sourcepackagerecipe.py (+6/-3)
lib/lp/code/help/recipe-syntax.html (+91/-0)
lib/lp/code/templates/sourcepackagerecipe-index.pt (+0/-4)
To merge this branch: bzr merge lp:~flacoste/launchpad/rollback-14337
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Review via email: mp+82947@code.launchpad.net

Commit message

[r=flacoste][rollback=14337] Revert sourcerecipe help link change.

To post a comment you must log in.
Revision history for this message
Francis J. Lacoste (flacoste) :
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/browser/sourcepackagerecipe.py'
2--- lib/lp/code/browser/sourcepackagerecipe.py 2011-11-19 02:44:15 +0000
3+++ lib/lp/code/browser/sourcepackagerecipe.py 2011-11-21 23:08:24 +0000
4@@ -572,9 +572,12 @@
5 recipe_text = has_structured_doc(
6 Text(
7 title=u'Recipe text', required=True,
8- description=u"""Enter your recipe here.
9- (<a href="https://help.launchpad.net/Packaging/SourceBuilds/Recipes"
10- >Get help with recipe syntax</a>)
11+ description=u"""The text of the recipe.
12+ <a href="/+help/recipe-syntax.html" target="help"
13+ >Syntax help&nbsp;
14+ <span class="sprite maybe">
15+ <span class="invisible-link">Help</span>
16+ </span></a>
17 """))
18
19
20
21=== added file 'lib/lp/code/help/recipe-syntax.html'
22--- lib/lp/code/help/recipe-syntax.html 1970-01-01 00:00:00 +0000
23+++ lib/lp/code/help/recipe-syntax.html 2011-11-21 23:08:24 +0000
24@@ -0,0 +1,91 @@
25+<html>
26+ <head>
27+ <title>Source package recipe syntax</title>
28+ <link rel="stylesheet" type="text/css"
29+ href="/+icing/yui/cssreset/reset.css" />
30+ <link rel="stylesheet" type="text/css"
31+ href="/+icing/yui/cssfonts/fonts.css" />
32+ <link rel="stylesheet" type="text/css"
33+ href="/+icing/yui/cssbase/base.css" />
34+ </head>
35+ <body>
36+ <h1>Source package recipe syntax</h1>
37+
38+ <p>A recipe is just text that starts with a line such as:</p>
39+ <dl>
40+ <dd>
41+ <tt># bzr-builder format 0.2 deb-version {debupstream}-0~{revno}</tt>
42+ </dd>
43+ </dl>
44+
45+ <p>
46+ The format specifier is there to allow the syntax to be changed in later
47+ versions, and the meaning of "deb-version" will be explained below.
48+ </p>
49+
50+ <p>
51+ The next line specifies the base branch, this is the branch that will
52+ be used to define the initial files and directory structure.
53+ </p>
54+
55+ <p>
56+ Next comes any number of lines of other branches to be merged in, but
57+ using a slightly different format. To merge a branch in to the base
58+ specify something like:
59+ </p>
60+
61+ <dl>
62+ <dd>
63+ <tt>merge packaging lp:~foo-dev/foo/packaging</tt>
64+ </dd>
65+ </dl>
66+
67+ <p>
68+ which specifies we are merging a branch we will refer to as "packaging",
69+ which can be found at the given URI. The name you give to the branch as
70+ the second item doesn't have to match anything else, it's just an
71+ identifier specific to the recipe.
72+ </p>
73+
74+ <p>
75+ <a href="https://help.launchpad.net/Packaging/SourceBuilds/Recipes"
76+ target="_blank">Read more &gt;</a> on recipe syntax for other commands and
77+ specifying revisions for the branches.
78+ </p>
79+
80+ <h2>deb-version</h2>
81+
82+ <p>
83+ To build Debian source package that you desire you should make sure that
84+ "deb-version" is set to an appropriate value on the first line of your
85+ recipe. This will be used as the version number of the package. The
86+ value you put there also allows for substitution of values in to it
87+ based on various things when the recipe is processed:
88+ </p>
89+
90+ <ul class="bulleted">
91+ <li><tt>{date}</tt> &mdash; will be substituted with just the current
92+ date, such as <tt>20090819</tt></li>
93+ <li><tt>{debupstream}</tt> &mdash; will be replaced by the upstream
94+ portion of the version number taken from debian/changelog in the final
95+ tree. If when the tree is built the top of debian/changelog has a
96+ version number of "<tt>1.0-1</tt>" then this would evaluate to
97+ "<tt>1.0</tt>".
98+ </li>
99+ <li><tt>{revno}</tt> &mdash; will be the revno of the base branch (the
100+ first specified)</li>
101+ <li><tt>{revno:&lt;branch name&gt;}</tt> &mdash; will be substituted
102+ with the revno for the branch named &lt;branch name&gt; in the
103+ recipe</li>
104+ <li><tt>{time}</tt> &mdash; will be substituted with the current date
105+ and time, such as <tt>200908191512</tt></li>
106+ </ul>
107+
108+ <p>
109+ <a href="https://help.launchpad.net/Packaging/SourceBuilds/Recipes"
110+ target="_blank">Read more &gt;</a> on recipe syntax for other commands and
111+ specifying revisions for the branches.
112+ </p>
113+
114+ </body>
115+</html>
116
117=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
118--- lib/lp/code/templates/sourcepackagerecipe-index.pt 2011-09-30 12:52:11 +0000
119+++ lib/lp/code/templates/sourcepackagerecipe-index.pt 2011-11-21 23:08:24 +0000
120@@ -146,10 +146,6 @@
121 <div class='portlet'>
122 <h2>Recipe contents</h2>
123 <tal:widget replace="structure view/recipe_text_widget"/>
124- <p>
125- <a href="https://help.launchpad.net/Packaging/SourceBuilds/Recipes">
126- Get help with recipe syntax</a>
127- </p>
128 </div>
129
130 <script type="text/javascript">