diff --git a/Git-2.24.1.2-32-bit.exe b/Git-2.24.1.2-32-bit.exe deleted file mode 100644 index 39f5ec9..0000000 --- a/Git-2.24.1.2-32-bit.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:611b29cc8f29241ee6a096f5b9951ef95650368c93dfe1e95f8408d97b86d50b -size 47761608 diff --git a/Git-2.24.1.2-64-bit.exe b/Git-2.24.1.2-64-bit.exe deleted file mode 100644 index 216541e..0000000 --- a/Git-2.24.1.2-64-bit.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34e484936105713e7d0c2f421bf62e4cfe652f6638a9ecb5df2186c1918753e2 -size 48104224 diff --git a/Git-2.25.0-32-bit.exe b/Git-2.25.0-32-bit.exe new file mode 100644 index 0000000..df312c9 --- /dev/null +++ b/Git-2.25.0-32-bit.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c02f1a1f95e286df8b87c2812c9460f4c2d333bab7a654751e01e9801994045 +size 46638048 diff --git a/Git-2.25.0-64-bit.exe b/Git-2.25.0-64-bit.exe new file mode 100644 index 0000000..27ae0e8 --- /dev/null +++ b/Git-2.25.0-64-bit.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ffb0674a5f5fec2a328dd40456ede87ed3c7de653ecd6950f9cf132bca2f94c +size 46476880 diff --git a/WAPT/control b/WAPT/control index 0dc94f4..ab16bba 100644 --- 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 \ No newline at end of file diff --git a/setup.py b/setup.py index 95d208f..0488af0 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,8 @@ 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) - latest_version = '%s.%s' % (latest_version, latest_release) + if int(latest_release) > 1: + latest_version = '%s.%s' % (latest_version, latest_release) pe = PackageEntry(); control = pe.load_control_from_wapt('.') current_version = control['version'].split('-',1)[0]