From 5cead1f661f7dbf7137e3836bb1259310ee8048b Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 12 Dec 2019 18:57:21 +0100 Subject: [PATCH] Update to 68.3.0 --- WAPT/control | 24 +++++++++++++++--------- WAPT/wapt.psproj | 6 +++--- setup.py | 25 +++++++++++++++++++++++++ win32/Thunderbird Setup 60.9.0.exe | 3 --- win32/Thunderbird Setup 68.3.0.exe | 3 +++ win64/Thunderbird Setup 60.9.0.exe | 3 --- win64/Thunderbird Setup 68.3.0.exe | 3 +++ 7 files changed, 49 insertions(+), 18 deletions(-) delete mode 100644 win32/Thunderbird Setup 60.9.0.exe create mode 100644 win32/Thunderbird Setup 68.3.0.exe delete mode 100644 win64/Thunderbird Setup 60.9.0.exe create mode 100644 win64/Thunderbird Setup 68.3.0.exe diff --git a/WAPT/control b/WAPT/control index a8a51a9..8423dfd 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,18 +1,20 @@ package : fws-thunderbird -version : 60.9.0-3 +version : 68.3.0-8 architecture : all section : base priority : optional -maintainer : Florent Heuze +name : +categories : +maintainer : Daniel Berteaud description : Mozilla Thunderbird email client depends : conflicts : -maturity : PROD +maturity : RC locale : fr target_os : windows min_os_version : 6.1 max_os_version : -min_wapt_version : 1.5 +min_wapt_version : 1.7 sources : installed_size : impacted_process : thunderbird.exe @@ -25,8 +27,12 @@ editor : keywords : email,mail,pop,imap,smtp licence : homepage : https://www.thunderbird.net/fr/ -package_uuid : -signer : Florent Heuze -signer_fingerprint: -signature_date : -signed_attributes : \ No newline at end of file +package_uuid : 5a465721-6d9e-4034-b392-68b23972b93f +valid_from : +valid_until : +forced_install_on : +signer : Daniel Berteaud +signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a +signature : 4xDGbjz/oKfNWe+/j4XYu/XXkcgokWSbNuktyIztqacMEbdoAydUan9vqGOAMoOvxDpMCQPE+IeWRDe2kbPY4qSYINkXmLfcijr4ZxXL4MZy2Ni2AH6/NJHNe1HMHZEQ1grSAx6LmWwhTF9tvJMCW4puPEEMx9AfE+A1QgjjhfjEjxi/773WHW1/dNtwjFSDpxJsGOPljXmhgK6m0Nwk7gBc+fiM/4blGLcpOPeLv7dXO6KLc+5j3VOVeQIVCqdxoi2RmUop3JKwWC1pO2H5nJRbJg1L2V/t/VR/gUi+zNcEY/Guez0ECRZRnMNa38skSyQa7dOInnALHY3C+lYqEA== +signature_date : 2019-12-12T15:30:40.980000 +signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes \ No newline at end of file diff --git a/WAPT/wapt.psproj b/WAPT/wapt.psproj index 7574004..e6498c6 100644 --- a/WAPT/wapt.psproj +++ b/WAPT/wapt.psproj @@ -1,5 +1,5 @@ [PyScripter] -Version=3.4.2.0 +Version=3.6.1.0 [Project] ClassName=TProjectRootNode @@ -46,11 +46,11 @@ FileName=$[Project-Path]control [Project\ChildNodes\Node0\ChildNodes\Node3] ClassName=TProjectFileNode -FileName=C:\waptdev\wapt-thunderbird\local-settings.cfg +FileName=C:\waptdev\wapt-thunderbird\local-settings.js [Project\ChildNodes\Node0\ChildNodes\Node4] ClassName=TProjectFileNode -FileName=C:\waptdev\wapt-thunderbird\local-settings.js +FileName=C:\waptdev\wapt-thunderbird\local-settings.cfg [Project\ChildNodes\Node0\ChildNodes\Node5] ClassName=TProjectFileNode diff --git a/setup.py b/setup.py index 164f15e..0592697 100644 --- a/setup.py +++ b/setup.py @@ -20,15 +20,33 @@ # along with WAPT. If not, see . # # ----------------------------------------------------------------------- + from setuphelpers import * import time import subprocess uninstallkey = [] +def on_dist_backup(operation,src,dst): + # When we backup the distribution dir, we have to exclude + # lightning as a new version will be installed, bundled with TB itself. + # Everything else should be backed up + if src.endswith("{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi"): + print("Skiping Lightning XPI") + return False + else: + return True + def install(): waptversion = Version(__version__) + # Backup distribution/extensions as a TB upgrade wipe it + backup_dist = False + if isdir(makepath(programfiles, "Mozilla Thunderbird", "distribution")): + print("Taking a backup of the distribution directory") + backup_dist = True + copytree2(src=makepath(programfiles, "Mozilla Thunderbird", "distribution"), dst="distribution", oncopy=on_dist_backup) + if waptversion > Version('1.5') : softname = 'Mozilla Thunderbird' @@ -49,6 +67,7 @@ def install(): time.sleep (5) version = control.version.split('-',1)[0] + major_version = control.version.split('.',1)[0] arch = control.architecture #locale = control.locale locale = 'fr' @@ -63,9 +82,15 @@ def install(): difffreespace = diskfreespacebefore - diskfreespaceafter print(ur"Needed disk space : " + str(difffreespace)) + # Now restore distribution backup + if backup_dist: + print("Restoring distribution directory") + copytree2(src=r'distribution', dst=makepath(programfiles, "Mozilla Thunderbird", "distribution")) + else: error('This package is not compatible with your WAPT version. Please upgrade to WAPT 1.5 or more.') + def update_package(): """updates the package / control version with the latest stable thunderbird version""" import re,requests,urlparse,glob diff --git a/win32/Thunderbird Setup 60.9.0.exe b/win32/Thunderbird Setup 60.9.0.exe deleted file mode 100644 index 1a9c3a8..0000000 --- a/win32/Thunderbird Setup 60.9.0.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22a7334ec6a5c09f5da828085aca4ff78f5866951523dd88d7b993f8a168d19d -size 32233688 diff --git a/win32/Thunderbird Setup 68.3.0.exe b/win32/Thunderbird Setup 68.3.0.exe new file mode 100644 index 0000000..f1fc2d0 --- /dev/null +++ b/win32/Thunderbird Setup 68.3.0.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22676bd610ef5f5a96b6a5ab0e6a420a9b1e5c27d4c14f774f0c095871870b09 +size 41183504 diff --git a/win64/Thunderbird Setup 60.9.0.exe b/win64/Thunderbird Setup 60.9.0.exe deleted file mode 100644 index bc68ac0..0000000 --- a/win64/Thunderbird Setup 60.9.0.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98c17dfa6b503204dc80cb76e5e23276ddd99790e9340fc1790d71e8faee5a20 -size 35984296 diff --git a/win64/Thunderbird Setup 68.3.0.exe b/win64/Thunderbird Setup 68.3.0.exe new file mode 100644 index 0000000..c97f875 --- /dev/null +++ b/win64/Thunderbird Setup 68.3.0.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cca969a6c75aea69f817b216eda1b50c541b0027de61d905620bbedf57a06b19 +size 42772800