Enable gbs man page

In current version, `man gbs` is disabled by annotating code that creates
manual page in spec file because the creation of manual page will fail
without question due to syntax error in GBS.rst.

In this change, the syntax error in GBS.rst is fixed, and the annotation
is cancelled accordingly.

Change-Id: Id69b8f704a1aa041a83f908ed65798157ca9c5fe
Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>

diff --git a/debian/control b/debian/control
index 03cf2b7..e44874d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gbs
 Section: devel
 Priority: extra
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
-Build-Depends: debhelper, python (>= 2.6), python-support
+Build-Depends: debhelper, python (>= 2.6), python-support, python-docutils
 Standards-Version: 3.8.0
 X-Python-Version: >= 2.6
 Homepage: http://www.tizen.org

diff --git a/debian/gbs.install b/debian/gbs.install
index a7e74d9..eb17cee 100644 (file)
--- a/debian/gbs.install
+++ b/debian/gbs.install
@@ -9,3 +9,4 @@ usr/lib/python*/*packages/gitbuildsys/cmd_submit.py
 usr/lib/python*/*packages/gitbuildsys/parsing.py
 usr/bin/*
 etc/bash_completion.d/*
+usr/share/man/man1/gbs.1

diff --git a/debian/rules b/debian/rules
index 37dbe9d..fcec0a2 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@
 
 override_dh_auto_install:
        python setup.py install --root=debian/tmp --prefix=/usr
+       make man
+       mkdir -p debian/tmp/usr/share/man/man1
+       install -m644 docs/gbs.1 debian/tmp/usr/share/man/man1
 
 override_dh_auto_test:
        @echo 'Skipping autotests'

diff --git a/packaging/gbs.dsc b/packaging/gbs.dsc
index 443684a..d54c27f 100644 (file)
--- a/packaging/gbs.dsc
+++ b/packaging/gbs.dsc
@@ -5,6 +5,6 @@ Binary: gbs, gbs-api, gbs-export, gbs-remotebuild
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
 Architecture: all
 Standards-Version: 3.7.1
-Build-Depends: debhelper, python-support
+Build-Depends: debhelper, python-support, python-docutils
 Files:
  574996dfeeb001e70f20239a0e621daf 2457861 gbs_0.20.tar.gz

diff --git a/packaging/gbs.spec b/packaging/gbs.spec
index 715133c..9651c5c 100644 (file)
--- a/packaging/gbs.spec
+++ b/packaging/gbs.spec
@@ -27,6 +27,7 @@ Requires:   %{name}-export = %{version}-%{release}
 Requires:   %{name}-remotebuild = %{version}-%{release}
 
 BuildRequires:  python-devel
+BuildRequires:  python-docutils
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -76,12 +77,13 @@ external software.
 
 %build
 %{__python} setup.py build
+make man
 
 %install
 %{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-#mkdir -p %{buildroot}/%{_prefix}/share/man/man1
-#install -m644 doc/gbs.1 %{buildroot}/%{_prefix}/share/man/man1
+mkdir -p %{buildroot}/%{_prefix}/share/man/man1
+install -m644 docs/gbs.1 %{buildroot}/%{_prefix}/share/man/man1
 
 %clean
 rm -rf %{buildroot}
@@ -89,7 +91,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README.rst docs/RELEASE_NOTES
-#%{_mandir}/man1/*
+%{_mandir}/man1/*
 %{python_sitelib}/gitbuildsys/cmd_build.py*
 %{python_sitelib}/gitbuildsys/cmd_changelog.py*
 %{python_sitelib}/gitbuildsys/cmd_chroot.py*