Index: archivers/Makefile
===================================================================
--- archivers/Makefile	(revision 388953)
+++ archivers/Makefile	(working copy)
@@ -161,6 +161,7 @@
     SUBDIR += pxz
     SUBDIR += py-liblzma
     SUBDIR += py-librtfcomp
+    SUBDIR += py-lz4
     SUBDIR += py-lzma
     SUBDIR += py-python-snappy
     SUBDIR += qpress
Index: archivers/py-lz4/Makefile
===================================================================
--- archivers/py-lz4/Makefile	(revision 0)
+++ archivers/py-lz4/Makefile	(working copy)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME=	lz4
+PORTVERSION=	0.7.0
+CATEGORIES=	archivers python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	jkim@FreeBSD.org
+COMMENT=	Python binding for the LZ4 compression library
+
+LICENSE=	BSD3CLAUSE
+
+USE_PYTHON=	autoplist distutils
+USES=		python
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lz4.so
+
+.include <bsd.port.mk>

Property changes on: archivers/py-lz4/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: archivers/py-lz4/distinfo
===================================================================
--- archivers/py-lz4/distinfo	(revision 0)
+++ archivers/py-lz4/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (lz4-0.7.0.tar.gz) = cd225744298568fd217577fc14a326a24835412374dadb5060db48f1af43eb48
+SIZE (lz4-0.7.0.tar.gz) = 26786

Property changes on: archivers/py-lz4/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: archivers/py-lz4/pkg-descr
===================================================================
--- archivers/py-lz4/pkg-descr	(revision 0)
+++ archivers/py-lz4/pkg-descr	(working copy)
@@ -0,0 +1,3 @@
+Bindings for the lz4 compression library by Yann Collet.
+
+WWW: https://github.com/steeve/python-lz4

Property changes on: archivers/py-lz4/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: converters/Makefile
===================================================================
--- converters/Makefile	(revision 388953)
+++ converters/Makefile	(working copy)
@@ -141,6 +141,7 @@
     SUBDIR += py-bsdconv
     SUBDIR += py-iconv
     SUBDIR += py-pisa
+    SUBDIR += py-rencode
     SUBDIR += py-unidecode
     SUBDIR += py-zfec
     SUBDIR += rcctools
Index: converters/py-rencode/Makefile
===================================================================
--- converters/py-rencode/Makefile	(revision 0)
+++ converters/py-rencode/Makefile	(working copy)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=	rencode
+PORTVERSION=	1.0.3
+CATEGORIES=	converters devel python
+MASTER_SITES=	https://www.xpra.org/src/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	jkim@FreeBSD.org
+COMMENT=	R-encoding and r-decoding implementation
+
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+
+USE_PYTHON=	autoplist distutils
+USES=		python tar:xz
+
+.include <bsd.port.mk>

Property changes on: converters/py-rencode/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: converters/py-rencode/distinfo
===================================================================
--- converters/py-rencode/distinfo	(revision 0)
+++ converters/py-rencode/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (rencode-1.0.3.tar.xz) = f0e48d55b5fd6c5998416fa4220d51f91008aef72560ec351dd35b3872d0b9a9
+SIZE (rencode-1.0.3.tar.xz) = 21184

Property changes on: converters/py-rencode/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: converters/py-rencode/pkg-descr
===================================================================
--- converters/py-rencode/pkg-descr	(revision 0)
+++ converters/py-rencode/pkg-descr	(working copy)
@@ -0,0 +1,10 @@
+The rencode module is similar to bencode from the BitTorrent project.
+For complex, heterogeneous data structures with many small elements,
+r-encodings take up significantly less space than b-encodings.
+
+This version of rencode is a complete rewrite in Cython to attempt to
+increase the performance over the pure Python module written by Petru
+Paler, Connelly Barnes et al.  Later, it was forked, enhanced, and
+bundled with Deluge.  Now, it is re-packaged and distributed by Xpra.
+
+WWW: https://github.com/aresch/rencode

