[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.0.6-2-20-g7fef725

[Iustin Pop]

The following commit has been merged in the master branch:
commit aa82fd1dc934fab4e01581404ec556f282bc6f44
Author: Iustin Pop <iustin at debian.org>
Date:   Sat Apr 17 17:22:41 2010 +0200

    Update doc-base for 2.1's sphinx documentation
    
    Also install the html docs.

diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000..691c38a
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,8 @@
+Document: ganeti
+Title: Ganeti manual
+Abstract: This manual describes installation, administration and general use aspects of Ganeti
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/ganeti2/html/index.html
+Files: /usr/share/doc/ganeti2/html/*.html
diff --git a/debian/doc-base.admin b/debian/doc-base.admin
deleted file mode 100644
index 8ae4027..0000000
--- a/debian/doc-base.admin
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: ganeti-admin
-Title: Ganeti Administration manual
-Abstract: This manual describes administration aspects of Ganeti
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/ganeti2/admin.html
-Files: /usr/share/doc/ganeti2/admin.html
diff --git a/debian/doc-base.hooks b/debian/doc-base.hooks
deleted file mode 100644
index 8defed0..0000000
--- a/debian/doc-base.hooks
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: ganeti-hooks
-Title: Customising Ganeti via hooks
-Abstract: This manual describes how to customize the operation of Ganeti via
- hooks, what operations can be restricted and how to write hook scripts
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/ganeti2/hooks.html
-Files: /usr/share/doc/ganeti2/hooks.html
diff --git a/debian/doc-base.iallocator b/debian/doc-base.iallocator
deleted file mode 100644
index 2a6825e..0000000
--- a/debian/doc-base.iallocator
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: ganeti-iallocator
-Title: Ganeti IAllocator interface
-Abstract: This manual describes the IAllocator framework for Ganeti,
- which delegates instance placement decisions to external scripts
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/ganeti2/iallocator.html
-Files: /usr/share/doc/ganeti2/iallocator.html
diff --git a/debian/doc-base.install b/debian/doc-base.install
deleted file mode 100644
index 8d72209..0000000
--- a/debian/doc-base.install
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: ganeti-install
-Title: Ganeti installation guide
-Abstract: This manual describes the installation of Ganeti, requirements
- and cluster initialisation
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/ganeti2/install.html
-Files: /usr/share/doc/ganeti2/install.html
diff --git a/debian/docs b/debian/docs
index 9eafbe1..f12cf27 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,3 @@
 README
 NEWS
+doc/html

-- 
Ganeti packaging