Skip to content

Commit

Permalink
2.0: remove support or Python 2.7 versions without ssl.SSLContext, dr…
Browse files Browse the repository at this point in the history
…op support for wheezy and trusty

git-svn-id: https://xpra.org/svn/Xpra/trunk@14526 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Dec 10, 2016
1 parent 5bb4b9c commit e0c3dd3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 37 deletions.
44 changes: 7 additions & 37 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
#we need a vfb: either Xdummy (Debian) or Xvfb (Ubuntu breaks Xorg tty access)
#jessie: ,xserver-xorg-video-dummy
#stretch: ,xserver-xorg-video-dummy
#trusty: ,xvfb
#xenial: ,xvfb
#yakkety: ,xserver-xorg-video-dummy
# for opengl support:
Expand All @@ -52,14 +51,8 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
# fast hashing:
,python-xxhash
# depend on lz4 for those that have it, lzo otherwise:
#wheezy: ,python-lzo
#jessie: ,python-lz4
#stretch: ,python-lz4
#trusty: ,python-lzo
#xenial: ,python-lz4
#yakkety: ,python-lz4
,python-lz4
# if you use Ubuntu, you will "want" this mess:
#trusty: ,python-appindicator
#xenial: ,python-appindicator
#yakkety: ,python-appindicator
Recommends:
Expand All @@ -69,34 +62,15 @@ Recommends:
#xenial: ,libx264-148
#yakkety: ,libx264-148
# AES encryption:
#jessie: ,python-cryptography
#stretch: ,python-cryptography
#xenial: ,python-cryptography
#yakkety: ,python-cryptography
,python-cryptography
# audio-related:
#jessie: ,gstreamer1.0-plugins-base
#stretch: ,gstreamer1.0-plugins-base
#trusty: ,gstreamer1.0-plugins-base
#xenial: ,gstreamer1.0-plugins-base
#yakkety: ,gstreamer1.0-plugins-base
,gstreamer1.0-plugins-base
# ^^ vorbis ^^
#jessie: ,gstreamer1.0-plugins-good
#stretch: ,gstreamer1.0-plugins-good
#trusty: ,gstreamer1.0-plugins-good
#xenial: ,gstreamer1.0-plugins-good
#yakkety: ,gstreamer1.0-plugins-good
,gstreamer1.0-plugins-good
# ^^ wavpack, wav, flac, speex ^^
#jessie: ,gstreamer1.0-plugins-ugly
#stretch: ,gstreamer1.0-plugins-ugly
#trusty: ,gstreamer1.0-plugins-ugly
#xenial: ,gstreamer1.0-plugins-ugly
#yakkety: ,gstreamer1.0-plugins-ugly
,gstreamer1.0-plugins-ugly
# ^^ mp3 ^^
#jessie: ,python-gst-1.0
#stretch: ,python-gst-1.0
#trusty: ,python-gst-1.0
#xenial: ,python-gst-1.0
#yakkety: ,python-gst-1.0
,python-gst-1.0
#for printer forwarding:
,cups-filters
,cups-common
Expand All @@ -109,11 +83,7 @@ Recommends:
,openssh-client
,ssh-askpass
#recommend the alternative (those that recommend lz4 usually don't have it available at all):
#jessie: ,python-lzo
#stretch: ,python-lzo
#trusty: ,python-lz4
#xenial: ,python-lzo
#yakkety: ,python-lzo
,python-lzo
#for html5 support:
,websockify
# we cannot do versionned recommends but we need keyboard-configuration (>= 1.82)
Expand Down
3 changes: 3 additions & 0 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@

if sys.version<'2.7':
raise Exception("xpra no longer supports Python versions older than 2.7")
#we don't support versions of Python without the new ssl code:
import ssl.SSLContext
assert ssl.SSLContext

from hashlib import md5

Expand Down

0 comments on commit e0c3dd3

Please sign in to comment.