Update for next release

NagiosEnterprises · Jan 3, 2017 · 5ca7ceb · 5ca7ceb
1 parent a49d4ec
commit 5ca7ceb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,7 @@
 Changelog
 +++++++++
 
-2.0.1 - 12/??/2016
+2.0.1 - 01/03/2017
 ==================
 - Updated popover info boxes so they auto-hide when no longer in focus (once you click anywhere but the ?)
 - Updated Windows service log file locations to var/log/win32service_ncpa<type>.log (logs for the services not NCPA)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -25,7 +25,7 @@ been installed and working.
 
 You will need to install git for windows. Then, download and install:
 
-* `Python 2.7.12 on Windows <https://www.python.org/downloads/release/python-2712/>`_
+* `Python 2.7.13 on Windows <https://www.python.org/downloads/release/python-2713/>`_
 * OpenSSL for Windows (`Download <https://slproweb.com/download/Win32OpenSSL-1_1_0c.exe>`_)
 
 To set up the python requirements, in `cmd.exe` clone the NCPA repo and run::

diff --git a/LICENSE.rst b/LICENSE.rst
@@ -1,6 +1,6 @@
 Nagios Open Software License Version 1.3
 
-Copyright (c) 2010-2016 Nagios Enterprises, LLC
+Copyright (c) 2010-2017 Nagios Enterprises, LLC
 
 Nagios Enterprises, LLC (the "Company") hereby grants, free of charge, to any person, company, or legal entity (each a "User") obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software (each a "Use"), and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README.rst b/README.rst
@@ -11,6 +11,8 @@ Current versions:
 +---------+-------------+----------------------------------------------------------------------+
 | Current | **2.0.0**   | `Downloads <https://assets.nagios.com/downloads/ncpa/download.php>`_ |
 +---------+-------------+----------------------------------------------------------------------+
+| Dev     | **2.0.1**   | `Downloads <https://assets.nagios.com/downloads/ncpa/dev/`_          |
++---------+-------------+----------------------------------------------------------------------+
 
 `Older Versions <https://assets.nagios.com/downloads/ncpa/archived/>`_
 
@@ -36,7 +38,6 @@ Documentation
 
 You can view the most current `HTML documentation <https://nagios.org/ncpa/help.php>`_ online or view your current NCPA version's documentation using the NCPA web GUI from an installed agent. This is recommended if you are using an older version, since some features may not be available but may be used in newer documents.
 
-
 Advanced
 --------
 

diff --git a/agent/build_resources/ncpa.nsi b/agent/build_resources/ncpa.nsi
@@ -70,7 +70,7 @@ VIProductVersion ${NCPA_VERSION_CLEAN}.0
 VIAddVersionKey "ProductName" "${NAME}"
 VIAddVersionKey "CompanyName" "${COMPANY}"
 VIAddVersionKey "FileVersion" ${NCPA_VERSION}
-VIAddVersionKey "LegalCopyright" "2014-2016 ${COMPANY}"
+VIAddVersionKey "LegalCopyright" "2014-2017 ${COMPANY}"
 VIAddVersionKey "FileDescription" "NCPA Setup"
 
 ; Language values for pages

diff --git a/build/Makefile b/build/Makefile
@@ -43,9 +43,9 @@ build_spec: build_tarball
 	cat ncpa-partial.spec | sed s/__VERSION__/$(NCPAVER)/g | sed s@__BUILDROOT__@$(BUILDROOT)@g > ncpa.spec
 
 clean:
-	rm -rf ncpa-$(NCPAVER)
+	rm -rf ncpa-*
 	rm -rf $(BASEDIR)/agent/build
-	rm -rf NCPA-INSTALL-$(NCPAVER)
+	rm -rf NCPA-INSTALL-*
 	rm -f *.rpm
 	rm -f *.dmg
 	rm -f *.deb