From f5e0a3befc8c182a316ae0ae67ccb110a74a65a0 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Fri, 29 Jan 2016 00:51:48 +0800 Subject: [PATCH] backup docs Change-Id: I8fd630aa2a260d6516cc5fa4d82edde45e419c6a --- docs/manpages/gbp-buildpackage.sgml | 55 ++----------------------------------- docs/manpages/gbp-dch.sgml | 11 -------- docs/manpages/gbp-import-orig.sgml | 11 +------- docs/manpages/gbp-pq.sgml | 9 ------ docs/manpages/gbp-pull.sgml | 7 ----- docs/manpages/gbp.sgml | 16 ----------- packaging/git-buildpackage.spec | 13 +++------ 7 files changed, 8 insertions(+), 114 deletions(-) diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.sgml index 5992488..d0b5a13 100644 --- a/docs/manpages/gbp-buildpackage.sgml +++ b/docs/manpages/gbp-buildpackage.sgml @@ -36,7 +36,7 @@ DIST ARCH - =PBUILDER_OPTIONS + GPG-KEYID COMMAND @@ -45,9 +45,8 @@ COMMAND - tag-format - tag-format - tag-msg-format + TAG-FORMAT + TAG-FORMAT [TAG|BRANCH|TREEISH] @@ -278,21 +277,6 @@ =BRANCH_NAME - =COLOR_SCHEME - - - Colors to use in output (when color is enabled). The format for - COLOR_SCHEME is - '<debug>:<info>:<warning>:<error>'. - Numerical values and color names are accepted, empty fields imply - the default color. For example --git-color-scheme='cyan:34::' would - show debug messages in cyan, info messages in blue and other messages - in default (i.e. warning and error messages in red). - - - - - =BRANCH_NAME @@ -354,27 +338,6 @@ - GPG-KEYID - - - - use this keyid for gpg signing tags - COMMAND - - - - excecute COMMAND after tagging a new - version. - - - Exported environment variables are: GBP_TAG (the name - of the generated tag), GBP_BRANCH (the branch the - package was build from) and GBP_SHA1 (the sha1 of the - commit the tag was created at). - - - - COMMAND @@ -410,10 +373,6 @@ - COMMAND - - - execute COMMAND after exporting the source tree - valid only if --git-export-dir has been specified. @@ -483,14 +442,6 @@ - tag-msg-format - - - use this tag message format when signing Debian versions, - default is %(pkg)s Debian release %(version)s - - - diff --git a/docs/manpages/gbp-dch.sgml b/docs/manpages/gbp-dch.sgml index 0959ca2..8ffdc4f 100644 --- a/docs/manpages/gbp-dch.sgml +++ b/docs/manpages/gbp-dch.sgml @@ -372,17 +372,6 @@ - - customization-file - - - - Load Python code from customization-file. - At the moment, the only useful thing the code can do is define a - custom format_changelog_entry() function. - - - diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml index db3433b..714a534 100644 --- a/docs/manpages/gbp-import-orig.sgml +++ b/docs/manpages/gbp-import-orig.sgml @@ -77,7 +77,7 @@ - + Merge the upstream branch to the debian branch after import @@ -232,15 +232,6 @@ - - - - - Run command interactively, i.e. ask package name and version if - needed. - - - diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml index cc31145..e094208 100644 --- a/docs/manpages/gbp-pq.sgml +++ b/docs/manpages/gbp-pq.sgml @@ -23,7 +23,6 @@ topic num - @@ -127,7 +126,6 @@ &man.common.options.description; - =COLOR_SCHEME @@ -159,13 +157,6 @@ - - - Whether to drop (delete) the patch queue branch after - a succesful export - - - In case of import even import if the branch already diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml index 775472b..74ff37c 100644 --- a/docs/manpages/gbp-pull.sgml +++ b/docs/manpages/gbp-pull.sgml @@ -69,13 +69,6 @@ - - - Update all remote-tracking branches that have identical name in the - remote repository. - - - also rebuild the corresponding patch-queue using &gbp-pq;. diff --git a/docs/manpages/gbp.sgml b/docs/manpages/gbp.sgml index c0fdddc..00c9e77 100644 --- a/docs/manpages/gbp.sgml +++ b/docs/manpages/gbp.sgml @@ -21,8 +21,6 @@ &gbp; - - @@ -43,20 +41,6 @@ Print help - - - - - Print the programs version - - - - - - - List all available commands - - diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index 134f031..be1a682 100644 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -12,15 +12,11 @@ URL: https://honk.sigxcpu.org/piki/projects/git-buildpackage/ Source0: %{name}_%{version}.tar.gz # Conditional package names for requirements -%if 0%{?fedora} || 0%{?centos_ver} > 7 -%define dpkg_pkg_name dpkg-dev -%else -%if 0%{?centos_version} +%if 0%{?fedora} || 0%{?centos_ver} %define dpkg_pkg_name dpkg-devel %else %define dpkg_pkg_name dpkg %endif -%endif %if 0%{?suse_version} && 0%{?suse_version} < 1230 %define devscripts_pkg_name devscripts-fixes @@ -34,7 +30,7 @@ Source0: %{name}_%{version}.tar.gz %define man_pkg_name man %endif -%if 0%{?fedora} || 0%{?centos_version} || 0%{?centos_ver} || 0%{?tizen_version:1} +%if 0%{?fedora} || 0%{?centos_ver} || 0%{?tizen_version:1} %define python_pkg_name python %else %define python_pkg_name python-base @@ -209,8 +205,8 @@ cat >> files.list << EOF EOF %endif -# Disable the debian tools for old CentOS -%if 0%{?centos_version} && 0%{?centos_ver} < 7 +# Disable the debian tools for CentOS +%if 0%{?centos_version} for f in `cat files.list`; do rm -rfv %{buildroot}/$f done @@ -231,7 +227,6 @@ done %dir %{python_sitelib}/gbp/pkg %dir %{python_sitelib}/gbp/scripts %dir %{python_sitelib}/gbp/scripts/common -#%{python_sitelib}/gbp-* %{python_sitelib}/gbp/*.py* %{python_sitelib}/gbp/scripts/__init__.py* %{python_sitelib}/gbp/scripts/clone.py* -- 2.7.4