diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
| commit | 6bae67c3e7c66af9e8ce1605070f7e92f247f0cb (patch) | |
| tree | 64dc7e2588cc5c17fdb6c801877792f83cfcecf3 /docs/pkg | |
| parent | 00efccabb1eb6c3597282bc0e095cf2026f75a3b (diff) | |
| parent | 00d98a47c60764475d97df1c2eb847e20a77cae5 (diff) | |
Merge tag '0.3.0' into debian
Tag bitmask version 0.3.0
Conflicts:
.coveragerc
.tx/config
NEWS.rst
setup.cfg
src/leap/base/checks.py
src/leap/base/exceptions.py
src/leap/base/tests/test_checks.py
src/leap/eip/checks.py
src/leap/gui/firstrun/login.py
src/leap/gui/locale_rc.py
src/leap/util/polkit.py
tests/test_qt_environment.py
tox.ini
Diffstat (limited to 'docs/pkg')
| -rw-r--r-- | docs/pkg/debian.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/pkg/debian.rst b/docs/pkg/debian.rst index e98032a5..204d4073 100644 --- a/docs/pkg/debian.rst +++ b/docs/pkg/debian.rst @@ -10,9 +10,9 @@ Dependencies ------------ * ``openvpn`` -* ``python-qt4`` +* ``python-pyside`` * ``python-crypto`` -* ``python setuptools`` +* ``python-setuptools`` * ``python-requests`` * ``python-openssl`` |