Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

diff --git a/FIO-VERSION-GEN b/FIO-VERSION-GEN
index 22c9f685fd7cd47757e9bb73a8f868897267b1cc..25fad7d35c9acb3304d0e078d73ba3671e0dba12 100755 (executable)
--- a/FIO-VERSION-GEN
+++ b/FIO-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=FIO-VERSION-FILE
-DEF_VER=fio-2.2.7
+DEF_VER=fio-2.2.8
 
 LF='
 '

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index ba58b92a89a595bb78b483de310afe3c722eb2e4..2a67a4dc87934438af79f4f780656b9fc7e6d1c0 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -10,7 +10,7 @@
        <Product Id="*"
          Codepage="1252" Language="1033"
          Manufacturer="fio" Name="fio"
-         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.2.7">
+         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.2.8">
                <Package
                  Description="Flexible IO Tester"
                  InstallerVersion="301" Keywords="Installer,MSI,Database"
@@ -40,7 +40,7 @@
                                                        <File Id="COPYING" Name="COPYING.txt" Source="..\..\COPYING"/>
                                                </Component>
                                                <Component>
-                                                       <File Id="LICENSE" Name="LICENSE.txt" Source="..\..\LICENSE"/>
+                                                       <File Id="MORAL_LICENSE" Name="MORAL-LICENSE.txt" Source="..\..\MORAL-LICENSE"/>
                                                </Component>
                                                <Directory Id="examples" Name="examples"/>
                                        </Directory>
@@ -54,7 +54,7 @@
                <ComponentRef Id="README"/>
                <ComponentRef Id="REPORTING_BUGS"/>
                <ComponentRef Id="COPYING"/>
-               <ComponentRef Id="LICENSE"/>
+               <ComponentRef Id="MORAL_LICENSE"/>
                <ComponentGroupRef Id="examples"/>
        </Feature>