/usr/share/doc/ubuntu-packaging-guide-html/udd-uploading.html is in ubuntu-packaging-guide-html 0.3.9.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>7. Uploading a package — Ubuntu Packaging Guide</title>
<link rel="shortcut icon" href="./_static/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="./_static/reset.css" type="text/css" />
<link rel="stylesheet" href="./_static/960.css" type="text/css" />
<link rel="stylesheet" href="./_static/base.css" type="text/css" />
<link rel="stylesheet" href="./_static/home.css" type="text/css" />
<link rel="stylesheet" href="./_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="./_static/guide.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../',
VERSION: '0.3.9',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
};
</script>
<script type="text/javascript" src="./_static/jquery.js"></script>
<script type="text/javascript" src="./_static/underscore.js"></script>
<script type="text/javascript" src="./_static/doctools.js"></script>
<script type="text/javascript" src="./_static/main.js"></script>
<link rel="search" title="Search" href="./search.html" />
<link rel="top" title="Ubuntu Packaging Guide" href="./index.html" />
<link rel="next" title="8. Getting The Latest" href="udd-latest.html" />
<link rel="prev" title="6. Seeking Review and Sponsorship" href="udd-sponsorship.html" />
</head>
<body class="home">
<a name="top"></a>
<div class="header-navigation">
<div>
<nav role="navigation">
<ul>
<li class="page_item current_page_item"><a title="Contents" href="index.html">Contents</a>
<li>
<form id="form-search" method="get" action="search.html">
<fieldset>
<input id="input-search" type="text" name="q" value="Search" />
</fieldset>
</form>
</li>
</ul>
</nav>
<a class="logo-ubuntu" href="http://packaging.ubuntu.com/">
<img src="./_static/images/logo-ubuntu.png" width="119" height="27" alt="Ubuntu logo" />
</a>
<a href="http://packaging.ubuntu.com/"><h2>Packaging Guide</h2></a>
</div>
</div>
<div class="header-content">
<div class="clearfix">
<div class="header-navigation-secondary">
<div>
<nav role="navigation">
<ul class="clearfix">
<li class="page_item"><a style="margin-right: 10px"
href="udd-latest.html" title="8. Getting The Latest"
accesskey="N">next</a></li>
<li class="page_item"><a
href="udd-sponsorship.html" title="6. Seeking Review and Sponsorship"
accesskey="P">previous</a></li>
<li class="page_item"><a class="sub-nav-item" href="index.html">Ubuntu Packaging Guide »</a></li>
</ul>
</nav>
</div>
</div>
</div>
</div>
<div id="content" class="body container_12">
<div class="grid_12">
<!--<section id="main-section">-->
<div class="grid_9 alpha">
<div class="section" id="uploading-a-package">
<h1>7. Uploading a package<a class="headerlink" href="#uploading-a-package" title="Permalink to this headline">¶</a></h1>
<p>Once your merge proposal is reviewed and approved, you will want to upload
your package, either to the archive (if you have permission) or to your
<a class="reference external" href="https://help.launchpad.net/Packaging/PPA">Personal Package Archive</a> (PPA). You might also want to do an upload if
you are sponsoring someone else’s changes.</p>
<div class="section" id="uploading-a-change-made-by-you">
<h2>7.1. Uploading a change made by you<a class="headerlink" href="#uploading-a-change-made-by-you" title="Permalink to this headline">¶</a></h2>
<p>When you have a branch with a change that you would like to upload you need to
get that change back on to the main source branch, build a source package, and
then upload it.</p>
<p>First, you need to check that you have the latest version of the package in
your checkout of the development package trunk:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ cd tomboy/tomboy.dev
$ bzr pull
</pre></div>
</div>
<p>This pulls in any changes that may have been committed while you were working
on your fix. From here, you have several options. If the changes on the
trunk are large and you feel should be tested along with your change you can
merge them into your bug fix branch and test there. If not, then you can
carry on merging your bug fix branch into the development trunk branch. As of
bzr 2.5 and bzr-builddeb 2.8.1, this works with just the standard <code class="docutils literal"><span class="pre">merge</span></code>
command:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr merge ../bug-12345
</pre></div>
</div>
<p>For older versions of bzr, you can use the <code class="docutils literal"><span class="pre">merge-package</span></code> command instead:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr merge-package ../bug-12345
</pre></div>
</div>
<p>This will merge the two trees, possibly producing conflicts, which you’ll need
to resolve manually.</p>
<p>Next you should make sure the <code class="docutils literal"><span class="pre">debian/changelog</span></code> is as you would like, with
the correct distribution, version number, etc.</p>
<p>Once that is done you should review the change you are about to commit with
<code class="docutils literal"><span class="pre">bzr</span> <span class="pre">diff</span></code>. This should show you the same changes as a debdiff would before
you upload the source package.</p>
<p>The next step is to build and test the modified source package as you normally
would:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr builddeb -S
</pre></div>
</div>
<p>When you’re finally happy with your branch, make sure you’ve committed all
your changes, then tag the branch with the changelog’s version number. The
<code class="docutils literal"><span class="pre">bzr</span> <span class="pre">tag</span></code> command will do this for you automatically when given no
arguments:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr tag
</pre></div>
</div>
<p>This tag will tell the package importer that what is in the Bazaar branch
is the same as in the archive.</p>
<p>Now you can push the changes back to Launchpad:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr push ubuntu:tomboy
</pre></div>
</div>
<p>(Change the destination if you are uploading an SRU or similar.)</p>
<p>You need one last step to get your changes uploaded into Ubuntu or your PPA;
you need to <code class="docutils literal"><span class="pre">dput</span></code> the source package to the appropriate location. For
example, if you want to upload your changes to your PPA, you’d do:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ dput ppa:imasponsor/myppa tomboy_1.5.2-1ubuntu5_source.changes
</pre></div>
</div>
<p>or, if you have permission to upload to the primary archive:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ dput tomboy_1.5.2-1ubuntu5_source.changes
</pre></div>
</div>
<p>You are now free to delete your feature branch, as it is merged, and can
be re-downloaded from Launchpad if needed.</p>
</div>
<div class="section" id="sponsoring-a-change">
<h2>7.2. Sponsoring a change<a class="headerlink" href="#sponsoring-a-change" title="Permalink to this headline">¶</a></h2>
<p>Sponsoring someone else’s change is just like the above procedure, but instead
of merging from a branch you created, you merge from the branch in the merge
proposal:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr merge lp:~subgenius/ubuntu/trusty/tomboy/bug-12345
</pre></div>
</div>
<p>If there are lots of merge conflicts you would probably want to ask the
contributor to fix them up. See the next section to learn how to cancel
a pending merge.</p>
<p>But if the changes look good, commit and then follow the rest of the uploading
process:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr commit --author "Bob Dobbs <subgenius@example.com>"
</pre></div>
</div>
</div>
<div class="section" id="canceling-an-upload">
<h2>7.3. Canceling an upload<a class="headerlink" href="#canceling-an-upload" title="Permalink to this headline">¶</a></h2>
<p>At any time before you <cite>dput</cite> the source package you can decide to cancel an
upload and revert the changes:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr revert
</pre></div>
</div>
<p>You can do this if you notice something needs more work, or if you would like
to ask the contributor to fix up conflicts when sponsoring something.</p>
</div>
<div class="section" id="sponsoring-something-and-making-your-own-changes">
<h2>7.4. Sponsoring something and making your own changes<a class="headerlink" href="#sponsoring-something-and-making-your-own-changes" title="Permalink to this headline">¶</a></h2>
<p>If you are going to sponsor someone’s work, but you would like to roll it up
with some changes of your own then you can merge their work in to a separate
branch first.</p>
<p>If you already have a branch where you are working on the package and you
would like to include their changes, then simply run the <code class="docutils literal"><span class="pre">bzr</span> <span class="pre">merge</span></code> from
that branch, instead of the checkout of the development package. You can then
make the changes and commit, and then carry on with your changes to the
package.</p>
<p>If you don’t have an existing branch, but you know you would like to make
changes based on what the contributor provides then you should start by
grabbing their branch:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ bzr branch lp:~subgenius/ubuntu/trusty/tomboy/bug-12345
</pre></div>
</div>
<p>then work in this new branch, and then merge it in to the main one and upload
as if it was your own work. The contributor will still be mentioned in the
changelog, and Bazaar will correctly attribute the changes they made to them.</p>
</div>
</div>
<div class="divide"></div>
</div>
<div id="sidebar" class="grid_3 omega">
<div class="container-tweet">
<h3>Table Of Contents</h3>
<div class="toc">
<ul>
<li><a class="reference internal" href="#">7. Uploading a package</a><ul>
<li><a class="reference internal" href="#uploading-a-change-made-by-you">7.1. Uploading a change made by you</a></li>
<li><a class="reference internal" href="#sponsoring-a-change">7.2. Sponsoring a change</a></li>
<li><a class="reference internal" href="#canceling-an-upload">7.3. Canceling an upload</a></li>
<li><a class="reference internal" href="#sponsoring-something-and-making-your-own-changes">7.4. Sponsoring something and making your own changes</a></li>
</ul>
</li>
</ul>
</div>
<div class="browse-guide">
<h3>Browse The Guide:</h3>
<ul>
<li class="prev">
<a href="udd-sponsorship.html"
title="Previous topic: 6. Seeking Review and Sponsorship">Go Previous</a>
</li>
<li class="center">
<a title="Back to Index" href="index.html">Index Guide</a>
</li>
<li class="next">
<a href="udd-latest.html"
title="Next topic: 8. Getting The Latest">Go Next</a>
</li>
</ul>
<span>This Page:</span> <a href="./_sources/udd-uploading.rst.txt"
rel="nofollow">Show Source</a>
</div>
</div>
<div id="back_top"><a href="#top">Back to Top</a></div>
</div>
<!--</section>-->
</div>
</div>
<div class="shadow"></div>
<footer>
<div>
Version: 0.3.9.
<a href="https://bugs.launchpad.net/ubuntu-packaging-guide">Report bugs</a> or
<a href="https://code.launchpad.net/~ubuntu-packaging-guide-team/ubuntu-packaging-guide/trunk">grab the source code</a> from Launchpad.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.5.6.
<br />
© Copyright 2010-2017, Ubuntu Developers, Creative Commons Attribution-ShareAlike 3.0.
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
<img alt="Creative Commons License" style="border-width:0"
src="./_static/images/cc-by-sa.png" /></a>
<br />
<a href="http://people.ubuntu.com/~mitya57/ubuntu-packaging-guide-readme.html#translating">Help translate</a> or
<a href="./_static/translators.html">view the list of translators</a>.
</div>
</footer>
</body>
</html>
|