From 2bbdf22d7602b943a41357ea0c3ccae397cdccf7 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Fri, 29 Dec 2017 09:29:03 +0100 Subject: [PATCH] Set git version to 4.0.18-devel --- .CHANGES.NEW | 2 +- Config | 2 +- configure | 22 +++++++++++----------- configure.ac | 6 +++--- doc/RELEASE-NOTES | 8 ++++++-- include/version.h | 2 +- include/win32/setup.h | 4 ++-- src/version.c.SH | 2 +- src/win32/unrealinst.iss | 2 +- 9 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.CHANGES.NEW b/.CHANGES.NEW index 95d08b1b9..f79313b57 100644 --- a/.CHANGES.NEW +++ b/.CHANGES.NEW @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 4.0.17 + for UnrealIRCd 4.0.18-devel This program will help you to compile your IRC server, and ask you questions regarding the compile-time settings of it during the process. diff --git a/Config b/Config index 16071ed77..d8a7a3f49 100755 --- a/Config +++ b/Config @@ -452,7 +452,7 @@ echo "" if [ -z "$NOCACHE" ] ; then # This needs to be updated each release so auto-upgrading works for settings, modules, etc!!: - UNREALRELEASES="unrealircd-4.0.17-rc1 unrealircd-4.0.16.1 unrealircd-4.0.16 unrealircd-4.0.15 unrealircd-4.0.14 unrealircd-4.0.14-rc1 unrealircd-4.0.13 unrealircd-4.0.13-rc1 unrealircd-4.0.12.1 unrealircd-4.0.12 unrealircd-4.0.11 unrealircd-4.0.10 unrealircd-4.0.9 unrealircd-4.0.8.4 unrealircd-4.0.8.3 unrealircd-4.0.8.2 unrealircd-4.0.8.1" + UNREALRELEASES="unrealircd-4.0.17 unrealircd-4.0.17-rc1 unrealircd-4.0.16.1 unrealircd-4.0.16 unrealircd-4.0.15 unrealircd-4.0.14 unrealircd-4.0.14-rc1 unrealircd-4.0.13 unrealircd-4.0.13-rc1 unrealircd-4.0.12.1 unrealircd-4.0.12 unrealircd-4.0.11 unrealircd-4.0.10 unrealircd-4.0.9 unrealircd-4.0.8.4 unrealircd-4.0.8.3 unrealircd-4.0.8.2 unrealircd-4.0.8.1" if [ -f "config.settings" ]; then . ./config.settings else diff --git a/configure b/configure index 15b0832f6..5ce8ebdfc 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unrealircd 4.0.17. +# Generated by GNU Autoconf 2.69 for unrealircd 4.0.18-devel. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='4.0.17' -PACKAGE_STRING='unrealircd 4.0.17' +PACKAGE_VERSION='4.0.18-devel' +PACKAGE_STRING='unrealircd 4.0.18-devel' PACKAGE_BUGREPORT='http://bugs.unrealircd.org/' PACKAGE_URL='http://unrealircd.org/' @@ -1318,7 +1318,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unrealircd 4.0.17 to adapt to many kinds of systems. +\`configure' configures unrealircd 4.0.18-devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 4.0.17:";; + short | recursive ) echo "Configuration of unrealircd 4.0.18-devel:";; esac cat <<\_ACEOF @@ -1535,7 +1535,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 4.0.17 +unrealircd configure 4.0.18-devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2141,7 +2141,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unrealircd $as_me 4.0.17, which was +It was created by unrealircd $as_me 4.0.18-devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2550,7 +2550,7 @@ _ACEOF # Minor version number (e.g.: Z in X.Y.Z) -UNREAL_VERSION_MINOR="17" +UNREAL_VERSION_MINOR="18" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR @@ -2560,7 +2560,7 @@ _ACEOF # The version suffix such as a beta marker or release candidate # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a # string instead of an integer because it contains arbitrary data. -UNREAL_VERSION_SUFFIX="" +UNREAL_VERSION_SUFFIX="-devel" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX" @@ -9085,7 +9085,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unrealircd $as_me 4.0.17, which was +This file was extended by unrealircd $as_me 4.0.18-devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9148,7 +9148,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unrealircd config.status 4.0.17 +unrealircd config.status 4.0.18-devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index fbfecd7fc..2b7798f4e 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl src/win32/unrealinst.iss dnl .CHANGES.NEW dnl src/version.c.SH -AC_INIT([unrealircd], [4.0.17], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) +AC_INIT([unrealircd], [4.0.18-devel], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) AC_CONFIG_SRCDIR([src/ircd.c]) AC_CONFIG_HEADER([include/setup.h]) AC_CONFIG_AUX_DIR([autoconf]) @@ -36,13 +36,13 @@ UNREAL_VERSION_MAJOR=["0"] AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: Y for X.Y.Z)]) # Minor version number (e.g.: Z in X.Y.Z) -UNREAL_VERSION_MINOR=["17"] +UNREAL_VERSION_MINOR=["18"] AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor version number (e.g.: Z for X.Y.Z)]) # The version suffix such as a beta marker or release candidate # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a # string instead of an integer because it contains arbitrary data. -UNREAL_VERSION_SUFFIX=[""] +UNREAL_VERSION_SUFFIX=["-devel"] AC_DEFINE_UNQUOTED([UNREAL_VERSION_SUFFIX], ["$UNREAL_VERSION_SUFFIX"], [Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX)]) AC_PROG_CC diff --git a/doc/RELEASE-NOTES b/doc/RELEASE-NOTES index 4c1dd2ad9..8b9c88f50 100644 --- a/doc/RELEASE-NOTES +++ b/doc/RELEASE-NOTES @@ -1,5 +1,9 @@ -UnrealIRCd 4.0.17 Release Notes -================================ +UnrealIRCd 4.0.18-devel Release Notes +====================================== + +UnrealIRCd 4.0.18-devel is work in progress. There are no release notes. + +For the release notes of previous version, see below: ==[ CHANGES BETWEEN 4.0.16.1 AND 4.0.17 ]== diff --git a/include/version.h b/include/version.h index 4e9c59b11..a76fd22df 100644 --- a/include/version.h +++ b/include/version.h @@ -56,7 +56,7 @@ */ #define UNREAL_VERSION_TIME 201552 -#define UnrealProtocol 4017 +#define UnrealProtocol 4018 #define PATCH1 macro_to_str(UNREAL_VERSION_GENERATION) #define PATCH2 "." macro_to_str(UNREAL_VERSION_MAJOR) #define PATCH3 "." macro_to_str(UNREAL_VERSION_MINOR) diff --git a/include/win32/setup.h b/include/win32/setup.h index 315d7ea0d..6d3b5f81b 100644 --- a/include/win32/setup.h +++ b/include/win32/setup.h @@ -84,10 +84,10 @@ #define UNREAL_VERSION_MAJOR 0 /* Minor version number (e.g.: 1 for Unreal3.2.1) */ -#define UNREAL_VERSION_MINOR 17 +#define UNREAL_VERSION_MINOR 18 /* Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX) */ -#define UNREAL_VERSION_SUFFIX "" +#define UNREAL_VERSION_SUFFIX "-devel" #endif diff --git a/src/version.c.SH b/src/version.c.SH index c0a425609..88ed6c40e 100644 --- a/src/version.c.SH +++ b/src/version.c.SH @@ -4,7 +4,7 @@ echo "Extracting src/version.c..." #id=`grep '$Id: Changes,v' ../Changes` #id=`echo $id |sed 's/.* Changes\,v \(.*\) .* Exp .*/\1/'` -id="4.0.17" +id="4.0.18-devel" echo "$id" if test -r version.c diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index 690e35aa1..3de4272db 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 4 -AppVerName=UnrealIRCd 4.0.17 +AppVerName=UnrealIRCd 4.0.18-devel AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org