~ubuntu-branches/debian/squeeze/bzr-builddeb/squeeze

« back to all changes in this revision

Viewing changes to doc/user_manual/split.rst

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-01-18 19:15:26 UTC
  • mfrom: (5.1.5 karmic)
  • Revision ID: james.westby@ubuntu.com-20100118191526-fzyw0n60z6vrhhhn
Tags: 2.2
* Upload to unstable.
* Bump standards version to 3.8.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
This mode is a mixture of most of the other modes. You have the upstream
16
16
code and the packaging in the same branch like `normal mode`_ and
17
17
`native mode`_, but the only packaging changes can be in the ``debian/``
18
 
directory, like `merge mode`_. It also saves you having to manually create
19
 
an upstream tarball, like `export-upstream mode`_.
 
18
directory, like `merge mode`_.
20
19
 
21
20
.. _normal mode: normal.html
22
21
.. _native mode: native.html
23
22
.. _merge mode: merge.html
24
 
.. _export-upstream mode: export_upstream.html
25
23
 
26
24
Setting up the package
27
25
######################