Update to 68.3.0

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 <daniel@firewall-services.com>
 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      : 
+package_uuid      : 5a465721-6d9e-4034-b392-68b23972b93f
-signer            : Florent Heuze
+valid_from        : 
-signer_fingerprint: 
+valid_until       : 
-signature_date    : 
+forced_install_on : 
-signed_attributes : 
+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

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

setup.py

@@ -20,15 +20,33 @@
 #    along with WAPT.  If not, see <http://www.gnu.org/licenses/>.
 #
 # -----------------------------------------------------------------------
+
 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