Property changes on: converters/py-rencode/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/Makefile
===================================================================
--- graphics/Makefile	(revision 388953)
+++ graphics/Makefile	(working copy)
@@ -834,6 +834,7 @@
     SUBDIR += py-opencv
     SUBDIR += py-openexr
     SUBDIR += py-opengl
+    SUBDIR += py-opengl-accelerate
     SUBDIR += py-openimageio
     SUBDIR += py-paint
     SUBDIR += py-pillow
Index: graphics/py-opengl-accelerate/Makefile
===================================================================
--- graphics/py-opengl-accelerate/Makefile	(revision 0)
+++ graphics/py-opengl-accelerate/Makefile	(working copy)
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	opengl
+PORTVERSION=	3.0.1
+CATEGORIES=	graphics python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-accelerate
+DISTNAME=	PyOpenGL${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER=	jkim@FreeBSD.org
+COMMENT=	OpenGL acceleration code for PyOpenGL
+
+LICENSE=	BSD3CLAUSE
+
+BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+
+USE_PYTHON=	autoplist distutils
+USES=		python
+
+.include <bsd.port.mk>

Property changes on: graphics/py-opengl-accelerate/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/py-opengl-accelerate/distinfo
===================================================================
--- graphics/py-opengl-accelerate/distinfo	(revision 0)
+++ graphics/py-opengl-accelerate/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (PyOpenGL-accelerate-3.0.1.tar.gz) = 51bc771fd2fc9fc0acec5caf4dc3bd0739127eec4addc04baca545f8c3fe17cd
+SIZE (PyOpenGL-accelerate-3.0.1.tar.gz) = 194056

Property changes on: graphics/py-opengl-accelerate/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/py-opengl-accelerate/pkg-descr
===================================================================
--- graphics/py-opengl-accelerate/pkg-descr	(revision 0)
+++ graphics/py-opengl-accelerate/pkg-descr	(working copy)
@@ -0,0 +1,4 @@
+This set of C (Cython) extensions provides acceleration of common
+operations for slow points in PyOpenGL 3.x.
+
+WWW: http://pyopengl.sourceforge.net/

Property changes on: graphics/py-opengl-accelerate/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/Makefile
===================================================================
--- x11/Makefile	(revision 388953)
+++ x11/Makefile	(working copy)
@@ -435,6 +435,7 @@
     SUBDIR += xplsprinters
     SUBDIR += xpr
     SUBDIR += xpra
+    SUBDIR += xpra-devel
     SUBDIR += xprehashprinterlist
     SUBDIR += xprompt
     SUBDIR += xprop
Index: x11/xpra/Makefile
===================================================================
--- x11/xpra/Makefile	(revision 388953)
+++ x11/xpra/Makefile	(working copy)
@@ -28,6 +28,8 @@ LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
 		libx264.so:${PORTSDIR}/multimedia/libx264 \
 		libx265.so:${PORTSDIR}/multimedia/x265
 
+CONFLICTS_INSTALL=	xpra-devel-0.*
+
 USES=		pkgconfig python tar:xz
 USE_PYTHON=	distutils
 USE_XORG=	x11 xcomposite xdamage xfixes xkbfile xrandr xtst
Index: x11/xpra-devel/Makefile
===================================================================
--- x11/xpra-devel/Makefile	(revision 388953)
+++ x11/xpra-devel/Makefile	(working copy)
@@ -2,26 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	xpra
-PORTVERSION=	0.14.25
-PORTREVISION=	1
+PORTVERSION=	0.15.0
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	swills@FreeBSD.org
-COMMENT=	Xpra gives you persistent remote applications for X
+MAINTAINER=	jkim@FreeBSD.org
+COMMENT=	X Persistent Remote Applications
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/lz4.so:${PORTSDIR}/archivers/py-lz4 \
+		pulseaudio:${PORTSDIR}/audio/pulseaudio \
+		${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
+		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
+		${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:${PORTSDIR}/graphics/py-opengl-accelerate \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
+		${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi \
+		${PYTHON_SITELIBDIR}/netifaces.so:${PORTSDIR}/net/py-netifaces \
+		${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
+		ssh-askpass:${PORTSDIR}/security/openssh-askpass \
+		setxkbmap:${PORTSDIR}/x11/setxkbmap \
+		xauth:${PORTSDIR}/x11/xauth \
 		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-		xauth:${PORTSDIR}/x11/xauth \
-		setxkbmap:${PORTSDIR}/x11/setxkbmap \
-		pulseaudio:${PORTSDIR}/audio/pulseaudio \
-		ssh-askpass:${PORTSDIR}/security/openssh-askpass
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
 LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libvpx.so:${PORTSDIR}/multimedia/libvpx \
@@ -28,6 +36,8 @@ LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
 		libx264.so:${PORTSDIR}/multimedia/libx264 \
 		libx265.so:${PORTSDIR}/multimedia/x265
 
+CONFLICTS_INSTALL=	xpra-0.*
+
 USES=		pkgconfig python tar:xz
 USE_PYTHON=	distutils
 USE_XORG=	x11 xcomposite xdamage xfixes xkbfile xrandr xtst
@@ -35,10 +45,14 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHON_VER=
 
 PYDISTUTILS_PKGNAME=	xpra_all
 
+post-patch:
+	${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
+	    ${WRKSRC}/xpra/platform/pycups_printing.py
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/xpra/xorg.conf \
 	    ${STAGEDIR}${ETCDIR}/xorg.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/build/xpra.conf \
+	${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \
 	    ${STAGEDIR}${ETCDIR}/xpra.conf.sample
 
 .include <bsd.port.mk>
Index: x11/xpra-devel/distinfo
===================================================================
--- x11/xpra-devel/distinfo	(revision 388953)
+++ x11/xpra-devel/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.14.25.tar.xz) = a8618a2258bb71f029ac57374ce1dfc37ca15bf222de5f6f4102176cf560f1bb
-SIZE (xpra-0.14.25.tar.xz) = 1123272
+SHA256 (xpra-0.15.0.tar.xz) = bfa12806b245697b799a157f7882d0fa6abcb242a9937c3b0837cc779c0c519c
+SIZE (xpra-0.15.0.tar.xz) = 1191104
Index: x11/xpra-devel/files/patch-setup.py
===================================================================
--- x11/xpra-devel/files/patch-setup.py	(revision 388953)
+++ x11/xpra-devel/files/patch-setup.py	(working copy)
@@ -1,11 +1,25 @@
---- 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 @@
+--- setup.py.orig	2015-05-11 14:15:11 UTC
++++ setup.py
+@@ -1546,11 +1546,11 @@ if WIN32:
  else:
      #OSX and *nix:
      scripts += ["scripts/xpra", "scripts/xpra_launcher"]
 -    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("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"])
+-    add_data_files("share/icons",         ["xdg/xpra.png"])
++    add_data_files("share/pixmaps",       ["xdg/xpra.png"])
+     add_data_files("share/appdata",       ["xdg/xpra.appdata.xml"])
+     html5_dir = "share/xpra/www"
+ 
+@@ -1673,7 +1673,7 @@ if html5_ENABLED:
+ 
+ if printing_ENABLED and os.name=="posix":
+     #"/usr/lib/cups/backend":
+-    cups_backend_dir = os.path.join(sys.prefix, "lib", "cups", "backend")
++    cups_backend_dir = os.path.join(sys.prefix, "libexec", "cups", "backend")
+     add_data_files(cups_backend_dir, ["cups/xpraforwarder"])
+ 
+ 
Index: x11/xpra-devel/files/patch-xpra_net_net__util.py
===================================================================
--- x11/xpra-devel/files/patch-xpra_net_net__util.py	(revision 0)
+++ x11/xpra-devel/files/patch-xpra_net_net__util.py	(working copy)
@@ -0,0 +1,11 @@
+--- xpra/net/net_util.py.orig	2015-04-30 14:59:58 UTC
++++ xpra/net/net_util.py
+@@ -127,7 +127,7 @@ if not sys.platform.startswith("win"):
+ 	elif sys.platform.startswith("sunos"):
+ 		library = "libsocket.so.1"
+ 	elif sys.platform.startswith("freebsd"):
+-		library = "/usr/lib/libc.so"
++		library = "/lib/libc.so.7"
+ 	elif sys.platform.startswith("openbsd"):
+ 		library = "libc.so"
+ 	try:

Property changes on: x11/xpra-devel/files/patch-xpra_net_net__util.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/xpra-devel/pkg-descr
===================================================================
--- x11/xpra-devel/pkg-descr	(revision 388953)
+++ x11/xpra-devel/pkg-descr	(working copy)
@@ -1,4 +1,9 @@
-Xpra gives you persistent remote applications for X. So basically it's
-screen for remote X apps. 
+Xpra is "screen for X", and more: it allows you to run X programs,
+usually on a remote host and direct their display to your local machine.
+It also allows you to display existing desktop sessions remotely.
 
-WWW: http://xpra.org/
+Xpra is "rootless" or "seamless", and sessions can be accessed over SSH,
+or password protected and encrypted over plain TCP sockets.  Xpra adapts
+to bandwidth constraints and is fully open-source.
+
+WWW: https://www.xpra.org
Index: x11/xpra-devel/pkg-plist
===================================================================
--- x11/xpra-devel/pkg-plist	(revision 388953)
+++ x11/xpra-devel/pkg-plist	(working copy)
@@ -1,7 +1,6 @@
 bin/xpra
 bin/xpra_Xdummy
 bin/xpra_launcher
-share/appdata/xpra.appdata.xml
 @sample %%ETCDIR%%/xorg.conf.sample
 @sample %%ETCDIR%%/xpra.conf.sample
 %%PYTHON_SITELIBDIR%%/xpra/__init__.py
@@ -10,6 +9,33 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/build_info.py
 %%PYTHON_SITELIBDIR%%/xpra/build_info.pyc
 %%PYTHON_SITELIBDIR%%/xpra/build_info.pyo
+%%PYTHON_SITELIBDIR%%/xpra/child_reaper.py
+%%PYTHON_SITELIBDIR%%/xpra/child_reaper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/child_reaper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.py
+%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyc
+%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyo
+%%PYTHON_SITELIBDIR%%/xpra/dotxpra.py
+%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyc
+%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyo
+%%PYTHON_SITELIBDIR%%/xpra/log.py
+%%PYTHON_SITELIBDIR%%/xpra/log.pyc
+%%PYTHON_SITELIBDIR%%/xpra/log.pyo
+%%PYTHON_SITELIBDIR%%/xpra/os_util.py
+%%PYTHON_SITELIBDIR%%/xpra/os_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/os_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/simple_stats.py
+%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyc
+%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyo
+%%PYTHON_SITELIBDIR%%/xpra/src_info.py
+%%PYTHON_SITELIBDIR%%/xpra/src_info.pyc
+%%PYTHON_SITELIBDIR%%/xpra/src_info.pyo
+%%PYTHON_SITELIBDIR%%/xpra/util.py
+%%PYTHON_SITELIBDIR%%/xpra/util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/version_util.py
+%%PYTHON_SITELIBDIR%%/xpra/version_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/version_util.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/client/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/__init__.pyo
@@ -28,6 +54,24 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/fake_window_backing.py
 %%PYTHON_SITELIBDIR%%/xpra/client/fake_window_backing.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/fake_window_backing.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/keyboard_helper.py
+%%PYTHON_SITELIBDIR%%/xpra/client/keyboard_helper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/keyboard_helper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/tray_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/tray_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/tray_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/ui_client_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/ui_client_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/ui_client_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/window_backing_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/window_backing_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/window_backing_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/window_border.py
+%%PYTHON_SITELIBDIR%%/xpra/client/window_border.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/window_border.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/__init__.pyo
@@ -34,18 +78,24 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_check.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_check.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_check.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_client_window.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_client_window.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_client_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_colorspace_conversions.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_colorspace_conversions.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_colorspace_conversions.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk_compat.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk_compat.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk_compat.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_client_window.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_client_window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_client_window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_window_backing.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_window_backing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_window_backing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/__init__.pyo
@@ -52,6 +102,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/border_client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/border_client_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/border_client_window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/cairo_backing.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/cairo_backing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/cairo_backing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.pyo
@@ -91,9 +144,9 @@ bin/xpra_launcher
 %%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/cairo_backing_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing_base.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
@@ -109,9 +162,6 @@ 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
@@ -118,12 +168,12 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/session_info.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/session_info.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/session_info.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/start_new_command.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/start_new_command.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/start_new_command.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/statusicon_tray.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/statusicon_tray.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/statusicon_tray.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/keyboard_helper.py
-%%PYTHON_SITELIBDIR%%/xpra/client/keyboard_helper.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/keyboard_helper.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/notifications/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/client/notifications/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/notifications/__init__.pyo
@@ -136,18 +186,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/client/notifications/pynotify_notifier.py
 %%PYTHON_SITELIBDIR%%/xpra/client/notifications/pynotify_notifier.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/notifications/pynotify_notifier.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/tray_base.py
-%%PYTHON_SITELIBDIR%%/xpra/client/tray_base.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/tray_base.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/ui_client_base.py
-%%PYTHON_SITELIBDIR%%/xpra/client/ui_client_base.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/ui_client_base.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/window_backing_base.py
-%%PYTHON_SITELIBDIR%%/xpra/client/window_backing_base.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/window_backing_base.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/window_border.py
-%%PYTHON_SITELIBDIR%%/xpra/client/window_border.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/window_border.pyo
 %%PYTHON_SITELIBDIR%%/xpra/clipboard/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/clipboard/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/clipboard/__init__.pyo
@@ -163,13 +201,28 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/argb.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.pyo
@@ -196,18 +249,6 @@ bin/xpra_launcher
 %%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
-%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.pyc
-%%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/webp/__init__.py
@@ -219,18 +260,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/cyxor.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/numpyxor.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/numpyxor.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/numpyxor.pyo
-%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.py
-%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyc
-%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyo
-%%PYTHON_SITELIBDIR%%/xpra/deque.py
-%%PYTHON_SITELIBDIR%%/xpra/deque.pyc
-%%PYTHON_SITELIBDIR%%/xpra/deque.pyo
-%%PYTHON_SITELIBDIR%%/xpra/dotxpra.py
-%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyc
-%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__init__.pyo
@@ -250,9 +279,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/graph.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/graph.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/graph.pyo
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk2common.py
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk2common.pyc
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk2common.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_spinner.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_spinner.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_spinner.pyo
@@ -286,9 +312,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/keyboard/mask.py
 %%PYTHON_SITELIBDIR%%/xpra/keyboard/mask.pyc
 %%PYTHON_SITELIBDIR%%/xpra/keyboard/mask.pyo
-%%PYTHON_SITELIBDIR%%/xpra/log.py
-%%PYTHON_SITELIBDIR%%/xpra/log.pyc
-%%PYTHON_SITELIBDIR%%/xpra/log.pyo
 %%PYTHON_SITELIBDIR%%/xpra/net/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyo
@@ -295,13 +318,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/net/avahi_publisher.py
 %%PYTHON_SITELIBDIR%%/xpra/net/avahi_publisher.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/avahi_publisher.pyo
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.py
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.pyc
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.pyo
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/cython_bencode.so
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.py
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.pyo
@@ -329,16 +345,16 @@ bin/xpra_launcher
 %%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_orig.py
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.pyc
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.pyo
-%%PYTHON_SITELIBDIR%%/xpra/os_util.py
-%%PYTHON_SITELIBDIR%%/xpra/os_util.pyc
-%%PYTHON_SITELIBDIR%%/xpra/os_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/subprocess_wrapper.py
+%%PYTHON_SITELIBDIR%%/xpra/net/subprocess_wrapper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/subprocess_wrapper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.py
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/cython_bencode.so
 %%PYTHON_SITELIBDIR%%/xpra/platform/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/__init__.pyo
@@ -366,6 +382,12 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/platform/paths.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/paths.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/paths.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/printing.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/printing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/printing.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/pycups_printing.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/pycups_printing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/pycups_printing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/shadow_server.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/shadow_server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/shadow_server.pyo
@@ -396,6 +418,9 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/paths.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/paths.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/paths.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/printing.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/printing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/printing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/shadow_server.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/shadow_server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/shadow_server.pyo
@@ -420,36 +445,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/server/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/server/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/allow_auth.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/allow_auth.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/allow_auth.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/fail_auth.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/fail_auth.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/fail_auth.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/file_auth.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/file_auth.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/file_auth.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/none_auth.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/none_auth.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/none_auth.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam_auth.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam_auth.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam_auth.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/reject_auth.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/reject_auth.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/reject_auth.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/sys_auth_base.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/sys_auth_base.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/sys_auth_base.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/win32_auth.py
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/win32_auth.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/auth/win32_auth.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/background_worker.py
 %%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyo
@@ -459,6 +454,7 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.py
 %%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/cystats.so
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.py
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyo
@@ -480,9 +476,7 @@ 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/region.so
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.py
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyo
@@ -501,16 +495,6 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.py
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/cymaths.so
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/maths.py
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/maths.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/maths.pyo
-%%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
@@ -523,9 +507,36 @@ 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/simple_stats.py
-%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyc
-%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/allow_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/allow_auth.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/allow_auth.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/fail_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/fail_auth.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/fail_auth.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/file_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/file_auth.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/file_auth.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/none_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/none_auth.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/none_auth.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam_auth.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/pam_auth.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/reject_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/reject_auth.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/reject_auth.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/sys_auth_base.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/sys_auth_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/sys_auth_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/win32_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/win32_auth.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/win32_auth.pyo
 %%PYTHON_SITELIBDIR%%/xpra/sound/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/sound/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/sound/__init__.pyo
@@ -544,18 +555,45 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/sound/src.py
 %%PYTHON_SITELIBDIR%%/xpra/sound/src.pyc
 %%PYTHON_SITELIBDIR%%/xpra/sound/src.pyo
-%%PYTHON_SITELIBDIR%%/xpra/src_info.py
-%%PYTHON_SITELIBDIR%%/xpra/src_info.pyc
-%%PYTHON_SITELIBDIR%%/xpra/src_info.pyo
-%%PYTHON_SITELIBDIR%%/xpra/util.py
-%%PYTHON_SITELIBDIR%%/xpra/util.pyc
-%%PYTHON_SITELIBDIR%%/xpra/util.pyo
-%%PYTHON_SITELIBDIR%%/xpra/version_util.py
-%%PYTHON_SITELIBDIR%%/xpra/version_util.pyc
-%%PYTHON_SITELIBDIR%%/xpra/version_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/wrapper.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/wrapper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/wrapper.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/server.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/server_keyboard_config.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/server_keyboard_config.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/server_keyboard_config.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/shadow_x11_server.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/shadow_x11_server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/shadow_x11_server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/xroot_props.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/xroot_props.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/xroot_props.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__init__.pyo
@@ -562,19 +600,11 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/core_bindings.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/display_source.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/keyboard_bindings.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/posix_display_source.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/randr_bindings.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/ximage.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyo
@@ -607,39 +637,17 @@ bin/xpra_launcher
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/server.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/server_keyboard_config.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/server_keyboard_config.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/server_keyboard_config.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/shadow_x11_server.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/shadow_x11_server.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/shadow_x11_server.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/xroot_props.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/xroot_props.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/xroot_props.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings.pyo
-%%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
+libexec/cups/backend/xpraforwarder
 man/man1/xpra.1.gz
 man/man1/xpra_launcher.1.gz
+share/appdata/xpra.appdata.xml
 share/applications/xpra.desktop
 share/applications/xpra_launcher.desktop
-share/icons/xpra.png
+share/pixmaps/xpra.png
 %%DATADIR%%/COPYING
 %%DATADIR%%/README
 %%DATADIR%%/icons/browse.png
@@ -651,10 +659,15 @@ share/applications/xpra_launcher.desktop
 %%DATADIR%%/icons/download.png
 %%DATADIR%%/icons/encoding.png
 %%DATADIR%%/icons/features.png
+%%DATADIR%%/icons/forward.png
+%%DATADIR%%/icons/freebsd.png
 %%DATADIR%%/icons/information.png
 %%DATADIR%%/icons/keyboard.png
+%%DATADIR%%/icons/linux.png
 %%DATADIR%%/icons/microphone.png
+%%DATADIR%%/icons/openbsd.png
 %%DATADIR%%/icons/opengl.png
+%%DATADIR%%/icons/osx.png
 %%DATADIR%%/icons/package.png
 %%DATADIR%%/icons/quit.png
 %%DATADIR%%/icons/raise.png
@@ -665,28 +678,34 @@ share/applications/xpra_launcher.desktop
 %%DATADIR%%/icons/statistics.png
 %%DATADIR%%/icons/ticked-small.png
 %%DATADIR%%/icons/unticked-small.png
+%%DATADIR%%/icons/win32.png
 %%DATADIR%%/icons/xpra.png
+%%DATADIR%%/www/connect.html
+%%DATADIR%%/www/css/bootstrap.min.css
+%%DATADIR%%/www/css/signin.css
 %%DATADIR%%/www/favicon.ico
 %%DATADIR%%/www/favicon.png
+%%DATADIR%%/www/index.html
+%%DATADIR%%/www/include/aurora/aurora-xpra.js
+%%DATADIR%%/www/include/aurora/aurora.js
+%%DATADIR%%/www/include/aurora/mp3.js
 %%DATADIR%%/www/include/bencode.js
+%%DATADIR%%/www/include/broadway/AUTHORS
+%%DATADIR%%/www/include/broadway/Decoder.js
+%%DATADIR%%/www/include/broadway/LICENSE
 %%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/jquery.throttle-debounce.min.js
 %%DATADIR%%/www/include/jqueryui.min.js
 %%DATADIR%%/www/include/keycodes.js
+%%DATADIR%%/www/include/lz4.min.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
-%%DATADIR%%/www/include/web-socket-js/WebSocketMain.swf
-%%DATADIR%%/www/include/web-socket-js/swfobject.js
-%%DATADIR%%/www/include/web-socket-js/web_socket.js
 %%DATADIR%%/www/include/websock.js
-%%DATADIR%%/www/include/webutil.js
-%%DATADIR%%/www/include/window.js
-%%DATADIR%%/www/index.html
+%%DATADIR%%/www/include/wsworker_check.js
+%%DATADIR%%/www/include/xpra-logo.png
+%%DATADIR%%/www/include/xpra_client.js
+%%DATADIR%%/www/include/xpra_protocol.js
+%%DATADIR%%/www/include/xpra_window.js