This is an automated email from the git hooks/post-receive script. mgilbert pushed a commit to branch master in repository wine.
commit b54c3811feb3065298fa5fb571b19cd61c05110b Author: Austin English <[email protected]> Date: Mon Nov 16 14:34:51 2015 -0600 opengl32: Add "Not Microsoft" to Copyright string to satisfy CATIA. Signed-off-by: Austin English <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> --- dlls/opengl32/version.rc | 1 + include/wine/wine_common_ver.rc | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 5d87404..6fd4ff9 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,6 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 5938582..cae5408 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -73,6 +73,10 @@ never complain. #define WINE_FILESUBTYPE VFT2_UNKNOWN #endif +#ifndef WINE_LEGALCOPYRIGHT +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" +#endif + #ifndef WINE_PRODUCTVERSION #define WINE_PRODUCTVERSION 1,0,0,0 #endif @@ -106,7 +110,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", WINE_LEGALCOPYRIGHT VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
