From: Kefu Chai <kchai@redhat.com>
Date: Tue, 24 May 2016 06:08:05 +0000 (+0800)
Subject: admin/build-doc: use doc_deps.deb.txt for build-deps instead
X-Git-Tag: v11.0.0~379^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9284%2Fhead;p=ceph.git

admin/build-doc: use doc_deps.deb.txt for build-deps instead

also update `doc_deps.deb.txt` according to the changes in build-doc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/admin/build-doc b/admin/build-doc
index 053ff492552f..45b8974a9190 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -7,20 +7,7 @@ TOPDIR=`pwd`
 install -d -m0755 build-doc
 
 if command -v dpkg >/dev/null; then
-    packages='
-      git
-      gcc
-      python-dev
-      python-pip
-      python-virtualenv
-      libxml2-dev
-      libxslt1-dev
-      doxygen
-      ditaa
-      graphviz
-      ant
-      cython
-      zlib1g-dev'
+    packages=`cat ${TOPDIR}/doc_deps.deb.txt`
     for package in $packages; do
     if [ "$(dpkg --status -- $package 2>&1 | sed -n 's/^Status: //p')" != "install ok installed" ]; then
         # add a space after old values
diff --git a/doc_deps.deb.txt b/doc_deps.deb.txt
index 2020ca783be8..2b8041bb5681 100644
--- a/doc_deps.deb.txt
+++ b/doc_deps.deb.txt
@@ -1,10 +1,12 @@
+git
+gcc
 python-dev
 python-pip
 python-virtualenv
 doxygen
 ditaa
 libxml2-dev
-libxslt-dev
+libxslt1-dev
 graphviz
 ant
 zlib1g-dev