diff --git a/TortoiseGit-2.10.0.0-32bit.msi b/TortoiseGit-2.10.0.0-32bit.msi deleted file mode 100644 index 23988e7..0000000 --- a/TortoiseGit-2.10.0.0-32bit.msi +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ab86b901451e75ab6a275c6e93463195d6c977c8c3b58b84e970b113d224b4a -size 17735680 diff --git a/TortoiseGit-2.10.0.0-64bit.msi b/TortoiseGit-2.10.0.0-64bit.msi deleted file mode 100644 index 7a6f106..0000000 --- a/TortoiseGit-2.10.0.0-64bit.msi +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf7ae25b89502cef6e5f5f75b81cab88e534c3e8c5d7f502970ae8326a5db8f4 -size 19787776 diff --git a/TortoiseGit-2.10.0.2-32bit.msi b/TortoiseGit-2.10.0.2-32bit.msi new file mode 100644 index 0000000..3b6b1d8 --- /dev/null +++ b/TortoiseGit-2.10.0.2-32bit.msi @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d42b3f5708cc4a26eb6aa418f33eba2d571203f5db6c583632b065c34c1a59 +size 17641472 diff --git a/TortoiseGit-2.10.0.2-64bit.msi b/TortoiseGit-2.10.0.2-64bit.msi new file mode 100644 index 0000000..8aca771 --- /dev/null +++ b/TortoiseGit-2.10.0.2-64bit.msi @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd7c1c304b6b2b9ba77ce86e86900e76d93e3fad4367a1b5db4ff162f1d3ea50 +size 19898368 diff --git a/WAPT/control b/WAPT/control index d23edf0..42ec790 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-tortoisegit -version : 2.10.0.0-1 +version : 2.10.0.2-1 architecture : all section : base priority : optional @@ -31,12 +31,12 @@ editor : keywords : licence : GPLv2+ homepage : https://tortoisegit.org -package_uuid : 49426b44-cbe4-4808-b319-cd2975d78503 +package_uuid : 0d8a5de4-7489-48c7-8720-d27dfde8d024 valid_from : valid_until : forced_install_on : signer : Daniel Berteaud signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a -signature : X78Z74vF0eZl8nr3+rjYwahPAGAUVr32FL3/eJxxIEDDDi5a+R3s9x91DVzevuqNnJvJfxXOc+AAky5ZfDyRh8SSq+ED96H8ktqNrPMbf1gvpwyjDapwzjdM3aQF12GyKTLNT6VqCGvTIsUwInGPATncox5JB8P6sLDvG6AkHoGaSHnF4NFi9EIjCXudsZ2Ukj5z4h+dJta5c+xMux2owxvXLmu5n22mR4VVb2EZBftWZLHW3a7IwY5m6AP1Zz9eJMUEz3lfz11Z42NGrsT5cP0NPSJU8OaGla+lV3VS4Mkl/ja6sWoWvP/egHWFkFs+LPAc0kyyBHrtTossJQ2s/Q== -signature_date : 2020-03-02T14:27:55.205000 +signature : Nq1pLNHJbADE7UaLBER0H/iwGPZY3ly4ujQjFcS9PHm1egtFdpJkl7+R7MuV/qNxvpoEi2GmnJvkSFZEHmr3hP5cKExRey1xE3ACps0wAdKZ9zOUSVQ8m3RVYqyFxfZ3WES/Er17rqZS3oSwD9lKIJKiZ317l59UqQfrDwZY4g/8sq0mjV1YCvThf+9ZPdRWbdRMBGOcy6seJZIx6R59ik3WTEoLbkShn/iuakicV7aWLfBrgGhtSrmVNwNX7/3/uv74dCveRAHntRGTBxM5C+ftuSjI8XQIpx/xm+oRt7nRILtd4HpRO2xqqPclLNp92FzVL+nVuCX23zEnxQa1GQ== +signature_date : 2020-03-25T13:15:06.361000 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,description_pt,description_it,description_nl,description_ru,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 6387c30..abf155a 100644 --- a/setup.py +++ b/setup.py @@ -14,17 +14,19 @@ def update_package(): print('Updating Tortoise Git Package') download = requests.get('https://tortoisegit.org/download/').text try: - version = re.search('The current stable version is: (\d+\.\d+\.\d+)', download).group(1) + version = re.search('Download TortoiseGit (\d+\.\d+\.\d+\.\d+)', download).group(1) except: error('Version not found') + # Minor versions are served from the dir of the branch. Eg 2.10.0.2 is in the 2.10.0.0 folder + branch = re.sub(r'\d+$', '0', version) print('Latest version is %s' % version) pe = PackageEntry(); control = pe.load_control_from_wapt('.') for arch in ['32','64']: - filename = 'TortoiseGit-%s.0-%sbit.msi' % (version, arch) - url = 'https://download.tortoisegit.org/tgit/%s.0/%s' % (version, filename) - if not isfile('TortoiseGit-%s.0-%sbit.msi' % (version, arch)): + filename = 'TortoiseGit-%s-%sbit.msi' % (version, arch) + url = 'https://download.tortoisegit.org/tgit/%s/%s' % (branch, filename) + if not isfile('TortoiseGit-%s-%sbit.msi' % (version, arch)): print('Downloading Tortoise Git %s for win%s from %s' % (version, arch, url)) wget(url, filename) if isfile(filename):