DOC_PACKAGE=pve-docs
# also update debian/changelog
-GEN_PKGREL=3
-# also update doc-debian/changelog
-DOC_PKGREL=4
+PKGREL=5
GITVERSION:=$(shell cat .git/refs/heads/master)
-GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${GEN_PKGREL}_amd64.deb
-DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${DOC_PKGREL}_all.deb
+GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_amd64.deb
+DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
CHAPTER_LIST= \
sysadmin \
make ${GEN_DEB};
make ${DOC_DEB};
-${DOC_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPORTS} ${API_VIEWER_SOURCES}
+${GEN_DEB} ${DOC_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPORTS} ${API_VIEWER_SOURCES} ${GEN_DEB_SOURCES}
rm -rf build
mkdir build
- rsync -a doc-debian/ build/debian
+ rsync -a debian/ build/debian
+ echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
+ # install files for pve-doc-generator package
+ mkdir -p build/usr/share/${GEN_PACKAGE}
+ mkdir -p build/usr/share/doc/${GEN_PACKAGE}
+ install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
+ install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
+ # install files for pvedocs package
mkdir -p build/usr/share/${DOC_PACKAGE}
mkdir -p build/usr/share/doc/${DOC_PACKAGE}
- echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/usr/share/doc/${DOC_PACKAGE}/SOURCE
- # install doc files
install -m 0644 index.html ${INDEX_INCLUDES} build/usr/share/${DOC_PACKAGE}
install -m 0644 ${WIKI_IMPORTS} build/usr/share/${DOC_PACKAGE}
# install api doc viewer
mkdir build/usr/share/${DOC_PACKAGE}/api-viewer
install -m 0644 ${API_VIEWER_SOURCES} build/usr/share/${DOC_PACKAGE}/api-viewer
- cd build; dpkg-buildpackage -rfakeroot -b -us -uc
- lintian ${DOC_DEB}
-
-${GEN_DEB}: ${GEN_DEB_SOURCES}
- rm -rf build
- mkdir build
- rsync -a debian/ build/debian
- mkdir -p build/usr/share/${GEN_PACKAGE}
- mkdir -p build/usr/share/doc/${GEN_PACKAGE}
- echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/usr/share/doc/${GEN_PACKAGE}/SOURCE
- install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
- install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
+ # build debain package
cd build; dpkg-buildpackage -rfakeroot -b -us -uc
lintian ${GEN_DEB}
+ lintian ${DOC_DEB}
.PHONY: upload
upload: ${GEN_DEB} ${DOC_DEB}
-pve-doc-generator (4.2-3) unstable; urgency=medium
+pve-docs (4.2-5) unstable; urgency=medium
+
+ * fix package build system (single debian dir)
+
+ * cleanup pve-docs package - only include documentation files
+
+ -- Proxmox Support Team <support@proxmox.com> Wed, 25 May 2016 07:17:03 +0200
+
+pve-docs (4.2-3) unstable; urgency=medium
* update generated docs
-- Proxmox Support Team <support@proxmox.com> Thu, 19 May 2016 17:31:19 +0200
-pve-doc-generator (4.2-2) unstable; urgency=medium
+pve-docs (4.2-2) unstable; urgency=medium
* update generated docs
-- Proxmox Support Team <support@proxmox.com> Wed, 11 May 2016 11:12:03 +0200
-pve-doc-generator (4.2-1) unstable; urgency=medium
+pve-docs (4.2-1) unstable; urgency=medium
* set RELEASE to 4.2
-- Proxmox Support Team <support@proxmox.com> Fri, 29 Apr 2016 09:26:04 +0200
-pve-doc-generator (4.1-1) unstable; urgency=medium
+pve-docs (4.1-1) unstable; urgency=medium
* first release
-Source: pve-doc-generator
+Source: pve-docs
Section: perl
Priority: extra
Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 7.0.50~), lintian
+Build-Depends: debhelper (>= 7.0.50~), lintian, asciidoc, xmlto
Standards-Version: 3.8.4
Package: pve-doc-generator
Section: perl
-Priority: optional
Architecture: any
Depends: ${perl:Depends}, libpve-common-perl, asciidoc, xmlto
Description: Proxmox VE Documentation helpers
Tool to auto-generate various Proxmox VE Documentation files and
manual pages. This package is required to build most other Proxmox VE
packages.
+
+Package: pve-docs
+Section: doc
+Architecture: all
+Description: Proxmox VE Documentation
+ This package contains the Proxmox VE Documentation files.
--- /dev/null
+debian/SOURCE
--- /dev/null
+/usr/share/pve-doc-generator
--- /dev/null
+debian/SOURCE
--- /dev/null
+/usr/share/pve-docs
+++ /dev/null
-pve-docs (4.2-4) unstable; urgency=medium
-
- * update generated docs
-
- * include options into pct and qm manual page
-
- -- Proxmox Support Team <support@proxmox.com> Thu, 19 May 2016 17:32:33 +0200
-
-pve-docs (4.2-3) unstable; urgency=medium
-
- * update generated docs
-
- -- Proxmox Support Team <support@proxmox.com> Wed, 11 May 2016 11:14:03 +0200
-
-pve-docs (4.2-2) unstable; urgency=medium
-
- * add api-viewer
-
- -- Proxmox Support Team <support@proxmox.com> Fri, 29 Apr 2016 14:36:23 +0200
-
-pve-docs (4.2-1) unstable; urgency=medium
-
- * first release
-
- -- Proxmox Support Team <support@proxmox.com> Fri, 29 Apr 2016 10:01:01 +0200
-
+++ /dev/null
-Source: pve-docs
-Section: doc
-Priority: extra
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 7.0.50~), lintian, asciidoc, xmlto
-Standards-Version: 3.8.4
-
-Package: pve-docs
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: apache2
-Description: Proxmox VE Documentation
- This package contains the Proxmox VE Documentation files, and apache2
- configuration files to serve them.
+++ /dev/null
-Coryright for files in debian/*:
-
- Copyright (C) 2016 Proxmox Server Solutions GmbH
-
- This software is written by Proxmox Server Solutions GmbH
- <support@proxmox.com>
-
- This program is free software: you can redistribute it and/or
- modify it under the terms of the GNU Affero General Public License
- as published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
-
-
-All documentation files (*.adoc, *.html, *.pdf) are release under:
-
- Copyright (C) 2016 Proxmox Server Solutions GmbH
-
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.3
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
-
- You can find a copy of the license in /usr/share/common-licenses/GFDL.
\ No newline at end of file
+++ /dev/null
-/usr/share/
+++ /dev/null
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
- dh $@
projects / pve-docs.git / commitdiff