Clean up dependencies, and remove requirements.txt because it is out-of-date and...

diff --git a/BUILD.md b/BUILD.md
index 3435d34f88f188d05196d0b285cfb71cebbf222c..6155893a362aeea7e9e5b85a01f86f6ed3467c1f 100644 (file)
--- a/BUILD.md
+++ b/BUILD.md
@@ -12,7 +12,7 @@ Then install dependencies, build a package, and install:
 ### Debian, Ubuntu, Linux Mint, etc.
 
 ```sh
-sudo apt-get install build-essential dh-python python3-all python3-stdeb python3-qt5 python3-gpg python3-requests python3-socks gnupg2 tor
+sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyqt5 python3-gpg python3-requests python3-socks gnupg2 tor
 ./build_deb.sh
 sudo dpkg -i deb_dist/torbrowser-launcher_*.deb
 ```
@@ -20,7 +20,7 @@ sudo dpkg -i deb_dist/torbrowser-launcher_*.deb
 ### Red Hat, Fedora, CentOS, etc.
 
 ```sh
-sudo dnf install rpm-build python3-qt5 python3-gpg python3-requests python3-pysocks gnupg2
+sudo dnf install rpm-build python3-qt5 python3-gpg python3-requests python3-pysocks gnupg2 tor
 ./build_rpm.sh
 sudo yum install dist/torbrowser-launcher-*.rpm
 ```

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644 (file)
index 48bafe6..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# the hashes in this requirements file can be used by peep.
-
-# sha256: UNMM7nB3D9RNt86kIcsvt1ryR8OhzVSIXAazCnyF3SM
-Parsley==1.2
-
-# sha256: 9OuUqrPqnuzznO9G6Ht0J2XPDBnb5UT8XKIh5wBqdQ8
-txsocksx==1.13.0.1
-
-# sha256: vf2WGsIhb1xlsH8sOl5RFvZxO4wc8HbEABDGSBDSaWM
-Twisted==14.0.0
-
-# sha256: kcunt818uC9vTgI_53-U3D30rlKH_VXe8hSNwjLQx9o
-zope.interface==4.1.1
-
-# Note: PyGObject is also required, but it is not installable using pip. To
-# install torbrowser-launcher in a virtualenv, you'll need to create the
-# virtualenv with --system-site-packages and install PyGObject somehow. On
-# Debian you can get it from the python-gobject-2 package.

diff --git a/stdeb.cfg b/stdeb.cfg
index 2ad3ac433c1d9fd28bb6e0f57e123c7079025008..44595d6f3574c5ceb3c9d6cf68cbb5f1de14cedd 100644 (file)
--- a/stdeb.cfg
+++ b/stdeb.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 Package: torbrowser-launcher
-Depends: python3-qt5, python3-gpg, python3-requests, python3-socks, gnupg2
+Depends: python3-pyqt5, python3-gpg, python3-requests, python3-socks, gnupg2
 Build-Depends: dh-python
 Recommends: tor
 Suite: artful