backup docs

Change-Id: I8fd630aa2a260d6516cc5fa4d82edde45e419c6a

diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.sgml
index 59924880fd5f33319b154e5a77a9eb95e3154a02..d0b5a1346b14a5026db285f75f74e91b74865f9e 100644 (file)
--- a/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@ -36,7 +36,7 @@
       <arg><option>--git-dist=</option><replaceable>DIST</replaceable></arg>
       <arg><option>--git-arch=</option><replaceable>ARCH</replaceable></arg>
       <arg><option>--git-[no-]pbuilder-autoconf</option></arg>
-      <arg><option>--git-pbuilder-options</option>=<replaceable>PBUILDER_OPTIONS</replaceable></arg>
+      <arg><option>--git-pbuilder-options</option></arg>
       <arg><option>--git-[no-]sign-tags</option></arg>
       <arg><option>--git-keyid=</option><replaceable>GPG-KEYID</replaceable></arg>
       <arg><option>--git-posttag=</option><replaceable>COMMAND</replaceable></arg>
@@ -45,9 +45,8 @@
       <arg><option>--git-prebuild=</option><replaceable>COMMAND</replaceable></arg>
       <arg><option>--git-[no-]build</option></arg>
       <arg><option>--git-[no-]hooks</option></arg>
-      <arg><option>--git-debian-tag=</option><replaceable>tag-format</replaceable></arg>
-      <arg><option>--git-upstream-tag=</option><replaceable>tag-format</replaceable></arg>
-      <arg><option>--git-debian-tag-msg=</option><replaceable>tag-msg-format</replaceable></arg>
+      <arg><option>--git-debian-tag=</option><replaceable>TAG-FORMAT</replaceable></arg>
+      <arg><option>--git-upstream-tag=</option><replaceable>TAG-FORMAT</replaceable></arg>
       <arg><option>--git-force-create</option></arg>
       <arg><option>--git-no-create-orig</option></arg>
       <arg><option>--git-upstream-tree=</option><replaceable>[TAG|BRANCH|TREEISH]</replaceable></arg>
@@ -276,21 +275,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--git-upstream-branch</option>=<replaceable>BRANCH_NAME</replaceable>
-        <term><option>--git-color-scheme</option>=<replaceable>COLOR_SCHEME</replaceable></term>
-        <listitem>
-          <para>
-          Colors to use in output (when color is enabled). The format for
-          COLOR_SCHEME is
-          '&lt;debug&gt;:&lt;info&gt;:&lt;warning&gt;:&lt;error&gt;'.
-          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).
-          </para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><option>--git-upstream-branch</option>=<replaceable>BRANCH_NAME</replaceable>
         </term>
@@ -353,27 +337,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--git-keyid=</option><replaceable>GPG-KEYID</replaceable>
-        </term>
-        <listitem>
-          <para>
-          use this keyid for gpg signing tags
-        <term><option>--git-posttag=</option><replaceable>COMMAND</replaceable>
-        </term>
-        <listitem>
-          <para>
-          excecute <replaceable>COMMAND</replaceable> after tagging a new
-          version.
-          </para>
-          <para>
-          Exported environment variables are: <envar>GBP_TAG</envar> (the name
-          of the generated tag), <envar>GBP_BRANCH</envar> (the branch the
-          package was build from) and <envar>GBP_SHA1</envar> (the sha1 of the
-          commit the tag was created at).
-          </para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><option>--git-posttag=</option><replaceable>COMMAND</replaceable>
         </term>
@@ -408,10 +371,6 @@
       <varlistentry>
         <term><option>--git-postexport=</option><replaceable>COMMAND</replaceable>
         </term>
-        <listitem>
-          <para>
-        <term><option>--git-postexport=</option><replaceable>COMMAND</replaceable>
-        </term>
         <listitem>
           <para>
           execute <replaceable>COMMAND</replaceable> after exporting the source
