From 086ad6c7829214bf35db05ad673495827ed22ac4 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Thu, 25 Sep 2014 10:40:54 +0300
Subject: [PATCH 1/3] Updated the MaxScale version to 1.0.1-beta and added a
 numeric version MAXSCALE_VERSION_NUMERIC with the format 'major.minor.patch'.

---
 macros.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/macros.cmake b/macros.cmake
index 57f16b8d0..caa81f7b6 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -3,7 +3,8 @@ macro(set_maxscale_version)
   #MaxScale version number
   set(MAXSCALE_VERSION_MAJOR "1")
   set(MAXSCALE_VERSION_MINOR "0")
-  set(MAXSCALE_VERSION_PATCH "0")
+  set(MAXSCALE_VERSION_PATCH "1")
+  set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
   set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}-beta")
 
 endmacro()

From f5e789da2b25e4a8ba5e4b53d618e59515890784 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Thu, 25 Sep 2014 12:37:04 +0300
Subject: [PATCH 2/3] init.d scripts and ldconfig files are no longer
 overwritten when configuring CMake

---
 CMakeLists.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ebbebfce..b3f7f9571 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,9 @@ check_dirs()
 set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/modules)
 
 configure_file(${CMAKE_SOURCE_DIR}/server/include/version.h.in ${CMAKE_SOURCE_DIR}/server/include/version.h)
-configure_file(${CMAKE_SOURCE_DIR}/maxscale.conf.in ${CMAKE_SOURCE_DIR}/maxscale.conf @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/etc/init.d/maxscale.in ${CMAKE_SOURCE_DIR}/etc/init.d/maxscale @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/etc/ubuntu/init.d/maxscale.in ${CMAKE_SOURCE_DIR}/etc/ubuntu/init.d/maxscale @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/maxscale.conf.in ${CMAKE_SOURCE_DIR}/maxscale.conf.prep @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/etc/init.d/maxscale.in ${CMAKE_SOURCE_DIR}/etc/init.d/maxscale.prep @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/etc/ubuntu/init.d/maxscale.in ${CMAKE_SOURCE_DIR}/etc/ubuntu/init.d/maxscale.prep @ONLY)
 
 
 set(CMAKE_C_FLAGS "-Wall -fPIC")
@@ -77,11 +77,12 @@ add_subdirectory(client)
 
 # Install startup scripts and ldconfig files
 if( NOT ( (DEFINED INSTALL_SYSTEM_FILES) AND ( NOT ( INSTALL_SYSTEM_FILES ) ) ) )
-  install(FILES maxscale.conf DESTINATION /etc/ld.so.conf.d/ PERMISSIONS WORLD_EXECUTE WORLD_READ)
+
+  install(FILES maxscale.conf.prep RENAME maxscale.conf DESTINATION /etc/ld.so.conf.d/ PERMISSIONS WORLD_EXECUTE WORLD_READ)
   if(DEB_BASED)
-    install(FILES etc/ubuntu/init.d/maxscale DESTINATION /etc/init.d/ PERMISSIONS WORLD_EXECUTE)
+    install(FILES etc/ubuntu/init.d/maxscale.prep RENAME maxscale  DESTINATION /etc/init.d/ PERMISSIONS WORLD_EXECUTE)
   else()
-    install(FILES etc/init.d/maxscale DESTINATION /etc/init.d/ PERMISSIONS WORLD_EXECUTE)
+    install(FILES etc/init.d/maxscale.prep RENAME maxscale DESTINATION /etc/init.d/ PERMISSIONS WORLD_EXECUTE)
   endif()
   message(STATUS "Installing maxscale.conf to: /etc/ld.so.conf.d")
   message(STATUS "Installing startup scripts to: /etc/init.d")

From ba398157e88198bca48cda878277f86d9e49629c Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Thu, 25 Sep 2014 12:39:14 +0300
Subject: [PATCH 3/3] Updated the normal makefile VERSION file

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 896b9bc9d..1f6191473 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0-beta
+1.0.1-beta