diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-08-29 20:11:18 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-08-29 20:11:18 +0200 |
| commit | 0385dc5caf20ced73c3bb2787056b331022c9bce (patch) | |
| tree | c04924cf659d90cde0408b731733a2ecf9d54983 /docs | |
| parent | 6ac3faa37b8ec92128a650ddf82e302461269300 (diff) | |
docs: having an upstream branch is a recommendation
rather than a hard requirement, we can use any treeish to build the
upstream tarball from.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/chapters/intro.sgml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/chapters/intro.sgml b/docs/chapters/intro.sgml index dbed9a1..c29d713 100644 --- a/docs/chapters/intro.sgml +++ b/docs/chapters/intro.sgml @@ -28,13 +28,13 @@ <sect1 id="gbp.repository"> <title>Repository Layout and Terminology</title> - <para>The only requirement on the repository layout for using - &gbp; is, that the branch the debian work is - being done on is different from the branch the upstream sources are - being maintained on (this, of course, has no meaning for Debian native - packages). This is necessary to be able to build upstream tarballs and - to merge in new upstream versions. To distinguish these two branches - the following terminology <footnote><para>corresponding to the command + <para>It is recommended to have the Debian packaging on a seprate + branch than the upstream source <footnote><para>this, of course, has + no meaning for Debian native packages</para></footnote>. + This is necessary to be able to import + and merge in new upstream versions via &gbp-import-orig;. + To distinguish these two branches the following terminology + <footnote><para>corresponding to the command line and config file options</para></footnote> is used: </para> <itemizedlist> |