diff options
| -rw-r--r-- | CHANGELOG.rst | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/biboumi.spec.cmake | 7 | ||||
| -rw-r--r-- | src/database/database.cpp | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 95a8ab5..ea1d4f1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,5 @@ -Version 6.0 -=========== +Version 6.0 - 2017-09-17 +======================== - The LiteSQL dependency was removed. Only libsqlite3 is now necessary to work with the database. diff --git a/CMakeLists.txt b/CMakeLists.txt index f3a79b2..c9967ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(biboumi) set(${PROJECT_NAME}_VERSION_MAJOR 6) set(${PROJECT_NAME}_VERSION_MINOR 0) -set(${PROJECT_NAME}_VERSION_SUFFIX "~dev") +set(${PROJECT_NAME}_VERSION_SUFFIX "") if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Debug" CACHE STRING diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index d28c840..5c01b80 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -61,11 +61,8 @@ make check %{?_smp_mflags} %changelog -* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1 -- Build latest git revision - -* Wed Jun 14 2017 Le Coz Florent <louiz@louiz.org> - 6.0-1 - Enable database support by building with sqlite3 +* Tue Sep 19 2017 Le Coz Florent <louiz@louiz.org> - 6.0-1 + Update to version 6.0 * Wed May 24 2017 Le Coz Florent <louiz@louiz.org> - 5.0-1 - Update to version 5.0 diff --git a/src/database/database.cpp b/src/database/database.cpp index a2b88e2..8afe6f1 100644 --- a/src/database/database.cpp +++ b/src/database/database.cpp @@ -35,7 +35,7 @@ void Database::open(const std::string& filename) if (res != SQLITE_OK) { log_error("Failed to open database file ", filename, ": ", sqlite3_errmsg(new_db)); - sqlite3_close_v2(new_db); + sqlite3_close(new_db); throw std::runtime_error(""); } Database::db = new_db; @@ -238,7 +238,7 @@ std::vector<Database::RosterItem> Database::get_full_roster() void Database::close() { - sqlite3_close_v2(Database::db); + sqlite3_close(Database::db); Database::db = nullptr; } |