From 0ce23a54985b98b9686b575fc6c4a366ed192790 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 12 Oct 2017 08:08:04 -0700 Subject: [PATCH] Updated version to 2.0.7 --- CMakeLists.txt | 4 ++-- Xcode/SDL/Info-Framework.plist | 4 ++-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 4 ++-- configure | 4 ++-- configure.in | 4 ++-- debian/changelog | 6 ++++++ include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d363aec0dba4..c13794a389255 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,9 +42,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake) # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0. set(SDL_MAJOR_VERSION 2) set(SDL_MINOR_VERSION 0) -set(SDL_MICRO_VERSION 6) +set(SDL_MICRO_VERSION 7) set(SDL_INTERFACE_AGE 0) -set(SDL_BINARY_AGE 6) +set(SDL_BINARY_AGE 7) set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") # Set defaults preventing destination file conflicts diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 0be3ae5df2284..a509c89eb2b58 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.6 + 2.0.7 CFBundleSignature SDLX CFBundleVersion - 2.0.6 + 2.0.7 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 856939f62ee80..4673d2c416431 100755 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -2846,7 +2846,7 @@ CLANG_LINK_OBJC_RUNTIME = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 7.0.0; + DYLIB_CURRENT_VERSION = 8.0.0; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = ( /usr/X11R6/include, @@ -2937,7 +2937,7 @@ CLANG_LINK_OBJC_RUNTIME = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 7.0.0; + DYLIB_CURRENT_VERSION = 8.0.0; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = ( /usr/X11R6/include, diff --git a/configure b/configure index 1cb707e2b7e86..fc0d3466cd1e1 100755 --- a/configure +++ b/configure @@ -2710,9 +2710,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=6 +SDL_MICRO_VERSION=7 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=6 +SDL_BINARY_AGE=7 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.in b/configure.in index 33572d7a15b91..a4b88f9d16a74 100644 --- a/configure.in +++ b/configure.in @@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=6 +SDL_MICRO_VERSION=7 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=6 +SDL_BINARY_AGE=7 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION AC_SUBST(SDL_MAJOR_VERSION) diff --git a/debian/changelog b/debian/changelog index 48c9d753922f0..e9786f7f8171a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libsdl2 (2.0.7ubuntu1) UNRELEASED; urgency=low + + * Updated SDL to version 2.0.7 + + -- Sam Lantinga Thu, 12 Oct 2017 08:01:16 -0800 + libsdl2 (2.0.6ubuntu1) UNRELEASED; urgency=low * Updated SDL to version 2.0.6 diff --git a/include/SDL_version.h b/include/SDL_version.h index 8471b65438e6d..5b4c402486d6a 100644 --- a/include/SDL_version.h +++ b/include/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 6 +#define SDL_PATCHLEVEL 7 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index f02cc9055d674..b8968ce6e0031 100644 --- a/src/main/windows/version.rc +++ b/src/main/windows/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,6,0 - PRODUCTVERSION 2,0,6,0 + FILEVERSION 2,0,7,0 + PRODUCTVERSION 2,0,7,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 6, 0\0" + VALUE "FileVersion", "2, 0, 7, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright © 2017 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 6, 0\0" + VALUE "ProductVersion", "2, 0, 7, 0\0" END END BLOCK "VarFileInfo"