Update to 0.14.20.

Approved by:	swills (maintainer)

4 files changed, 89 insertions, 83 deletions

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 8e318c69e809..e3cf9c40f58c 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xpra
-PORTVERSION=	0.12.6
-PORTREVISION=	2
+PORTVERSION=	0.14.20
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
@@ -22,19 +21,23 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolki
 		setxkbmap:${PORTSDIR}/x11/setxkbmap \
 		pulseaudio:${PORTSDIR}/audio/pulseaudio \
 		ssh-askpass:${PORTSDIR}/security/openssh-askpass
-LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264 \
+LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libvpx.so:${PORTSDIR}/multimedia/libvpx
+		libvpx.so:${PORTSDIR}/multimedia/libvpx \
+		libx264.so:${PORTSDIR}/multimedia/libx264 \
+		libx265.so:${PORTSDIR}/multimedia/x265 \
 
-USES=		pkgconfig python tar:bzip2
+USES=		pkgconfig python tar:xz
 USE_PYTHON=	distutils
-USE_XORG=	x11 xtst xfixes xcomposite xdamage xrandr
+USE_XORG=	x11 xcomposite xdamage xfixes xkbfile xrandr xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
 
 PYDISTUTILS_PKGNAME=	xpra_all
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/xpra/Xvfb/xpra.conf ${STAGEDIR}/${ETCDIR}/xpra.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/etc/xpra/xorg.conf ${STAGEDIR}/${ETCDIR}/xorg.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/xpra/xorg.conf \
+	    ${STAGEDIR}/${ETCDIR}/xorg.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/build/xpra.conf \
+	    ${STAGEDIR}/${ETCDIR}/xpra.conf.sample
 
 .include <bsd.port.mk>
diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo
index a0cb662808c2..5aa7bcc2dfbd 100644
--- a/x11/xpra/distinfo
+++ b/x11/xpra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.12.6.tar.bz2) = 6fcfb9102b9abea1b3b5c76f70626984f86e3813e792ebb1d63bbf4eccc1ce7e
-SIZE (xpra-0.12.6.tar.bz2) = 1083020
+SHA256 (xpra-0.14.20.tar.xz) = 3bd2d4e7ac992f3af9606bb6292c4803d8a8a05b3c1bd625d4fd584b5aca9b3a
+SIZE (xpra-0.14.20.tar.xz) = 1144552
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py
index ddd999e7608f..3a65b46f8a52 100644
--- a/x11/xpra/files/patch-setup.py
+++ b/x11/xpra/files/patch-setup.py
@@ -1,24 +1,11 @@
---- setup.py.orig	2014-05-03 11:17:34.000000000 +0200
-+++ setup.py	2014-05-10 23:32:05.126238947 +0200
-@@ -960,7 +960,7 @@
+--- setup.py.orig	2015-02-17 19:57:07.000000000 -0500
++++ setup.py	2015-03-11 14:49:57.342199000 -0400
+@@ -1416,7 +1416,7 @@
+ else:
      #OSX and *nix:
      scripts += ["scripts/xpra", "scripts/xpra_launcher"]
