Patchwork [STABLE] wix: pull in new templates

login
register
mail settings
Submitter Steve Borho
Date Jan. 23, 2014, 8:10 p.m.
Message ID <6f6915787a7f04d84c8c.1390507836@batman.gateway.pace.com>
Download mbox | patch
Permalink /patch/3405/
State Accepted
Commit 4dd91c466a816b59b8ce7c83f094a7e7ef92bdcc
Headers show

Comments

Steve Borho - Jan. 23, 2014, 8:10 p.m.
# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1390507575 21600
#      Thu Jan 23 14:06:15 2014 -0600
# Branch stable
# Node ID 6f6915787a7f04d84c8ce8e77efea08085105aef
# Parent  dbf305f499613e6b833847b72f1eb5424f9331cc
wix: pull in new templates
Matt Mackall - Jan. 23, 2014, 11:16 p.m.
On Thu, 2014-01-23 at 14:10 -0600, Steve Borho wrote:
> # HG changeset patch
> # User Steve Borho <steve@borho.org>
> # Date 1390507575 21600
> #      Thu Jan 23 14:06:15 2014 -0600
> # Branch stable
> # Node ID 6f6915787a7f04d84c8ce8e77efea08085105aef
> # Parent  dbf305f499613e6b833847b72f1eb5424f9331cc
> wix: pull in new templates

Queued for stable, thanks.

Patch

# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1390507575 21600
#      Thu Jan 23 14:06:15 2014 -0600
# Branch stable
# Node ID 6f6915787a7f04d84c8ce8e77efea08085105aef
# Parent  dbf305f499613e6b833847b72f1eb5424f9331cc
wix: pull in new templates

diff -r dbf305f49961 -r 6f6915787a7f contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi	Tue Jan 21 14:44:40 2014 -0600
+++ b/contrib/wix/guids.wxi	Thu Jan 23 14:06:15 2014 -0600
@@ -24,16 +24,16 @@ 
   <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
 
   <!-- templates.wxs -->
-  <?define templates.root.guid = {8DF97574-33E9-412F-8414-65B48BB18783} ?>
-  <?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?>
+  <?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?>
+  <?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?>
   <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
   <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?>
   <?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?>
   <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?>
-  <?define templates.raw.guid = {3F88E9B6-EA3C-41EB-8D8A-3F12E7DE9933} ?>
-  <?define templates.rss.guid = {36069748-1E2A-472B-A212-506CB656A9C1} ?>
+  <?define templates.raw.guid = {834DF8D7-9784-43A6-851D-A96CE1B3575B} ?>
+  <?define templates.rss.guid = {9338FA09-E128-4B1C-B723-1142DBD09E14} ?>
   <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
-  <?define templates.static.guid = {B27D7311-050A-4A96-9971-B674A0EA21D0} ?>
+  <?define templates.static.guid = {6B3D7C24-98DA-4B67-9F18-35F77357B0B4} ?>
 
   <!-- mercurial.wxs -->
   <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?>
diff -r dbf305f49961 -r 6f6915787a7f contrib/wix/templates.wxs
--- a/contrib/wix/templates.wxs	Tue Jan 21 14:44:40 2014 -0600
+++ b/contrib/wix/templates.wxs	Thu Jan 23 14:06:15 2014 -0600
@@ -33,6 +33,7 @@ 
           <File Name="map-cmdline.default" />
           <File Name="map-cmdline.bisect" />
           <File Name="map-cmdline.xml" />
+          <File Name="map-cmdline.phases" />
         </Component>
 
         <Directory Id="templates.atomdir" Name="atom">
@@ -45,6 +46,8 @@ 
             <File Id="atom.map"                 Name="map" />
             <File Id="atom.tagentry.tmpl"       Name="tagentry.tmpl" />
             <File Id="atom.tags.tmpl"           Name="tags.tmpl" />
+            <File Id="atom.branchentry.tmpl"    Name="branchentry.tmpl" />
+            <File Id="atom.branches.tmpl"       Name="branches.tmpl" />
             <File Id="atom.bookmarks.tmpl"      Name="bookmarks.tmpl" />
             <File Id="atom.bookmarkentry.tmpl"  Name="bookmarkentry.tmpl" />
           </Component>
@@ -157,6 +160,9 @@ 
             <File Id="raw.manifest.tmpl"     Name="manifest.tmpl" />
             <File Id="raw.map"               Name="map" />
             <File Id="raw.notfound.tmpl"     Name="notfound.tmpl" />
+            <File Id="raw.search.tmpl"       Name="search.tmpl" />
+            <File Id="raw.logentry.tmpl"     Name="logentry.tmpl" />
+            <File Id="raw.changelog.tmpl"    Name="changelog.tmpl" />
           </Component>
         </Directory>
 
@@ -173,6 +179,8 @@ 
             <File Id="rss.tags.tmpl"           Name="tags.tmpl" />
             <File Id="rss.bookmarks.tmpl"      Name="bookmarks.tmpl" />
             <File Id="rss.bookmarkentry.tmpl"  Name="bookmarkentry.tmpl" />
+            <File Id="rss.branchentry.tmpl"    Name="branchentry.tmpl" />
+            <File Id="rss.branches.tmpl"       Name="branches.tmpl" />
           </Component>
         </Directory>
 
@@ -216,6 +224,7 @@ 
             <File Id="static.style.monoblue.css" Name="style-monoblue.css" />
             <File Id="static.style.paper.css"    Name="style-paper.css" />
             <File Id="static.style.css"          Name="style.css" />
+            <File Id="static.feed.icon"          Name="feed-icon-14x14.png" />
           </Component>
         </Directory>