PATCH: [ 2577753 ] Use download URL without version number in PAD file

diff --git a/Web/.htaccess b/Web/.htaccess
index 866bca1..38aeb97 100644 (file)
--- a/Web/.htaccess
+++ b/Web/.htaccess
@@ -12,6 +12,9 @@ ErrorDocument 404 /404.php
 #Use PHP5 instead of PHP4
 AddType x-mapp-php5 .php
 
+#Redirect PAD download URL to current WinMerge version...
+Redirect permanent /downloads/WinMerge-Setup.exe http://downloads.sourceforge.net/winmerge/WinMerge-2.10.4-Setup.exe
+
 #Redirect www.winmerge.org to winmerge.org...
 RewriteEngine On
 RewriteCond   %{HTTP_HOST} ^www\.winmerge\.org$ [NC]

diff --git a/Web/WinMergePAD.xml b/Web/WinMergePAD.xml
index ab9cf60..a9946f0 100644 (file)
--- a/Web/WinMergePAD.xml
+++ b/Web/WinMergePAD.xml
@@ -9,17 +9,17 @@
                <Company_Name>Thingamahoochie Software</Company_Name>
                <Address_1 />
                <Address_2 />
-               <City_Town />
+               <City_Town>None<City_Town/>
                <State_Province />
                <Zip_Postal_Code />
-               <Country />
+               <Country>None</Country>
                <Company_WebSite_URL>http://winmerge.org/</Company_WebSite_URL>
                <Contact_Info>
-                       <Author_First_Name>WinMerge team</Author_First_Name>
-                       <Author_Last_Name />
+                       <Author_First_Name>WinMerge</Author_First_Name>
+                       <Author_Last_Name>Team</Author_Last_Name>
                        <Author_Email>winmerge-support@lists.sourceforge.net</Author_Email>
-                       <Contact_First_Name>WinMerge team</Contact_First_Name>
-                       <Contact_Last_Name />
+                       <Contact_First_Name>WinMerge</Contact_First_Name>
+                       <Contact_Last_Name>Team</Contact_Last_Name>
                        <Contact_Email>winmerge-support@lists.sourceforge.net</Contact_Email>
                </Contact_Info>
                <Support_Info>
@@ -84,8 +84,8 @@
                        <Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
                </Application_URLs>
                <Download_URLs>
-                       <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.10.4-Setup.exe</Primary_Download_URL>
-                       <Secondary_Download_URL />
+                       <Primary_Download_URL>http://winmerge.org/downloads/WinMerge-Setup.exe</Primary_Download_URL>
+                       <Secondary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.10.4-Setup.exe</Secondary_Download_URL>
                        <Additional_Download_URL_1 />
                        <Additional_Download_URL_2 />
                </Download_URLs>