-     data_files += [
--                    ("share/man/man1",      ["man/xpra.1", "man/xpra_launcher.1"]),
-+                    ("man/man1",      ["man/xpra.1", "man/xpra_launcher.1"]),
-                     ("share/xpra",          ["README", "COPYING"]),
-                     ("share/xpra/icons",    glob.glob("icons/*")),
-                     ("share/applications",  ["xdg/xpra_launcher.desktop", "xdg/xpra.desktop"]),
-@@ -1003,7 +1003,11 @@
-             if not use_Xdummy_wrapper and "scripts/xpra_Xdummy" in scripts:
-                 #if we're not using the wrapper, don't install it
-                 scripts.remove("scripts/xpra_Xdummy")
--            etc_files.append(xorg_conf)
-+            ## FreeBSD ports: we want to install this as xpra.conf.sample
-+            ## Prevent it here, handle in post-install target
-+            #etc_files.append(xorg_conf)
-+            ## FreeBSD ports: override etc_prefix
-+            etc_prefix='etc/xpra'
-         data_files.append((etc_prefix, etc_files))
- 
-     if OSX and "py2app" in sys.argv:
+-    add_data_files("share/man/man1",      ["man/xpra.1", "man/xpra_launcher.1"])
++    add_data_files("man/man1",      ["man/xpra.1", "man/xpra_launcher.1"])
+     add_data_files("share/xpra",          ["README", "COPYING"])
+     add_data_files("share/xpra/icons",    glob.glob("icons/*"))
+     add_data_files("share/applications",  ["xdg/xpra_launcher.desktop", "xdg/xpra.desktop"])
diff --git a/x11/xpra/pkg-plist b/x11/xpra/pkg-plist
index a53b6a10f62e..64f7db3bb293 100644
--- a/x11/xpra/pkg-plist
+++ b/x11/xpra/pkg-plist
@@ -1,13 +1,8 @@
 bin/xpra
 bin/xpra_Xdummy
 bin/xpra_launcher
-%%ETCDIR%%/xorg.conf
-%%ETCDIR%%/xorg.conf.sample
-%%ETCDIR%%/xpra.conf.sample
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+@sample %%ETCDIR%%/xorg.conf.sample
+@sample %%ETCDIR%%/xpra.conf.sample
 %%PYTHON_SITELIBDIR%%/xpra/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/__init__.pyo
@@ -59,9 +54,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_launcher.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_launcher.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_launcher.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyo
@@ -95,9 +87,15 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/about.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/about.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/about.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/bug_report.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/bug_report.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/bug_report.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/client_launcher.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/client_launcher.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/client_launcher.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_client_base.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_client_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_client_base.pyo
@@ -110,6 +108,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_tray_menu_base.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_tray_menu_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_tray_menu_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_version_info.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_version_info.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_version_info.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_window_backing_base.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_window_backing_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_window_backing_base.pyo
@@ -172,23 +173,14 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/colorspace_converter.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/colorspace_converter.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_opencl/opencl_kernels.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/colorspace_converter.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec/decoder.so
+%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.pyo
@@ -199,6 +191,10 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/encoder.so
+%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyo
@@ -213,18 +209,11 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/decode.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/decode.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/decode.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/encode.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/encode.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/encode.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/handlers.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/handlers.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/webm/handlers.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/decode.so
+%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/encode.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo
@@ -247,6 +236,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/cursor_names.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/cursor_names.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/cursor_names.pyo
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/error.py
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/error.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/error.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gdk_atoms.so
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gobject_compat.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gobject_compat.pyc
@@ -284,9 +276,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/quit.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/quit.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/quit.pyo
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/region.py
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/region.pyc
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/region.pyo
 %%PYTHON_SITELIBDIR%%/xpra/keyboard/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/keyboard/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/keyboard/__init__.pyo
@@ -315,19 +304,34 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.py
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/compression.py
+%%PYTHON_SITELIBDIR%%/xpra/net/compression.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/compression.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/crypto.py
+%%PYTHON_SITELIBDIR%%/xpra/net/crypto.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/crypto.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.py
+%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/header.py
+%%PYTHON_SITELIBDIR%%/xpra/net/header.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/header.pyo
 %%PYTHON_SITELIBDIR%%/xpra/net/mmap_pipe.py
 %%PYTHON_SITELIBDIR%%/xpra/net/mmap_pipe.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/mmap_pipe.pyo
 %%PYTHON_SITELIBDIR%%/xpra/net/net_util.py
 %%PYTHON_SITELIBDIR%%/xpra/net/net_util.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/net_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/packet_encoding.py
+%%PYTHON_SITELIBDIR%%/xpra/net/packet_encoding.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/packet_encoding.pyo
 %%PYTHON_SITELIBDIR%%/xpra/net/protocol.py
 %%PYTHON_SITELIBDIR%%/xpra/net/protocol.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/protocol.pyo
 %%PYTHON_SITELIBDIR%%/xpra/net/rencode/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/net/rencode/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/rencode/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/_rencode.so
+%%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode.so
 %%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.py
 %%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.pyo
@@ -409,6 +413,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/scripts/server.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/scripts/server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/scripts/version.py
+%%PYTHON_SITELIBDIR%%/xpra/scripts/version.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/version.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/server/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__init__.pyo
@@ -457,6 +464,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.py
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/keyboard_config_base.py
+%%PYTHON_SITELIBDIR%%/xpra/server/keyboard_config_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/keyboard_config_base.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.py
 %%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyo
@@ -469,6 +479,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.py
 %%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/region.py
+%%PYTHON_SITELIBDIR%%/xpra/server/region.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/region.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.py
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyo
@@ -497,6 +510,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/server/stats/pymaths.py
 %%PYTHON_SITELIBDIR%%/xpra/server/stats/pymaths.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/stats/pymaths.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.py
+%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/window_source.py
 %%PYTHON_SITELIBDIR%%/xpra/server/window_source.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/window_source.pyo
@@ -506,9 +522,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.py
 %%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.pyo
-%%PYTHON_SITELIBDIR%%/xpra/signal_object.py
-%%PYTHON_SITELIBDIR%%/xpra/signal_object.pyc
-%%PYTHON_SITELIBDIR%%/xpra/signal_object.pyo
 %%PYTHON_SITELIBDIR%%/xpra/simple_stats.py
 %%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyc
 %%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyo
@@ -567,17 +580,11 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/error.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/error.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/error.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/gdk_bindings.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/gdk_display_source.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/pointer_grab.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/pointer_grab.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/pointer_grab.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyo
@@ -623,18 +630,24 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyo
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+man/man1/xpra.1.gz
+man/man1/xpra_launcher.1.gz
 share/applications/xpra.desktop
 share/applications/xpra_launcher.desktop
 share/icons/xpra.png
-man/man1/xpra.1.gz
-man/man1/xpra_launcher.1.gz
 %%DATADIR%%/COPYING
 %%DATADIR%%/README
 %%DATADIR%%/icons/browse.png
+%%DATADIR%%/icons/bugs.png
 %%DATADIR%%/icons/clipboard.png
 %%DATADIR%%/icons/close.png
 %%DATADIR%%/icons/compressed.png
 %%DATADIR%%/icons/connect.png
+%%DATADIR%%/icons/download.png
 %%DATADIR%%/icons/encoding.png
 %%DATADIR%%/icons/features.png
 %%DATADIR%%/icons/information.png
@@ -652,17 +665,20 @@ man/man1/xpra_launcher.1.gz
 %%DATADIR%%/icons/ticked-small.png
 %%DATADIR%%/icons/unticked-small.png
 %%DATADIR%%/icons/xpra.png
-%%DATADIR%%/webm/LICENSE
 %%DATADIR%%/www/favicon.ico
 %%DATADIR%%/www/favicon.png
 %%DATADIR%%/www/include/bencode.js
 %%DATADIR%%/www/include/close.png
 %%DATADIR%%/www/include/deflate.min.js
 %%DATADIR%%/www/include/inflate.min.js
+%%DATADIR%%/www/include/jquery.min.js
+%%DATADIR%%/www/include/jqueryui.min.js
 %%DATADIR%%/www/include/keycodes.js
 %%DATADIR%%/www/include/maximize.png
 %%DATADIR%%/www/include/minimize.png
 %%DATADIR%%/www/include/protocol.js
+%%DATADIR%%/www/include/protocol_host.js
+%%DATADIR%%/www/include/protocol_worker.js
 %%DATADIR%%/www/include/shapes.js
 %%DATADIR%%/www/include/util.js
 %%DATADIR%%/www/include/web-socket-js/README.txt