Return version number to 1.7.x

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 528d7e460ecf8102c9b07866d7029088bcd77ddf..64ebbd0e3d460846f098e2e69b8e1f397590853f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@
 
 cmake_minimum_required(VERSION 3.1)
 project(ZNC VERSION 1.7.4)
-set(ZNC_VERSION 1.7.4)
-set(append_git_version false)
+set(ZNC_VERSION 1.7.x)
+set(append_git_version true)
 set(alpha_version "") # e.g. "-rc1"
 set(VERSION_EXTRA "" CACHE STRING
        "Additional string appended to version, e.g. to mark distribution")

diff --git a/configure.ac b/configure.ac
index 4277d18821606bf175e56d59bc13c355b7fb4f07..b755cfe802fe96736b60db7d6219a9df3eabb967 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u
 dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62
 AC_PREREQ([2.62])
 dnl Keep the version number in sync with version.h!
-AC_INIT([znc], [1.7.4])
-LIBZNC_VERSION=1.7.4
+AC_INIT([znc], [1.7.x])
+LIBZNC_VERSION=1.7.x
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/znc.cpp])
 AC_LANG([C++])

diff --git a/include/znc/version.h b/include/znc/version.h
index 1a1363039d55f9958e38328acec140e9c66c5d63..3f3fbab82c4181bc490946f9f4f84d9e2931a2df 100644 (file)
--- a/include/znc/version.h
+++ b/include/znc/version.h
@@ -20,9 +20,9 @@ limitations under the License.
 // The following defines are for #if comparison (preprocessor only likes ints)
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 7
-#define VERSION_PATCH 4
+#define VERSION_PATCH -1
 // This one is for display purpose and to check ABI compatibility of modules
-#define VERSION_STR "1.7.4"
+#define VERSION_STR "1.7.x"
 #endif
 
 // Don't use this one