From: Markus Lehtonen Date: Fri, 9 May 2014 11:40:25 +0000 (+0300) Subject: docs: cosmetic reformat of import-orig manpage sgml source X-Git-Tag: debian/0.6.16~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57999ca2c716dd628f3018b5f16dcf7d4013fcdc;p=tools%2Fgit-buildpackage.git docs: cosmetic reformat of import-orig manpage sgml source Makes the sgml source more readable. Fix indentation, tab to space, wrap lines. Signed-off-by: Markus Lehtonen --- diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml index 74a0f634..967afc8c 100644 --- a/docs/manpages/gbp-import-orig.sgml +++ b/docs/manpages/gbp-import-orig.sgml @@ -9,7 +9,7 @@ - gbp-import-orig + gbp-import-orig &dhsection; @@ -37,8 +37,8 @@ - upstream-source - + upstream-source + @@ -50,148 +50,174 @@ be a gzip, bzip2, lzma or xz compressed tar archive, a zip archive or an already unpacked source tree. If it is already of the form package-name_version.orig.tar.gz, the version - information is read from the tarball's filename otherwise it can be - given on the command line via . - If the source package name or version can't be determined - &gbp-import-orig; will prompt for it unless - is given. - - The sources are placed on the upstream branch (default: + information is read from the tarball's filename otherwise it can be given + on the command line via . If the source + package name or version can't be determined &gbp-import-orig; will prompt + for it unless is given. + + + The sources are placed on the upstream branch (default: upstream), tagged and merged onto the debian branch (default: master). OPTIONS - =version version - The upstream version number + + The upstream version number + - Merge the upstream branch to the debian branch after import + + Merge the upstream branch to the debian branch after import + - =branch_name - The branch in the Git repository the upstream sources are put - onto. Default is upstream. + + The branch in the Git repository the upstream sources are put + onto. Default is upstream. + =branch_name - The branch in the Git repository the Debian package is being - developed on, default is master. After - importing the new sources on the upstream branch, &gbp-import-orig; - will try to merge the new version onto this branch. + + The branch in the Git repository the Debian package is being + developed on, default is master. After + importing the new sources on the upstream branch, &gbp-import-orig; + will try to merge the new version onto this branch. + =tag_name - - Add tag_name as additional parent to the commit - of the upstream tarball. Useful when upstream uses git and you want to - link to it's revision history. - + + Add tag_name as additional parent to the + commit of the upstream tarball. Useful when upstream uses git and you + want to link to it's revision history. + - + - verbose execution + + verbose execution + - GPG sign all created tags + + GPG sign all created tags + gpg-keyid - use this keyid for gpg signing tags + + use this keyid for gpg signing tags + tag-format - use this tag format when tagging upstream versions, - default is upstream/%(version)s + + use this tag format when tagging upstream versions, + default is upstream/%(version)s + msg-format - use this format string for the commit message when - importing upstream versions, default is Imported - Upstream version %(version)s + + use this format string for the commit message when importing upstream + versions, default is + Imported Upstream version %(version)s + pattern - filter out files glob-matching pattern. Can be given multiple times. + + filter out files glob-matching pattern. Can be given multiple times. + - generate pristine-tar delta file + + generate pristine-tar delta file + - if using a filter also filter the files out of the tarball - passed to pristine-tar + + if using a filter also filter the files out of the tarball + passed to pristine-tar + - - Whether to create and keep a symlink from the upstream tarball - to a Debian policy conformant upstream tarball name located in - ../. - - - This is a good idea if not using pristine-tar - since it avoids creating a new tarball with a different md5sum. - + + Whether to create and keep a symlink from the upstream tarball + to a Debian policy conformant upstream tarball name located in + ../. + + + This is a good idea if not using pristine-tar + since it avoids creating a new tarball with a different md5sum. + - run cmd after the import. + + run cmd after the import. + - Use uscan to fetch new upstream version. + + Use uscan to fetch new upstream version. + @@ -207,21 +233,24 @@ EXAMPLES - Download and import a new upstream version using the informantion from debian/watch + + Download and import a new upstream version using the informantion from debian/watch + &gbp-import-orig; --uscan - After downloading an upstream tarball by hand import it + + After downloading an upstream tarball by hand import it + &gbp-import-orig; ../upstream-tarball-0.1.tar.gz - &man.gbp.config-files; + &man.gbp.config-files; SEE ALSO - , , @@ -230,15 +259,13 @@ , &man.seealso.common; - AUTHOR - - &dhusername; &dhemail; - + + &dhusername; &dhemail; + -