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

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit 6a351446e87a7b17f9e1e59a621ad2e0411ca1c1
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Sat Jul 13 01:15:21 2013 +0300

    Split out HTML documentation to ganeti2-doc
    
    This allows users to install the HTML doclumentation on their PCs rather than
    the nodes. It also makes the ganeti2 package significantly smaller (3.5 MB
    instead of 6.7 MB for 2.7.0).

diff --git a/debian/control b/debian/control
index 95fea7a..7e57e54 100644
--- a/debian/control
+++ b/debian/control
@@ -27,13 +27,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
  openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
  openssl, python-simplejson, python-pyparsing, python-openssl,
  python-pyinotify, python-pycurl, python-paramiko,
- socat, libjs-jquery, fping, ganeti-haskell, libjs-underscore
+ socat, fping, ganeti-haskell
 Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
  xen-linux-system-amd64 | xen-linux-system-686 |
  xen-linux-system-686-pae, ganeti-instance-debootstrap,
  ndisc6
 Breaks: ganeti-htools (<< 0.3)
-Suggests: drbd8-module-source (>= 8.0.7), ganeti-htools
+Suggests: drbd8-module-source (>= 8.0.7), ganeti-htools, ganeti2-doc
 Provides: ${python:Provides}
 Description: Cluster-based virtualization management software
  Ganeti is a virtual server cluster management software tool built on top
@@ -71,3 +71,24 @@ Description: Cluster allocation tools for Ganeti
    - hspace, used for capacity calculation
    - hscan, used to gather cluster files for offline use in hbal/hspace
    - hroller, used to calculate rolling maintenances
+
+Package: ganeti2-doc
+Architecture: all
+Section: doc
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery, libjs-underscore
+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
+ setting it up it will provide you with an automated environment to
+ manage highly available virtual machine instances.
+ .
+ It has been designed to facilitate cluster management of virtual servers
+ and to provide fast and simple recovery after physical failures using
+ commodity hardware.
+ .
+ It will take care of operations such as redundant disk creation and
+ management, operating system installation  (in cooperation with OS-specific
+ install scripts), startup, shutdown, failover of instances between physical
+ systems.
+ .
+ This package contains the full HTML documentation for Ganeti.
diff --git a/debian/docs b/debian/docs
index f12cf27..9eafbe1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 README
 NEWS
-doc/html
diff --git a/debian/ganeti2-doc.dirs b/debian/ganeti2-doc.dirs
new file mode 100644
index 0000000..8e1c932
--- /dev/null
+++ b/debian/ganeti2-doc.dirs
@@ -0,0 +1 @@
+/usr/share/doc/ganeti2-doc
diff --git a/debian/doc-base b/debian/ganeti2-doc.doc-base
similarity index 64%
rename from debian/doc-base
rename to debian/ganeti2-doc.doc-base
index 691c38a..458121f 100644
--- a/debian/doc-base
+++ b/debian/ganeti2-doc.doc-base
@@ -4,5 +4,5 @@ Abstract: This manual describes installation, administration and general use asp
 Section: System/Administration
 
 Format: HTML
-Index: /usr/share/doc/ganeti2/html/index.html
-Files: /usr/share/doc/ganeti2/html/*.html
+Index: /usr/share/doc/ganeti2-doc/html/index.html
+Files: /usr/share/doc/ganeti2-doc/html/*.html
diff --git a/debian/ganeti2-doc.docs b/debian/ganeti2-doc.docs
new file mode 100644
index 0000000..0bd3136
--- /dev/null
+++ b/debian/ganeti2-doc.docs
@@ -0,0 +1 @@
+doc/html
diff --git a/debian/ganeti2-doc.links b/debian/ganeti2-doc.links
new file mode 100644
index 0000000..fec3ab7
--- /dev/null
+++ b/debian/ganeti2-doc.links
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/ganeti2-doc/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/ganeti2-doc/html/_static/underscore.js
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 52ae860..0000000
--- a/debian/links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/ganeti2/html/_static/jquery.js
-usr/share/javascript/underscore/underscore.js usr/share/doc/ganeti2/html/_static/underscore.js

-- 
Ganeti packaging