commit b8c497a4eb16f8ea80914d6def714115977b6c11 Author: Georg Koppen gk@torproject.org Date: Wed Mar 27 19:53:13 2019 +0000

Revert "Bug 29868: Fix installation of python-future package"

This reverts commit f2e272082fc484f211e0539dc177b1948c4b5d68. --- projects/tor-browser/config | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e8c0b23..2a8d455 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -32,15 +32,12 @@ targets: - genisoimage - faketime windows: - pre: | - # Bug 29868: jessie-backports don't exist anymore, so we download the - # package we need from snapshot.debian.org - # We can remove this when we switch to Stretch (bug 29307) - DEBIAN_FRONTEND=noninteractive dpkg -i python-future_*_all.deb var: arch_deps: - # python-configparser is required by python-future - - python-configparser + - python-future + pre_pkginst: | + # enable jessie-backports for python-future + echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list windows-i686: var: mar_osname: win32 @@ -115,13 +112,6 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533b... sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' - # Bug 29868: jessie-backports don't exist anymore, so we download the - # package we need from snapshot.debian.org - # We can remove this when we switch to Stretch (bug 29307) - - name: python-future - URL: https://snapshot.debian.org/archive/debian/20190104T031048Z/pool/main/p/pyth... - sha256sum: da39bbc41a6143f68eb7b8d774aad8fe2483947c4e567c9b27f6a8455981450d - enable: '[% c("var/windows") %]' # To generate a new keystore, see how-to-generate-keystore.txt - filename: android-qa.keystore enable: '[% c("var/android") %]'