[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.7.0-1-54-g1fd06ae

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit e130dcfb49bedccf5aa84e7e7542a89054e11b8f
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Sun Jul 28 05:10:43 2013 +0300

    Build-Depend on sphinx and rebuild documentation

diff --git a/debian/changelog b/debian/changelog
index 7f47af4..8f1f40f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ganeti (2.7.1-1) unstable; urgency=low
 
   * New upstream version
+  * Rebuild the sphinx documentation and use dh_sphinxdoc (Closes: #718026)
   * Drop the following patches already merged upstream:
     - 0001-daemon-util-pass-oknodo-at-rotate_logs.patch
     - 0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
diff --git a/debian/control b/debian/control
index c97e3ca..0c2dc4c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 9),
  libghc-regex-pcre-dev, libghc-attoparsec-dev, libghc-vector-dev, libpcre3-dev,
  python-simplejson, python-pyparsing, python-openssl, python-bitarray,
  python-support (>= 0.6), python-pyinotify, python-pycurl,
- python-paramiko, python-ipaddr, qemu-utils,
- socat, iproute, procps, shelltestrunner
+ python-paramiko, python-ipaddr, python-sphinx (>= 1.0.7+dfsg), graphviz,
+ qemu-utils, socat, iproute, procps, shelltestrunner
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.5
 Homepage: http://code.google.com/p/ganeti/
@@ -98,7 +98,7 @@ Description: Cluster allocation tools for Ganeti
 Package: ganeti-doc
 Architecture: all
 Section: doc
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery, libjs-underscore
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${sphinxdoc:Depends}
 Description: Cluster-based virtualization management software - documentation
  Ganeti is a virtual server cluster management software tool built on top
  of the Xen virtual machine monitor and other Open Source software. After
diff --git a/debian/ganeti-doc.links b/debian/ganeti-doc.links
deleted file mode 100644
index fa67c3a..0000000
--- a/debian/ganeti-doc.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/ganeti-doc/html/_static/jquery.js
-usr/share/javascript/underscore/underscore.js usr/share/doc/ganeti-doc/html/_static/underscore.js
diff --git a/debian/rules b/debian/rules
index 8a7370a..47c35c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,sphinxdoc
 
 override_dh_auto_configure:
 	./configure \
@@ -29,9 +29,17 @@ override_dh_auto_clean:
 	rm -f debian/ganeti.cron.d
 	rm -f debian/ganeti.default
 	rm -f debian/ganeti.logrotate
-
+	if [ -d doc/html.orig ]; then \
+		rm -rf doc/html; \
+		mv doc/html.orig doc/html; \
+	fi
 	dh_auto_clean
 
+override_dh_auto_build:
+	dh_auto_build
+	mv doc/html doc/html.orig
+	$(MAKE) doc/html
+
 override_dh_auto_install:
 	dh_auto_install
 	cp $(CURDIR)/doc/examples/ganeti.initd $(CURDIR)/debian/ganeti.init

-- 
Ganeti packaging