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

[Neil Roberts]

This patch seems to suffer the same problem as the previous patch where
there are spurious spaces in the context lines in the diff and it won't
apply. I can manually apply the patch, but first could you please
clarify whether this is only intended to be applied to the cogl-1.14
branch. Thanks.

Regards,
- Neil

Fan Chun-wei <fanc999 at yahoo.com.tw> writes:

> 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
>
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.