improve package dependencies, add README

diff --git a/Makefile b/Makefile
index 2a1ffddcac6c052d81d14f1881197e49bf37a0b3..87d6059558ebfd18343ab3b088703adf44bd851c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -170,8 +170,8 @@ api-viewer/apidoc.js: api-viewer/apidata.js api-viewer/PVEAPI.js
        cat api-viewer/apidata.js api-viewer/PVEAPI.js >$@
 
 .PHONY: dinstall
-dinstall: ${GEN_DEB}
-       dpkg -i ${GEN_DEB}
+dinstall: ${GEN_DEB} ${DOC_DEB}
+       dpkg -i ${GEN_DEB} ${DOC_DEB}
 
 
 .PHONY: deb

diff --git a/debian/control b/debian/control
index f855fcc32e239bcf39504cd58f55d34f80da065b..6ca1de48e013c3d192f75780446c882e3d92b414 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,6 @@ Package: pve-doc-generator
 Section: perl
 Priority: optional
 Architecture: any
-Depends: libpve-common-perl, asciidoc
+Depends: ${perl:Depends}, libpve-common-perl, asciidoc
 Description: Proxmox VE Documentation helpers
  Tool to auto-generate various Proxmox VE Documentation files.

diff --git a/doc-debian/README b/doc-debian/README
new file mode 100644 (file)
index 0000000..29b1440
--- /dev/null
+++ b/doc-debian/README
@@ -0,0 +1,14 @@
+To enable the apache site use:
+
+# a2ensite pve-docs.conf
+# /etc/init.d/apache2 reload
+
+Now you should be able to access the documentation at:
+
+* Admin Guide and Manual pages
+http://your-server/pve-docs
+
+* API Viewer
+http://your-server/pve-docs/api-viewer
+
+

diff --git a/doc-debian/control b/doc-debian/control
index 3ffa04c95d41a9958768fc02db564f53f04796b5..cef7fdcc142b1a98ab9de24f50e11053fbdf695c 100644 (file)
--- a/doc-debian/control
+++ b/doc-debian/control
@@ -1,14 +1,14 @@
 Source: pve-docs
-Section: perl
+Section: doc
 Priority: extra
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: debhelper (>= 7.0.50~), lintian
 Standards-Version: 3.8.4
 
 Package: pve-docs
-Section: doc
-Priority: optional
 Architecture: all
-Depends: apache2
+Depends: ${misc:Depends}
+Suggests: apache2
 Description: Proxmox VE Documentation
- This package contains the Proxmox VE Documentation files.
+ This package contains the Proxmox VE Documentation files, and apache2
+ configuration files to serve them.

diff --git a/doc-debian/docs b/doc-debian/docs
new file mode 100644 (file)
index 0000000..df6f1f3
--- /dev/null
+++ b/doc-debian/docs
@@ -0,0 +1 @@
+debian/README