From f7e99e5e0796d3ceb44ee2ca98ffac76427e9f03 Mon Sep 17 00:00:00 2001
From: Adib Taraben <theadib@gmail.com>
Date: Sun, 15 Mar 2015 19:40:37 +0100
Subject: fix #1418595: win32, wix, allow upgrade, no downgrade

(bzr r14007)
---
 packaging/wix/inkscape.wxs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs
index fb5122cbd..0f1e9f2b9 100644
--- a/packaging/wix/inkscape.wxs
+++ b/packaging/wix/inkscape.wxs
@@ -2,15 +2,18 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 	<?include version.wxi?>
 
+    <!-- change Product Id for every new version and subversion, do not change UpgradeCode -->
 	<Product Name="$(var.FullProductName)" Id='81922150-317e-4bb0-a31d-ff1c14f707c5' UpgradeCode='4d5fedaa-84a0-48be-bd2a-08246398361a' Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='inkscape.org'>
 
 		<Package Id='*' Keywords='Installer' Description="Inkscape Installer" Comments='inkscape is registered trademark of inkscape.org' Manufacturer='inkscape.org' InstallerVersion='$(var.InstallerVersion)' Platform='$(var.Platform)' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-
+        
 		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
 		<Property Id='DiskPrompt' Value="inkscape Installation [1]" />
 
 		<Property Id='ALLUSERS' Value="2" />
-
+        
+        <MajorUpgrade DowngradeErrorMessage="A newer version is already installed." />
+		
 		<DirectoryRef Id="ApplicationProgramsFolder">
 			<Component Id="ApplicationShortcut" Guid="37de8ea4-e83a-4e40-8f9c-c6066b78d935" Win64='$(var.Win64)' >
 				<Shortcut Id="ApplicationStartMenuShortcut" 
-- 
cgit v1.2.3