[Cogl] [PATCH] Fix versioning info in Windows .rc files

[Fan Chun-wei]

Hello Neil,

I had this patch for cogl-1.14 (and 1.12, if any further releases are 
scheduled for that branch) as I am under the impression that we are 
heading towards 2.0 in master-please correct me if I am wrong.  If this 
is the case, this patch is indeed for cogl-1.14 only.

I'll try to re-send the patch here as an attachment, perhaps Thunderbird 
did something to its formatting when I pasted the contents of the patch 
in the e-mail to the mail list.  Sorry.

With blessings, thank you!

-------------- next part --------------
From 6daa0f552d695cd24a626fb3600defe389472ef2 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei at src.gnome.org>
Date: Fri, 1 Mar 2013 15:56:11 +0800
Subject: [PATCH 4/5] Fix versioning info in Windows .rc files

We are still currently at Cogl-1.x, so use the correct 1.x autotools
versioning macros so that the correct version info can be filled in.
---
 cogl-pango/cogl-pango.rc.in |   12 ++++++------
 cogl/cogl.rc.in             |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cogl-pango/cogl-pango.rc.in b/cogl-pango/cogl-pango.rc.in
index 64242e4..ab8ff2d 100644
--- a/cogl-pango/cogl-pango.rc.in
+++ b/cogl-pango/cogl-pango.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
-  PRODUCTVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
+  FILEVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
+  PRODUCTVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
 	VALUE "CompanyName", "Intel Corporation"
 	VALUE "FileDescription", "cogl-pango"
-	VALUE "FileVersion", "@COGL_VERSION at .0"
-	VALUE "InternalName", "libcogl-pango-2.0- at COGL_LT_AGE@"
+	VALUE "FileVersion", "@COGL_1_VERSION at .0"
+	VALUE "InternalName", "libcogl-pango-1.0- at COGL_LT_AGE@"
 	VALUE "LegalCopyright", "Copyright 1995-2011 �Intel Corporation"
-	VALUE "OriginalFilename", "libcogl-pango-2.0- at COGL_LT_AGE@.dll"
+	VALUE "OriginalFilename", "libcogl-pango-1.0- at COGL_LT_AGE@.dll"
 	VALUE "ProductName", "cogl-pango"
-	VALUE "ProductVersion", "@COGL_VERSION@"
+	VALUE "ProductVersion", "@COGL_1_VERSION@"
       END
     END
     BLOCK "VarFileInfo"
diff --git a/cogl/cogl.rc.in b/cogl/cogl.rc.in
index 976c855..0911559 100644
--- a/cogl/cogl.rc.in
+++ b/cogl/cogl.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
-  PRODUCTVERSION 1, at COGL_MINOR_VERSION@, at COGL_MICRO_VERSION@,0
+  FILEVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
+  PRODUCTVERSION 1, at COGL_1_MINOR_VERSION@, at COGL_1_MICRO_VERSION@,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
 	VALUE "CompanyName", "Intel Corporation"
 	VALUE "FileDescription", "cogl"
-	VALUE "FileVersion", "@COGL_VERSION at .0"
-	VALUE "InternalName", "libcogl-2.0- at COGL_LT_AGE@"
+	VALUE "FileVersion", "@COGL_1_VERSION at .0"
+	VALUE "InternalName", "libcogl-1.0- at COGL_LT_AGE@"
 	VALUE "LegalCopyright", "Copyright 1995-2011 �Intel Corporation"
-	VALUE "OriginalFilename", "libcogl-2.0- at COGL_LT_AGE@.dll"
+	VALUE "OriginalFilename", "libcogl-1.0- at COGL_LT_AGE@.dll"
 	VALUE "ProductName", "cogl"
-	VALUE "ProductVersion", "@COGL_VERSION@"
+	VALUE "ProductVersion", "@COGL_1_VERSION@"
       END
     END
     BLOCK "VarFileInfo"
-- 
1.7.7.1.msysgit.0