From b5a76921e4d066fe93985ec5f8968f94bc2fc30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Sat, 21 Nov 2009 16:08:36 +0000 Subject: [PATCH] - next is 1.4.26 git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2695 152afb58-edef-0310-8abb-c4023f1b3aa9 --- CMakeLists.txt | 2 +- NEWS | 5 ++++- SConstruct | 2 +- configure.ac | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35586dec..47595b9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ ENABLE_TESTING() SET(CPACK_PACKAGE_VERSION_MAJOR 1) SET(CPACK_PACKAGE_VERSION_MINOR 4) -SET(CPACK_PACKAGE_VERSION_PATCH 25) +SET(CPACK_PACKAGE_VERSION_PATCH 26) SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") diff --git a/NEWS b/NEWS index fa02c182..12a22079 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,10 @@ NEWS ==== -- 1.4.25 - +- 1.4.26 - + * + +- 1.4.25 - 2009-11-21 * mod_magnet: fix pairs() for normal tables and strings (fixes #1307) * mod_magnet: add traceback for printing lua errors * mod_rewrite: fix compile error if compiled without pcre diff --git a/SConstruct b/SConstruct index 9b41657d..3e03e38f 100644 --- a/SConstruct +++ b/SConstruct @@ -5,7 +5,7 @@ import string from stat import * package = 'lighttpd' -version = '1.4.25' +version = '1.4.26' def checkCHeaders(autoconf, hdrs): p = re.compile('[^A-Z0-9]') diff --git a/configure.ac b/configure.ac index 4a0571e5..2a2ad35e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([lighttpd], [1.4.25], [contact@lighttpd.net]) +AC_INIT([lighttpd], [1.4.26], [contact@lighttpd.net]) AC_CONFIG_SRCDIR([src/server.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4])