@@ -482,14 +441,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--git-debian-tag-msg=</option><replaceable>tag-msg-format</replaceable>
-        </term>
-        <listitem>
-          <para>use this tag message format when signing Debian versions,
-         default is <replaceable>%(pkg)s Debian release %(version)s</replaceable></para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><option>--git-force-create</option>
         </term>

diff --git a/docs/manpages/gbp-dch.sgml b/docs/manpages/gbp-dch.sgml
index 0959ca22c76c69db86acfaf9936f0bf3a342bc88..8ffdc4f61d92dbb8e01b03f18edd1af1e9eb1583 100644 (file)
--- a/docs/manpages/gbp-dch.sgml
+++ b/docs/manpages/gbp-dch.sgml
@@ -372,17 +372,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--customizations=</option><replaceable>customization-file</replaceable>
-        </term>
-        <listitem>
-          <para>
-          Load Python code from <replaceable>customization-file</replaceable>.
-          At the moment, the only useful thing the code can do is define a
-          custom format_changelog_entry() function.
-          </para>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>

diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index db3433bcee1cb9c89e47122e88458193a01e6de6..714a53402b36c1e90a962916439ea267464b6450 100644 (file)
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -77,7 +77,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--[no-]merge</option></term>
+        <term><option>--merge</option></term>
         <listitem>
           <para>
           Merge the upstream branch to the debian branch after import
@@ -232,15 +232,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--[no-]interactive</option></term>
-        <listitem>
-          <para>
-          Run command interactively, i.e. ask package name and version if
-          needed.
-          </para>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>

diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index cc31145f4c446f0303c4781adb6d503f5804e80c..e0942083e500272dd363f8eaf35b5577a9fba136 100644 (file)
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -23,7 +23,6 @@
       <arg><option>--[no-]patch-numbers</option></arg>
       <arg><option>--topic=</option><replaceable>topic</replaceable></arg>
       <arg><option>--time-machine=</option><replaceable>num</replaceable></arg>
-      <arg><option>--[no-]drop</option></arg>
       <arg><option>--force</option></arg>
       <group choice="plain">
         <arg><option>drop</option></arg>
@@ -127,7 +126,6 @@
       &man.common.options.description;
 
       <varlistentry>
-        <term><option>--color-scheme</option>=<replaceable>COLOR_SCHEME</replaceable></term>
         <term><option>--[no-]patch-numbers</option>
         </term>
         <listitem>
@@ -158,13 +156,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--[no-]drop</option></term>
-        <listitem>
-          <para>Whether to drop (delete) the patch queue branch after
-          a succesful export</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><option>--force</option></term>
         <listitem>

diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml
index 775472bd90a0bfa13ae5ef0e6dcc533854b8277c..74ff37ce1581222702a876f508441ed1db7e9dfd 100644 (file)
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.sgml
@@ -68,13 +68,6 @@
             remote repository.</para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--all</option></term>
-        <listitem>
-         <para>Update all remote-tracking branches that have identical name in the
-            remote repository.</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><option>--redo-pq</option></term>
         <listitem>

diff --git a/docs/manpages/gbp.sgml b/docs/manpages/gbp.sgml
index c0fdddc78d6038f4201efe6d7510b282f8fcd64a..00c9e77f35996b5b604cc43e95e1bfc4b84261bc 100644 (file)
--- a/docs/manpages/gbp.sgml
+++ b/docs/manpages/gbp.sgml
@@ -21,8 +21,6 @@
       &gbp;
       <group choice='req'>
        <arg><option>--help</option></arg>
-       <arg><option>--version</option></arg>
-       <arg><option>--list-cmds</option></arg>
        <arg><option>command</option><arg choice='opt' rep='repeat'><option>args</option></arg></arg>
       </group>
     </cmdsynopsis>
@@ -43,20 +41,6 @@
           <para>Print help</para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>--version</option>
-        </term>
-        <listitem>
-          <para>Print the programs version</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--list-cmds</option>
-        </term>
-        <listitem>
-          <para>List all available commands</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>

diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index 134f0315f210f6699d3e0a5633cdc1a9cebabd51..be1a68268927e42302abd672d95c3e831902da6e 100644 (file)
--- 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*