ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release-1.28'

This commit is contained in:
Andrew Bauer 2014-10-19 07:44:27 -05:00
parent fcf39fc9fa 71b56a163d
commit 408bbbd535
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@
#
cmake_minimum_required (VERSION 2.6)
project (zoneminder)
set(zoneminder_VERSION "1.27.99.0")
set(zoneminder_VERSION "1.28.0")
# CMake does not allow out-of-source build if CMakeCache.exists in the source folder. Abort and notify the user to save him from headache why it doesn't work.
if((NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))

2
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ(2.59)
AC_INIT(zm,1.27.99.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
AC_INIT(zm,1.28.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR(src/zm.h)
AC_CONFIG_HEADERS(config.h)

6
db/zm_update-1.28.0.sql Normal file
View File

@ -0,0 +1,6 @@
--
-- This updates a 1.27.99 database to 1.28.0
--
-- No changes required
--

6
distros/debian/changelog
View File

@ -1,3 +1,9 @@
zoneminder (1.28.0-testing) testing; urgency=medium
* Release
-- Isaac Connor <iconnor@connortechnology.com> Fri, 17 Oct 2014 09:27:22 -0400
zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium
* improve error messages

6
distros/ubuntu1204/changelog
View File

@ -1,3 +1,9 @@
zoneminder (1.28.0-trusty) trusty; urgency=medium
* Release
-- Isaac Connor <iconnor@connortechnology.com> Fri, 17 Oct 2014 09:25:55 -0400
zoneminder (1.27.99+1-trusty-SNAPSHOT2014101401) trusty; urgency=medium
* Several PR merges in big push for 1.28.0