diff --git a/.CHANGES.NEW b/.CHANGES.NEW index d24d6278c..5cb08b1ef 100644 --- a/.CHANGES.NEW +++ b/.CHANGES.NEW @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 4.2.0 + for UnrealIRCd 4.2.1-dev 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/configure b/configure index 92fc20bd6..bec217328 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.2.0. +# Generated by GNU Autoconf 2.69 for unrealircd 4.2.1-dev. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='4.2.0' -PACKAGE_STRING='unrealircd 4.2.0' +PACKAGE_VERSION='4.2.1-dev' +PACKAGE_STRING='unrealircd 4.2.1-dev' PACKAGE_BUGREPORT='http://bugs.unrealircd.org/' PACKAGE_URL='http://unrealircd.org/' @@ -1336,7 +1336,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.2.0 to adapt to many kinds of systems. +\`configure' configures unrealircd 4.2.1-dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1402,7 +1402,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 4.2.0:";; + short | recursive ) echo "Configuration of unrealircd 4.2.1-dev:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 4.2.0 +unrealircd configure 4.2.1-dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2167,7 +2167,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.2.0, which was +It was created by unrealircd $as_me 4.2.1-dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2576,7 +2576,7 @@ _ACEOF # Minor version number (e.g.: Z in X.Y.Z) -UNREAL_VERSION_MINOR="0" +UNREAL_VERSION_MINOR="1" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR @@ -2586,7 +2586,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="-dev" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX" @@ -9456,7 +9456,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.2.0, which was +This file was extended by unrealircd $as_me 4.2.1-dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9519,7 +9519,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.2.0 +unrealircd config.status 4.2.1-dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 411a7b147..cf88e3995 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.2.0], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) +AC_INIT([unrealircd], [4.2.1-dev], [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=["2"] 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=["0"] +UNREAL_VERSION_MINOR=["1"] 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=["-dev"] 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 d371951e3..99c7f635e 100644 --- a/doc/RELEASE-NOTES +++ b/doc/RELEASE-NOTES @@ -1,4 +1,4 @@ -UnrealIRCd 4.2.0 Release Notes +UnrealIRCd 4.2.1-dev Release Notes =============================== There have been so many changes in this and the last few 4.0.x versions, diff --git a/include/version.h b/include/version.h index b91d122d9..242944ec7 100644 --- a/include/version.h +++ b/include/version.h @@ -56,7 +56,7 @@ */ #define UNREAL_VERSION_TIME 201818 -#define UnrealProtocol 4200 +#define UnrealProtocol 4201 #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 536574e92..f5bbd990a 100644 --- a/include/win32/setup.h +++ b/include/win32/setup.h @@ -84,10 +84,10 @@ #define UNREAL_VERSION_MAJOR 2 /* Minor version number (e.g.: 1 for Unreal3.2.1) */ -#define UNREAL_VERSION_MINOR 0 +#define UNREAL_VERSION_MINOR 1 /* 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 "-dev" #endif diff --git a/src/version.c.SH b/src/version.c.SH index 70b52a2dd..8ed62e633 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.2.0" +id="4.2.1-dev" echo "$id" if test -r version.c diff --git a/src/win32/UnrealIRCd.exe.manifest b/src/win32/UnrealIRCd.exe.manifest index efc8674b3..444076a16 100644 --- a/src/win32/UnrealIRCd.exe.manifest +++ b/src/win32/UnrealIRCd.exe.manifest @@ -3,7 +3,7 @@ Internet Relay Chat Daemon diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index 5564595cf..c3e2e5301 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 4 -AppVerName=UnrealIRCd 4.2.0 +AppVerName=UnrealIRCd 4.2.1-dev AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org