From b2c8a599921bdb55e40ee5c6d2fd9a3564226da9 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Fri, 20 Feb 2015 08:58:20 +0000
Subject: [PATCH] Deploy new chemistry-prefs.js for Thunderbird (to use lookup)
---
thunderbird.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/thunderbird.xml b/thunderbird.xml
index 74ae9da9..e6fe4924 100755
--- a/thunderbird.xml
+++ b/thunderbird.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<packages>
-<package id="thunderbird" name="Mozilla Thunderbird" revision="%version%.2" reboot="false" priority="0">
+<package id="thunderbird" name="Mozilla Thunderbird" revision="%version%.3" reboot="false" priority="0">
<!-- NB: we've had problems with major version bumps which sometimes change the format of options
we add in chemistry-prefs.js. Thus, we tie that to a version, and please test carefully when
@@ -19,11 +19,12 @@
<exit code="0" />
<exit code="128" />
</upgrade>
-
- <upgrade cmd='"%software%\thunderbird\Thunderbird Setup %version%.exe" -ms' />
+
+ <!-- one-off commenting out for 31.4.0 revision 3: just copy updated prefs file -->
+ <!-- <upgrade cmd='"%software%\thunderbird\Thunderbird Setup %version%.exe" -ms' /> -->
<upgrade cmd='cmd /c copy "%software%\thunderbird\chemistry-prefs.js-%version%" "%programfileswpkg%\mozilla thunderbird\defaults\pref\chemistry-prefs.js" '/>
- <upgrade cmd='cmd /c copy "%software%\thunderbird\cam.ac.uk.xml" "%programfileswpkg%\mozilla thunderbird\isp\cam.ac.uk.xml" '/>
- <upgrade cmd='%software%\wpkg\tools\copydir.cmd "%software%\thunderbird\dictionaries" "%programfileswpkg%\mozilla thunderbird\dictionaries"' />
+ <!-- <upgrade cmd='cmd /c copy "%software%\thunderbird\cam.ac.uk.xml" "%programfileswpkg%\mozilla thunderbird\isp\cam.ac.uk.xml" '/>
+ <upgrade cmd='%software%\wpkg\tools\copydir.cmd "%software%\thunderbird\dictionaries" "%programfileswpkg%\mozilla thunderbird\dictionaries"' /> -->
<remove cmd='taskkill /F /IM thunderbird.exe'>
<exit code="0" />
--
GitLab