From 0385dc5caf20ced73c3bb2787056b331022c9bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 29 Aug 2013 20:11:18 +0200 Subject: docs: having an upstream branch is a recommendation rather than a hard requirement, we can use any treeish to build the upstream tarball from. --- docs/chapters/intro.sgml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/chapters/intro.sgml b/docs/chapters/intro.sgml index dbed9a1e..c29d7138 100644 --- a/docs/chapters/intro.sgml +++ b/docs/chapters/intro.sgml @@ -28,13 +28,13 @@ Repository Layout and Terminology - 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 corresponding to the command + It is recommended to have the Debian packaging on a seprate + branch than the upstream source this, of course, has + no meaning for Debian native packages. + 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 + corresponding to the command line and config file options is used: -- cgit v1.2.3