various - prepare for 1.2.6 release

KDAB · Dec 16, 2019 · 6042e26 · 6042e26
1 parent e249844
commit 6042e26
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,10 @@
+Version 1.2.6:
+-------------
+ * New EULA (see LICENSE.txt)
+ * New CMake option BUILD_TESTS to disable building the tests
+ * Comes with an installing file for Conan (see conan folder)
+ * Small cleanups
+
 Version 1.2.5:
 -------------
  * Keeping up with Qt5, CMake and QNX

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,10 +34,10 @@ project(kdstatemachineeditor CXX C)
 # Version setup
 set(KDSME_VERSION_MAJOR "1")
 set(KDSME_VERSION_MINOR "2")
-set(KDSME_VERSION_PATCH "5")
+set(KDSME_VERSION_PATCH "6")
 set(KDSME_VERSION "${KDSME_VERSION_MAJOR}.${KDSME_VERSION_MINOR}.${KDSME_VERSION_PATCH}")
 set(KDSME_VERSION_STRING "${KDSME_VERSION}")
-set(KDSME_SOVERSION "1.2.5")
+set(KDSME_SOVERSION "1.2.6")
 set(PROJECT_VERSION_STRING "${KDSME_VERSION_STRING}")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${CMAKE_MODULE_PATH})

diff --git a/debian.changelog b/debian.changelog
@@ -1,3 +1,9 @@
+kdstatemachineeditor (1.2.6) final; urgency=low
+
+  * 1.2.6 final
+
+ -- Allen Winter <allen.winter@kdab.com>  Mon, 16 Dec 2019 13:00:00 -0500
+
 kdstatemachineeditor (1.2.5) final; urgency=low
 
   * 1.2.5 final

diff --git a/kdstatemachineeditor.dsc b/kdstatemachineeditor.dsc
@@ -1,9 +1,9 @@
 Format: 1.0
 Source: kdstatemachineeditor
-Version: 1.2.5
+Version: 1.2.6
 Binary: kdstatemachineeditor
 Maintainer: Allen Winter <allen.winter@kdab.com>
 Architecture: any
 Build-Depends: debhelper (>=9), cdbs, cmake, qt5-default, qtbase5-dev, qtbase5-dev-tools, qtbase5-private-dev, qttools5-dev, qttools5-dev-tools, qtdeclarative5-dev, qtdeclarative5-dev-tools, graphviz-dev
 Files:
- 00000000000000000000000000000000 00000 kdstatemachineeditor-1.2.5.tar.gz
+ 00000000000000000000000000000000 00000 kdstatemachineeditor-1.2.6.tar.gz
diff --git a/kdstatemachineeditor.spec b/kdstatemachineeditor.spec
@@ -1,5 +1,5 @@
 Name:           kdstatemachineeditor
-Version:        1.2.5
+Version:        1.2.6
 Release:        1
 Summary:        State Machine Editor Library
 Source:         %{name}-%{version}.tar.gz
@@ -74,6 +74,8 @@ make install DESTDIR=%{buildroot} %{?_smp_mflags}
 %{_libdir}/qt5/mkspecs/modules/*
 
 %changelog
+* Mon Dec 16 2019 Allen Winter <allen.winter@kdab.com> 1.2.6
+  1.2.6 Patch Release
 * Sat Feb 16 2019 Allen Winter <allen.winter@kdab.com> 1.2.5
   1.2.5 Patch Release
 * Thu Jun 21 2018 Allen Winter <allen.winter@kdab.com> 1.2.4