Merge remote-tracking branch 'origin/4.15'
diff --git a/source/_global.rst b/source/_global.rst
index b53f524..1b49bc7 100644
--- a/source/_global.rst
+++ b/source/_global.rst
@@ -25,19 +25,19 @@
.. Latest version systemvm template name
-.. |sysvm64-version| replace:: 4.15.0
-.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.15.0
-.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.15.0
-.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.15.0
-.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.15.0
-.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.15.0
+.. |sysvm64-version| replace:: 4.16.0
+.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.16.0
+.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.16.0
+.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.16.0
+.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.16.0
+.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.16.0
.. Latest version systemvm template URL
-.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-xen.vhd.bz2
-.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-vmware.ova
-.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-hyperv.vhd.zip
-.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-ovm.raw.bz2
+.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-xen.vhd.bz2
+.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-vmware.ova
+.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-hyperv.vhd.zip
+.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-ovm.raw.bz2
.. Version specific: 4.5 systemvm template URL
.. |acs45-sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
diff --git a/source/conf.py b/source/conf.py
index 06b219b..55fb01d 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -24,9 +24,9 @@
author = 'Apache CloudStack Project'
# The short X.Y version
-version = '4.15'
+version = '4.16'
# The full version, including alpha/beta/rc tags
-release = '4.15.0.0'
+release = '4.16.0.0'
rst_epilog = """
.. include:: /_global.rst
diff --git a/source/installguide/building_from_source.rst b/source/installguide/building_from_source.rst
index 21000e6..e7b6e64 100644
--- a/source/installguide/building_from_source.rst
+++ b/source/installguide/building_from_source.rst
@@ -271,14 +271,15 @@
$ mvn -P deps
Now that we have resolved the dependencies we can move on to building
-CloudStack and packaging them into DEBs by issuing the following
-command.
+CloudStack and packaging them into DEBs by running the script in ``packaging`` folder:
+
.. parsed-literal::
- $ dpkg-buildpackage -uc -us
+ $ cd packaging/
+ $ ./build-deb.sh
-This command will build the following debian packages. You should have
+This script will build the following debian packages. You should have
all of the following:
.. parsed-literal::
@@ -573,3 +574,11 @@
#. Once you've built CloudStack with the ``noredist`` profile, you can
package it using the `“Building RPMs from Source” <#building-rpms-from-source>`_
or `“Building DEB packages” <#building-deb-packages>`_ instructions.
+
+.. note::
+
+ In case you are building debian packages via script ``packaging/build-deb.sh``, you will need to export the following configuration:
+
+.. parsed-literal::
+
+ $ export ACS_BUILD_OPTS="-Dnoredist -Dnonoss"
