Update to 2.25.0

5 years ago · f5d8846900
parent ea509b3e7a
commit f5d8846900
6 changed files with 12 additions and 11 deletions
--- a/Git-2.24.1.2-32-bit.exe
+++ b/Git-2.24.1.2-32-bit.exe
--- a/Git-2.24.1.2-64-bit.exe
+++ b/Git-2.24.1.2-64-bit.exe
--- a/Git-2.25.0-32-bit.exe
+++ b/Git-2.25.0-32-bit.exe
--- a/Git-2.25.0-64-bit.exe
+++ b/Git-2.25.0-64-bit.exe
--- a/WAPT/control
+++ b/WAPT/control
@ -1,5 +1,5 @@
 package           : fws-git
-version           : 2.24.1.2-2
+version           : 2.25.0-2
 architecture      : all
 section           : base
 priority          : optional
@ -27,12 +27,12 @@ editor            :
 keywords          : 
 licence           : GPLv2+
 homepage          : https://gitforwindows.org/
-package_uuid      : 3db7c660-cc62-4f12-b833-64d31ec953b0
+package_uuid      : a4a502e6-d91b-482b-9e8b-94314a6e0c50
 valid_from        : 
 valid_until       : 
 forced_install_on : 
 signer            : Daniel Berteaud
 signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a
-signature         : BffKjqSrlhXut5Cmt9++GDmkaA4cD0N9meTtUsaZ5XKne54lZ4I6d/cJFqVQv1Pc3tGH/w0R57yDB1fZjiCmDEqTJ/PHpzMBfUAHwFAFnJOmtSWORbrvoGd7/usEXUzLHQsRQP9sd9SOEQ+DqR1s/1Npg9mzlzIML7tAboXPsnMsIrhkNT2CZCYGaT+Va8pFtdsTC7tbC7WjOtueX9fov2kU6nqqLpMlODMDnLNtBwwNHMPKuz21wBJewXzBfQI/53zi+KFBbAdiOAB3RpHJ1G3RPPth+HWEggMjdYOCA0oSbrVepaI2BBK/vCaYK0zAYaJHgWcMKcbH4G2HozvvCg==
-signature_date    : 2019-12-11T11:56:14.450000
+signature         : tYiTt9WFD1MffWbbv3jD3yYm0lPI8Xajo5CD0DQejWUy88qmQnswJ7w7NtLU6PiIZXaoszoWDHjk0UVMe/6xvXsT5DKc45Gif8iwB6pOCxhSEzKvYfeJYuVfmVijZPGtoxsmgsdGUkqudlNjpUT5vuqBesUx3p4jpbyuOUuRQ3HFBukT9TM/qCy6YItao1jF3aHDl/26SdSXj8HyLOyv2jIlrxlJhzRlv0XEzMc5ulU7JSCAO/z/h/fwLsOHcLfJ1pRrgHNSUtrL93x/XwvxkG5Zd5eXDHml86AVwimUy1QNAosSqCPOMIg1JPqnPvFgolOkFAKFwMJ7t8RuO9Iuuw==
+signature_date    : 2020-01-14T09:24:23.377000
 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
--- a/setup.py
+++ b/setup.py
@ -21,6 +21,7 @@ def update_package():
    latest = json.loads(requests.get('https://api.github.com/repos/git-for-windows/git/releases/latest').text.encode('utf-8'))
    latest_version = re.search('v(.*)\.windows\.(\d+)', latest['tag_name']).group(1)
    latest_release = re.search('v(.*)\.windows\.(\d+)', latest['tag_name']).group(2)
+    if int(latest_release) > 1:
        latest_version = '%s.%s' % (latest_version, latest_release)
    pe = PackageEntry();
    control = pe.load_control_from_wapt('.')