Updated library version to 2.0 for consistency with SDL 2.0

libsdl-org · Feb 27, 2013 · 4b400c6 · 4b400c6
1 parent b292cc5
commit 4b400c6
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 26 deletions.
diff --git a/SDL_image.h b/SDL_image.h
@@ -35,9 +35,9 @@ extern "C" {
 
 /* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
 */
-#define SDL_IMAGE_MAJOR_VERSION	1
-#define SDL_IMAGE_MINOR_VERSION	2
-#define SDL_IMAGE_PATCHLEVEL	13
+#define SDL_IMAGE_MAJOR_VERSION	2
+#define SDL_IMAGE_MINOR_VERSION	0
+#define SDL_IMAGE_PATCHLEVEL	0
 
 /* This macro can be used to fill a version structure with the compile-time
  * version of the SDL_image library.

diff --git a/VisualC/Version.rc b/VisualC/Version.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,13,0
- PRODUCTVERSION 1,2,13,0
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL_image\0"
-            VALUE "FileVersion", "1, 2, 13, 0\0"
+            VALUE "FileVersion", "2, 0, 0, 0\0"
             VALUE "InternalName", "SDL_image\0"
             VALUE "LegalCopyright", "Copyright � 2013 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_image.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "1, 2, 13, 0\0"
+            VALUE "ProductVersion", "2, 0, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/configure b/configure
@@ -2444,11 +2444,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # if backwards compatibility has been broken,
 # set BINARY_AGE and INTERFACE_AGE to 0.
 
-MAJOR_VERSION=1
-MINOR_VERSION=2
-MICRO_VERSION=13
-INTERFACE_AGE=5
-BINARY_AGE=13
+MAJOR_VERSION=2
+MINOR_VERSION=0
+MICRO_VERSION=0
+INTERFACE_AGE=0
+BINARY_AGE=0
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 

diff --git a/configure.in b/configure.in
@@ -11,11 +11,11 @@ dnl Set various version strings - taken gratefully from the GTk sources
 # if backwards compatibility has been broken,
 # set BINARY_AGE and INTERFACE_AGE to 0.
 
-MAJOR_VERSION=1
-MINOR_VERSION=2
-MICRO_VERSION=13
-INTERFACE_AGE=5
-BINARY_AGE=13
+MAJOR_VERSION=2
+MINOR_VERSION=0
+MICRO_VERSION=0
+INTERFACE_AGE=0
+BINARY_AGE=0
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 AC_SUBST(MAJOR_VERSION)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+libsdl2-image (2.0.0) unstable; urgency=low
+
+  * Updated library version to 2.0 for consistency with SDL 2.0
+
+ -- Sam Lantinga <slouken@libsdl.org>  Tue, 26 Feb 2013 15:48:41 -0800
+
 libsdl2-image (1.2.12) unstable; urgency=low
 
   * sdl-image for SDL2. Initial release.

diff --git a/debian/libsdl2-image-dev.install b/debian/libsdl2-image-dev.install
@@ -1,4 +1,4 @@
-usr/include/SDL2
-usr/lib/*/libSDL2_image.a
-usr/lib/*/libSDL2_image.so
-usr/lib/*/pkgconfig/SDL2_image.pc
+usr/include
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
diff --git a/debian/libsdl2-image.install b/debian/libsdl2-image.install
@@ -1 +1 @@
-usr/lib/*/libSDL2_image-1.2.so.*
+usr/lib/*/lib*.so.*
diff --git a/version.rc b/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,13,0
- PRODUCTVERSION 1,2,13,0
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL_image\0"
-            VALUE "FileVersion", "1, 2, 13, 0\0"
+            VALUE "FileVersion", "2, 0, 0, 0\0"
             VALUE "InternalName", "SDL_image\0"
             VALUE "LegalCopyright", "Copyright � 2013 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_image.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "1, 2, 13, 0\0"
+            VALUE "ProductVersion", "2, 0, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"