Update version to 2.4

CMakeLists.txt

@@ -4,20 +4,21 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
 # Project name
 project(gqrx)
 set(${PROJECT_NAME}_MAJOR "2")
-set(${PROJECT_NAME}_MINOR "3")
-set(${PROJECT_NAME}_PATCH "2")
-set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}")
+set(${PROJECT_NAME}_MINOR "4")
+#set(${PROJECT_NAME}_PATCH "0")
+#set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}")
+set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}")
 set(PACKAGE ${PROJECT_NAME})
-#add_definitions(-DVERSION="${VERSION}")
+add_definitions(-DVERSION="${VERSION}")
 
 # development version
-execute_process(
-    COMMAND git describe --long --dirty
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GITVERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-add_definitions(-DVERSION="${GITVERSION}")
+#execute_process(
+#    COMMAND git describe --long --dirty
+#    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+#    OUTPUT_VARIABLE GITVERSION
+#    OUTPUT_STRIP_TRAILING_WHITESPACE
+#)
+#add_definitions(-DVERSION="${GITVERSION}")
 
 ########### Main global variables ###########
 if(NOT CMAKE_BUILD_TYPE)

gqrx.pro

@@ -59,13 +59,14 @@ CONFIG(debug, debug|release) {
     #QMAKE_CFLAGS_DEBUG += '-g -O0'
 
     # Define version string (see below for releases)
-    VER = $$system(git describe --abbrev=8)
+    ## VER = $$system(git describe --abbrev=8)
+    VER = 2.4
 
 } else {
     DEFINES += QT_NO_DEBUG
     DEFINES += QT_NO_DEBUG_OUTPUT
-    VER = $$system(git describe --abbrev=1)
-    ## VER = v2.3.1-37-g78ea9469
+    ## VER = $$system(git describe --abbrev=1)
+    VER = 2.4
 
     # Release binaries with gr bundled
     # QMAKE_RPATH & co won't work with origin

resources/news.txt

@@ -1,5 +1,5 @@
 
-     2.x.x  TBD
+     2.4.0  Released December 14, 2015
 
        NEW: Bookmarks.
        NEW: FM RDS decoder using gr-rds.
@@ -23,7 +23,7 @@
   IMPROVED: AGC peformance.
   IMPROVED: FFT performance.
   IMPROVED: Right click on frequency digit to clear digits.
-  IMPROVED: Robustness against maliformed remote control commands.
+  IMPROVED: Robustness against malformed remote control commands.
 
      2.3.2  Released November 28, 2014