summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2017-10-15 13:27:01 +0200
committerDidier Raboud <odyx@debian.org>2017-10-15 13:28:29 +0200
commitd078b4ef81edd72db118d4ed62156e4aeb2cd590 (patch)
tree58b52fc4e19d05d09417261589d787c8e31825c3
parent4646467043a7d0a0e3d9901b2a5d387712e2e3d0 (diff)
parent48c7daa8e91d96805548ef4d2fa9f4b925c26108 (diff)
Merge tag '0.0.7-alpha' into debian/master
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml2
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog2
4 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 121c135..673b0ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,9 @@
# Debug files
*.dSYM/
+# VSCode
+.vscode
+
# Other
build/
doc/doxygen_sqlite3.db
diff --git a/.travis.yml b/.travis.yml
index eaf7bac..89a45bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ addons:
name: "katajakasa/SDL_kitchensink"
description: "A Simple SDL2 / FFmpeg library for audio/video playback written in C99"
notification_email: katajakasa@gmail.com
- build_command_prepend: "cov-configure --comptype gcc --compiler /usr/bin/gcc-5 && cmake -DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_BUILD_TYPE=Debug ."
+ build_command_prepend: "cov-configure --comptype gcc --compiler gcc-5 --template && cmake -DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_BUILD_TYPE=Debug ."
build_command: "make"
branch_pattern: coverity_scan
apt:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14e4e3b..7ed58af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
set(KIT_VERSION_MAJOR "0")
set(KIT_VERSION_MINOR "0")
-set(KIT_VERSION_PATCH "6")
+set(KIT_VERSION_PATCH "7")
set(KIT_VERSION ${KIT_VERSION_MAJOR}.${KIT_VERSION_MINOR}.${KIT_VERSION_PATCH})
add_definitions(
-DKIT_VERSION_MAJOR=${KIT_VERSION_MAJOR}
diff --git a/debian/changelog b/debian/changelog
index 039cc7f..ab94829 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sdl-kitchensink (0.0.6-1~OdyX0) UNRELEASED; urgency=medium
+sdl-kitchensink (0.0.7-1~OdyX1) UNRELEASED; urgency=medium
* Initial release. (Closes: #XXXXXX)