From dc6d86efdb44246b7974ac6c673be826cd80ea04 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 31 Mar 2018 18:00:15 -0700 Subject: [PATCH] Convert to a two-digit version number. --- CMakeLists.txt | 6 ++---- libgnucash/core-utils/gnc-prefs.c | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8e0adf461..50b298ce20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,15 +12,13 @@ ENABLE_TESTING() # Version number of gnucash SET (GNUCASH_MAJOR_VERSION 2) -SET (GNUCASH_MINOR_VERSION 7) -SET (GNUCASH_MICRO_VERSION 8) -SET (GNUCASH_NANO_VERSION 0) +SET (GNUCASH_MINOR_VERSION 99) SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}.${GNUCASH_MICRO_VERSION}") SET (GNUCASH_LATEST_STABLE_SERIES 2.6) SET (PACKAGE gnucash) SET (PACKAGE_NAME GnuCash) -SET (PACKAGE_VERSION 2.7.8) +SET (PACKAGE_VERSION 2.99) SET (PACKAGE_BUGREPORT gnucash-devel@gnucash.org) SET (PACKAGE_TARNAME ${PACKAGE}) SET (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") diff --git a/libgnucash/core-utils/gnc-prefs.c b/libgnucash/core-utils/gnc-prefs.c index ff965dd2c1..73eec923d3 100644 --- a/libgnucash/core-utils/gnc-prefs.c +++ b/libgnucash/core-utils/gnc-prefs.c @@ -116,10 +116,7 @@ gnc_prefs_set_file_retention_days(gint days) guint gnc_prefs_get_long_version() { - return GNUCASH_MAJOR_VERSION * 1000000 + - GNUCASH_MINOR_VERSION * 10000 + - GNUCASH_MICRO_VERSION * 100 + - GNUCASH_NANO_VERSION; + return GNUCASH_MAJOR_VERSION * 1000000 + GNUCASH_MINOR_VERSION; } gulong gnc_prefs_register_cb (const char *group,