Version 1.0.7

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2017 by Ocelot Computer Services Inc. All rights reserved.
+# Copyright (c) 2014-2018 by Ocelot Computer Services Inc. All rights reserved.
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -104,8 +104,8 @@
 
 # FILENAME_EXTRA
 # Default is blank. Ocelot passes -DFILENAME_EXTRA="qt4" when building with qt4,
-# so the final package name will look like ocelotgui-1.0.6qt4-1_amd64.deb or
-# ocelotgui-1.0.6qt4-1.x86_64.rpm. Ordinarily it should not be specified.
+# so the final package name will look like ocelotgui-1.0.7qt4-1_amd64.deb or
+# ocelotgui-1.0.7qt4-1.x86_64.rpm. Ordinarily it should not be specified.
 
 # FILENAME_RELEASE
 # Default is "1". This affects filenames generated by cpack. Ordinarily it doesn't need to be changed.
@@ -119,8 +119,8 @@
 # cmake . -DCPACK_GENERATOR="DEB"
 # make
 # cpack
-# lintian ocelotgui-1.0.6-1_amd64.deb
-# sudo dpkg -i ocelotgui-1.0.6-1_amd64.deb
+# lintian ocelotgui-1.0.7-1_amd64.deb
+# sudo dpkg -i ocelotgui-1.0.7-1_amd64.deb
 # Todo: lintian will warn "new-package-should-close-itp-bug", which we ignore.
 # Todo: lintian will warn about permissions if you are not root, which we work around by being root.
 # but see also comments in rpm_build.sh
@@ -129,16 +129,16 @@
 # cmake . -DCPACK_GENERATOR="RPM"
 # make
 # cpack
-# rpmlint ocelotgui-1.0.6-1.x86_64.rpm
-# rpm -i ocelotgui-1.0.6-1.x86_64.rpm
+# rpmlint ocelotgui-1.0.7-1.x86_64.rpm
+# rpm -i ocelotgui-1.0.7-1.x86_64.rpm
 # Todo: rpmlint will warn "standard-dir-owned-by-package" for /usr/share/man and /usr/share/man/man1, which we ignore.
 # Todo: rpmlint will warn "no-signature", which we ignore.
 # Todo: rpmlint will warn "no-packager-tag", wich we ignore.
 # but see also comments in rpm_build.sh
 
 # Todo: allow user to pass -DCMAKE_INSTALL_RPATH
 
-message("-- CmakeLists.txt for ocelotgui 1.0.6")
+message("-- CmakeLists.txt for ocelotgui 1.0.7")
 message("-- see comments in CMakeLists.txt for special instructions")
 message("-- see README.md for general instructions for building")
 
@@ -338,6 +338,7 @@ install(FILES README.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES options.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES debugger_reference.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(FILES tarantool.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 if (NOT CPACK_GENERATOR MATCHES "DEB")
 install(FILES LICENSE.GPL DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES COPYING DESTINATION ${CMAKE_INSTALL_DOCDIR})
@@ -358,7 +359,7 @@ endif (CPACK_GENERATOR MATCHES "RPM")
 if (CPACK_GENERATOR MATCHES "DEB")
   #lintian complains changelog-file-missing-in-native-package, this fixes it,
   #but lintian will still complain new-package-should-close-itp-bug
-  #which we cannot fix until version >= 1.0.6 and someone posts an ITP bug
+  #which we cannot fix until version >= 1.0.7 and someone posts an ITP bug
   execute_process(COMMAND cp changelog changelog.bak)
   execute_process(COMMAND gzip -9 -f -n changelog)
   execute_process(COMMAND mv changelog.bak changelog)
@@ -390,21 +391,21 @@ if (CPACK_GENERATOR MATCHES "RPM")
   install(FILES ocelotgui.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 endif (CPACK_GENERATOR MATCHES "RPM")
 
-# version = 1.0.6
+# version = 1.0.7
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GUI client for MySQL or MariaDB")
 set(CPACK_PACKAGE_VENDOR "Ocelot Computer Services Inc.")
 set(CPACK_PACKAGE_CONTACT "Peter Gulutzan")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "6")
+set(CPACK_PACKAGE_VERSION_PATCH "7")
 # Todo: set(CPACK_PACKAGE_DESCRIPTION_FILE first-lines-of-README)
 # CPACK_PACKAGE_INSTALL_DIRECTORY = default
 set(CPACK_PACKAGE_ICON ocelotgui_logo.png)
 # CPACK_PROJECT_CONFIG_FILE = nonexistent
 
-# I assume nobody wants package names like ocelotgui-1.0.6-Linux.deb
+# I assume nobody wants package names like ocelotgui-1.0.7-Linux.deb
 # but that's what I get if CMAKE_SYSTEM_NAME = "Linux".
-# I'd prefer ocelotgui-1.0.6-1_amd64.deb or ocelotgui-1.0.6.x86_64.rpm
+# I'd prefer ocelotgui-1.0.7-1_amd64.deb or ocelotgui-1.0.7.x86_64.rpm
 # If it's neither "DEB" nor "RPM", CPACK_PACKAGE_FILE_NAME = default.
 set(FILENAME_PLATFORM_FOR_DEB "Linux")
 set(FILENAME_PLATFORM_FOR_RPM "Linux")
@@ -444,7 +445,7 @@ if (CPACK_GENERATOR MATCHES "DEB")
   # CPACK_RESOURCE_FILE_WELCOME = nonexistent
   # CPACK_GENERATOR = we expect it to be specified if cpack will be used.
   # CPACK_DEBIAN_PACKAGE_NAME = default = CPACK_PACKAGE_NAME = project name
-  # CPACK_DEBIAN_PACKAGE_VERSION = default = CPACK_PACKAGE_VERSION = 1.0.6
+  # CPACK_DEBIAN_PACKAGE_VERSION = default = CPACK_PACKAGE_VERSION = 1.0.7
   # CPACK_DEBIAN_PACKAGE_DEPENDS = todo?
   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Peter Gulutzan <pgulutzan@ocelot.ca>")
   set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Ocelot GUI (ocelotgui), a database client, allows users to connect to
@@ -465,7 +466,7 @@ if (CPACK_GENERATOR MATCHES "RPM")
   # Todo: For other than Mageia prefer CPACK_RPM_PACKAGE_GROUP "Applications/Databases"
   #CPACK_RPM_PACKAGE_SUMMARY = default = CPACK_PACKAGE_DESCRIPTION_SUMMARY
   set(CPACK_RPM_PACKAGE_NAME "ocelotgui")
-  #CPACK_RPM_PACKAGE_VERSION = DEFAULT = CPACK_PACKAGE_VERSION = 1.0.6
+  #CPACK_RPM_PACKAGE_VERSION = DEFAULT = CPACK_PACKAGE_VERSION = 1.0.7
   set(CPACK_RPM_PACKAGE_RELEASE ${FILENAME_RELEASE})
   set(CPACK_RPM_PACKAGE_LICENSE GPLv2)
   set(CPACK_RPM_PACKAGE_GROUP "Databases")