[PATCH STABLE] contrib/wix: fix product name to include version

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1268757552 -3600
# Branch stable
# Node ID 713fb98614063c1f2513dc4cbd85b7a96a9171ad
# Parent  35893dcfd40cb0c7fd1bcd28a19158b19231a316
contrib/wix: fix product name to include version

Without this, Mercurial is registered under the installed programs
on Windows as just 'Mercurial', which is unusual for a program to do
on Windows.

Including the version in the registered product name registers the
software in the Windows control panel of installed programs as, for
example, 'Mercurial 1.5' (for 1.5), or as

  'Mercurial 1.5.1032' for a stable 1.5+32-35893dcfd40c
  'Mercurial 1.5.5080' for a unstable 1.5+80-1ee60e82333c

when using http://bitbucket.org/tortoisehg/thg-winbuild to create
daily builds.

Furthermore, the install UI texts in the built installer database (MSI
file) are more clear on what the user is about to install, as, for example,
the text in the initial installer dialog now reads

  "The Setup Wizard will install Mercurial 1.5 on your computer"

instead of just

  "The Setup Wizard will install Mercurial on your computer"

diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/wix/mercurial.wxs
@@ -9,7 +9,7 @@
   <?define ComponentMainExecutableGUID = D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF ?>
   <?define ProductUpgradeCode = A1CC6134-E945-4399-BE36-EB0017FDF7CF ?>
 
-  <Product Name='Mercurial' Id='*'
+  <Product Name='Mercurial $(var.Version)' Id='*'
     UpgradeCode='$(var.ProductUpgradeCode)'
     Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others.'>