[glibmm] Do not hard-code API version in resource files

[Daniel Elstner <daniel src gnome org>]

commit 03c19bc62e0451637fd44ceaf054e9fa229c2d36
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 20 11:14:42 2009 +0200

    Do not hard-code API version in resource files
    
    * MSVC_Net200[58]/glibmm/glibmm.rc.in: Use newer @PACKAGE_VERSION@
    substitution in place of @VERSION    Substitute @GLIBMM_MODULE_NAME@
    instead of hardcoding the API version.
    * MSVC_Net200[58]/giomm/giomm.rc.in: Use newer @PACKAGE_VERSION@
    substitution in place of @VERSION    Substitute @GIOMM_MODULE_NAME@
    instead of hardcoding the API version.  Replace @GLIBMM_*_VERSION@
    substitutions with their @GIOMM_*_VERSION@ equivalents.

 ChangeLog                        |   12 ++++++++++++
 MSVC_Net2005/giomm/giomm.rc.in   |   10 +++++-----
 MSVC_Net2005/glibmm/glibmm.rc.in |    6 +++---
 MSVC_Net2008/giomm/giomm.rc.in   |   10 +++++-----
 MSVC_Net2008/glibmm/glibmm.rc.in |    6 +++---
 5 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9063940..7af171a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-08-20  Daniel Elstner  <danielk openismus com>
+
+	Do not hard-code API version in resource files
+
+	* MSVC_Net200[58]/glibmm/glibmm.rc.in: Use newer @PACKAGE_VERSION@
+	substitution in place of @VERSION    Substitute @GLIBMM_MODULE_NAME@
+	instead of hardcoding the API version.
+	* MSVC_Net200[58]/giomm/giomm.rc.in: Use newer @PACKAGE_VERSION@
+	substitution in place of @VERSION    Substitute @GIOMM_MODULE_NAME@
+	instead of hardcoding the API version.  Replace @GLIBMM_*_VERSION@
+	substitutions with their @GIOMM_*_VERSION@ equivalents.
+
 2009-08-19  Daniel Elstner  <danielk openismus com>
 
 	Predefine GLIBMM_API for Doxygen
diff --git a/MSVC_Net2005/giomm/giomm.rc.in b/MSVC_Net2005/giomm/giomm.rc.in
index 0b979e6..935b9dd 100644
--- a/MSVC_Net2005/giomm/giomm.rc.in
+++ b/MSVC_Net2005/giomm/giomm.rc.in
@@ -33,8 +33,8 @@ END
 #endif    // APSTUDIO_INVOKED
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1
- PRODUCTVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1
+ FILEVERSION @GIOMM_MAJOR_VERSION@,@GIOMM_MINOR_VERSION@,@GIOMM_MICRO_VERSION@,1
+ PRODUCTVERSION @GIOMM_MAJOR_VERSION@,@GIOMM_MINOR_VERSION@,@GIOMM_MICRO_VERSION@,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,11 +51,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The glibmm development team (see AUTHORS)"
             VALUE "FileDescription", "The official C++ wrapper for gio"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "giomm-2.4"
+            VALUE "OriginalFilename", "@GIOMM_MODULE_NAME  dll"
             VALUE "ProductName", "giomm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2005/glibmm/glibmm.rc.in b/MSVC_Net2005/glibmm/glibmm.rc.in
index a8487c9..18f3663 100755
--- a/MSVC_Net2005/glibmm/glibmm.rc.in
+++ b/MSVC_Net2005/glibmm/glibmm.rc.in
@@ -51,11 +51,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The glibmm development team (see AUTHORS)"
             VALUE "FileDescription", "The official C++ wrapper for glib"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "glibmm-2.4"
+            VALUE "OriginalFilename", "@GLIBMM_MODULE_NAME  dll"
             VALUE "ProductName", "glibmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2008/giomm/giomm.rc.in b/MSVC_Net2008/giomm/giomm.rc.in
index 0b979e6..935b9dd 100644
--- a/MSVC_Net2008/giomm/giomm.rc.in
+++ b/MSVC_Net2008/giomm/giomm.rc.in
@@ -33,8 +33,8 @@ END
 #endif    // APSTUDIO_INVOKED
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1
- PRODUCTVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1
+ FILEVERSION @GIOMM_MAJOR_VERSION@,@GIOMM_MINOR_VERSION@,@GIOMM_MICRO_VERSION@,1
+ PRODUCTVERSION @GIOMM_MAJOR_VERSION@,@GIOMM_MINOR_VERSION@,@GIOMM_MICRO_VERSION@,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,11 +51,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The glibmm development team (see AUTHORS)"
             VALUE "FileDescription", "The official C++ wrapper for gio"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "giomm-2.4"
+            VALUE "OriginalFilename", "@GIOMM_MODULE_NAME  dll"
             VALUE "ProductName", "giomm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2008/glibmm/glibmm.rc.in b/MSVC_Net2008/glibmm/glibmm.rc.in
index a8487c9..18f3663 100644
--- a/MSVC_Net2008/glibmm/glibmm.rc.in
+++ b/MSVC_Net2008/glibmm/glibmm.rc.in
@@ -51,11 +51,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The glibmm development team (see AUTHORS)"
             VALUE "FileDescription", "The official C++ wrapper for glib"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "glibmm-2.4"
+            VALUE "OriginalFilename", "@GLIBMM_MODULE_NAME  dll"
             VALUE "ProductName", "glibmm"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"