[pve-devel] r6444 - in pve2-api-doc/trunk: . data debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-10 12:00:04 +0200 (Wed, 10 Aug 2011)
New Revision: 6444

Modified:
   pve2-api-doc/trunk/Makefile
   pve2-api-doc/trunk/data/Makefile
   pve2-api-doc/trunk/debian/README
   pve2-api-doc/trunk/debian/changelog
   pve2-api-doc/trunk/debian/control
   pve2-api-doc/trunk/debian/pve2-api-doc.conf
   pve2-api-doc/trunk/debian/rules
Log:
generate html manual pages


Modified: pve2-api-doc/trunk/Makefile
===================================================================
--- pve2-api-doc/trunk/Makefile	2011-08-10 09:23:16 UTC (rev 6443)
+++ pve2-api-doc/trunk/Makefile	2011-08-10 10:00:04 UTC (rev 6444)
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 VERSION=2.0
-PKGREL=1
+PKGREL=4
 
 PACKAGE=pve2-api-doc
 

Modified: pve2-api-doc/trunk/data/Makefile
===================================================================
--- pve2-api-doc/trunk/data/Makefile	2011-08-10 09:23:16 UTC (rev 6443)
+++ pve2-api-doc/trunk/data/Makefile	2011-08-10 10:00:04 UTC (rev 6444)
@@ -1,6 +1,9 @@
 PREFIX=/usr
 DOCDIR=${PREFIX}/share/pve2-api-doc/
+MANPAGES=pvecm.1.html
 
+all: ${MANPAGES} apidoc.js
+
 apidata.js: extractapi.pl
 	./extractapi.pl >$@
 
@@ -9,19 +12,23 @@
 apidoc.js: ${JSSRC}
 	cat ${JSSRC} >$@
 
-all:
+%.1.html:
+	$* printmanpod|pod2html --noindex>$@
 
+
 .PHONY: install
-install: apidoc.js apidoc.html apidata.js
+install: apidoc.js apidoc.html apidata.js ${MANPAGES}
 	install -d -m 0755 ${DESTDIR}${DOCDIR}
 	install -D -m 0644 apidoc.html ${DESTDIR}${DOCDIR}/index.html;
 	install -D -m 0644 apidoc.js ${DESTDIR}${DOCDIR}/apidoc.js;
 	install -D -m 0644 apidata.js ${DESTDIR}${DOCDIR}/apidata.js;
+	install -d -m 0755 ${DESTDIR}${DOCDIR}/man
+	install -m 0644 ${MANPAGES} ${DESTDIR}${DOCDIR}/man
 
 #pvelib_DATA = apidoc.js apidoc.html
 #pvelibdir = ${WWW_ROOTDIR}
 
 clean:
-	-rm -rf *~ apidata.js apidoc.js
+	-rm -rf *~ apidata.js apidoc.js ${MANPAGES}
 
 

Modified: pve2-api-doc/trunk/debian/README
===================================================================
--- pve2-api-doc/trunk/debian/README	2011-08-10 09:23:16 UTC (rev 6443)
+++ pve2-api-doc/trunk/debian/README	2011-08-10 10:00:04 UTC (rev 6444)
@@ -5,7 +5,11 @@
 
 Now you should be able to access the documentation at:
 
-http://your-server/pve2-api-doc
+# API docu browser
+http://your-server/pve2-api-doc/
 
+# Manual pages
+http://your-server/pve2-api-doc/man/
 
 
+

Modified: pve2-api-doc/trunk/debian/changelog
===================================================================
--- pve2-api-doc/trunk/debian/changelog	2011-08-10 09:23:16 UTC (rev 6443)
+++ pve2-api-doc/trunk/debian/changelog	2011-08-10 10:00:04 UTC (rev 6444)
@@ -1,3 +1,9 @@
+pve2-api-doc (2.0-4) unstable; urgency=low
+
+  * update to pve-manager 2.0-4
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 10 Aug 2011 11:27:43 +0200
+
 pve2-api-doc (2.0-1) unstable; urgency=low
 
   * first try

Modified: pve2-api-doc/trunk/debian/control
===================================================================
--- pve2-api-doc/trunk/debian/control	2011-08-10 09:23:16 UTC (rev 6443)
+++ pve2-api-doc/trunk/debian/control	2011-08-10 10:00:04 UTC (rev 6444)
@@ -2,7 +2,7 @@
 Section: doc
 Priority: extra
 Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends: debhelper (>= 7.0.50~), pve-manager (= 2.0-1)
+Build-Depends: debhelper (>= 7.0.50~), pve-manager (= 2.0-4)
 Standards-Version: 3.8.4
 
 Package: pve2-api-doc

Modified: pve2-api-doc/trunk/debian/pve2-api-doc.conf
===================================================================
--- pve2-api-doc/trunk/debian/pve2-api-doc.conf	2011-08-10 09:23:16 UTC (rev 6443)
+++ pve2-api-doc/trunk/debian/pve2-api-doc.conf	2011-08-10 10:00:04 UTC (rev 6444)
@@ -3,5 +3,10 @@
 	Order allow,deny
         allow from all
 </Directory>
+<Directory /usr/share/pve2-api-doc/man>
+	Options Indexes
+	Order allow,deny
+        allow from all
+</Directory>
 
 Alias /pve2-api-doc/ /usr/share/pve2-api-doc/

Modified: pve2-api-doc/trunk/debian/rules
===================================================================
--- pve2-api-doc/trunk/debian/rules	2011-08-10 09:23:16 UTC (rev 6443)
+++ pve2-api-doc/trunk/debian/rules	2011-08-10 10:00:04 UTC (rev 6444)
@@ -14,4 +14,4 @@
 
 override_dh_install:
 	dh_install
-	install -D -m 0644 debian/pve2-api-doc.conf ${DESTDIR}/etc/apache2/sites-available/pve2-api-doc.conf
\ No newline at end of file
+	install -D -m 0644 debian/pve2-api-doc.conf ${DESTDIR}/etc/apache2/sites-available/pve2-api-doc.conf