5 files changed, 196 insertions, 22 deletions

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 3032b3ec7c90..014caa536a75 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpra
-PORTVERSION=	0.6.4
+PORTVERSION=	0.7.2
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
@@ -24,28 +24,14 @@ RUN_DEPENDS=	cython:${PORTSDIR}/lang/cython \
 		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
-MAN1=		${PORTNAME}.1
-PORTDOCS=	README.wimpiggy README.xpra
+MANCOMPRESSED=	no
+MAN1=		xpra.1 xpra_launcher.1 parti.1
+
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_XORG=	x11 xext xtst xfixes xcomposite xdamage
 
-NO_BUILD=	yes
-
-do-install:
-	( cd ${WRKSRC} ; ./do-build )
-	${INSTALL_SCRIPT}  ${WRKSRC}/install/bin/xpra                     ${PREFIX}/bin
-	${RM} -rf ${WRKSRC}/install/lib/python/xpra/win32
-	${RM} -rf ${WRKSRC}/install/lib/python/xpra/darwin
-	(cd ${WRKSRC}/install/lib/python/xpra && ${COPYTREE_SHARE} \* ${PYTHON_SITELIBDIR}/xpra )
-	(cd ${WRKSRC}/install/lib/python/wimpiggy && ${COPYTREE_SHARE} \* ${PYTHON_SITELIBDIR}/wimpiggy )
-	${INSTALL_MAN}     ${WRKSRC}/install/share/man/man1/${PORTNAME}.1 ${MANPREFIX}/man/man1
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README.wimpiggy ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README.xpra ${DOCSDIR}
-.endif
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	parti_all
 
 .include <bsd.port.mk>
diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo
index 8f465845b613..f1758d4f4918 100644
--- a/x11/xpra/distinfo
+++ b/x11/xpra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.6.4.tar.bz2) = 3c47e16555325417e8be19dfcfd0c9c9f07d7a6e2e203d0bad46f68ac059f5d6
-SIZE (xpra-0.6.4.tar.bz2) = 456613
+SHA256 (xpra-0.7.2.tar.bz2) = f9e5bcf94f65becdeeec13eeb1cbea6accf8925c095cfe42ab46fe96625c9015
+SIZE (xpra-0.7.2.tar.bz2) = 469959
diff --git a/x11/xpra/files/patch-issue207 b/x11/xpra/files/patch-issue207
new file mode 100644
index 000000000000..6a49c6208b0c
--- /dev/null
+++ b/x11/xpra/files/patch-issue207
@@ -0,0 +1,22 @@
+--- wimpiggy/lowlevel/bindings.pyx	(revision 2071)
++++ wimpiggy/lowlevel/bindings.pyx	(revision 2072)
+@@ -894,4 +894,5 @@
+     cdef Display * display                          #@DuplicatedSignature
+     cdef KeySym keysym                              #@DuplicatedSignature
++    cdef char* keyname
+     display = get_xdisplay_for(display_source)
+     raw_mappings = _get_raw_keycode_mappings(display)
+@@ -900,9 +901,10 @@
+         keynames = []
+         for keysym in keysyms:
++            key = ""
+             if keysym!=NoSymbol:
+                 keyname = XKeysymToString(keysym)
+-            else:
+-                keyname = ""
+-            keynames.append(keyname)
++                if keyname!=NULL:
++                    key = str(keyname)
++            keynames.append(key)
+         #now remove trailing empty entries:
+         while len(keynames)>0 and keynames[-1]=="":
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py
new file mode 100644
index 000000000000..425caf23389f
--- /dev/null
+++ b/x11/xpra/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2012-11-08 10:32:55.726940413 -0500
++++ setup.py	2012-11-08 10:33:07.064940881 -0500
+@@ -436,7 +436,7 @@
+ #*******************************************************************************
+ else:
+     data_files += [
+-                    ("share/man/man1", ["man/xpra.1", "man/xpra_launcher.1", "man/parti.1"]),
++                    ("man/man1", ["man/xpra.1", "man/xpra_launcher.1", "man/parti.1"]),
+                     ("share/parti", ["README", "parti.README"]),
+                     ("share/xpra", ["xpra.README", "COPYING"]),
+                     ("share/wimpiggy", ["wimpiggy.README"]),
diff --git a/x11/xpra/pkg-plist b/x11/xpra/pkg-plist
index aa9e64087d44..0deb7e92694a 100644
--- a/x11/xpra/pkg-plist
+++ b/x11/xpra/pkg-plist
@@ -1,140 +1,295 @@
 bin/xpra
+bin/parti
+bin/parti-repl
+bin/xpra_Xdummy
+bin/xpra_launcher
 etc/xpra/xorg.conf
 etc/xpra/xpra.conf
+%%PYTHON_SITELIBDIR%%/parti/__init__.py
+%%PYTHON_SITELIBDIR%%/parti/__init__.pyc
+%%PYTHON_SITELIBDIR%%/parti/__init__.pyo
+%%PYTHON_SITELIBDIR%%/parti/addons/__init__.py
+%%PYTHON_SITELIBDIR%%/parti/addons/__init__.pyc
+%%PYTHON_SITELIBDIR%%/parti/addons/__init__.pyo
+%%PYTHON_SITELIBDIR%%/parti/addons/ipython_embed.py
+%%PYTHON_SITELIBDIR%%/parti/addons/ipython_embed.pyc
+%%PYTHON_SITELIBDIR%%/parti/addons/ipython_embed.pyo
+%%PYTHON_SITELIBDIR%%/parti/bus.py
+%%PYTHON_SITELIBDIR%%/parti/bus.pyc
+%%PYTHON_SITELIBDIR%%/parti/bus.pyo
+%%PYTHON_SITELIBDIR%%/parti/parti_main.py
+%%PYTHON_SITELIBDIR%%/parti/parti_main.pyc
+%%PYTHON_SITELIBDIR%%/parti/parti_main.pyo
+%%PYTHON_SITELIBDIR%%/parti/scripts/__init__.py
+%%PYTHON_SITELIBDIR%%/parti/scripts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/parti/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/parti/scripts/main.py
+%%PYTHON_SITELIBDIR%%/parti/scripts/main.pyc
+%%PYTHON_SITELIBDIR%%/parti/scripts/main.pyo
+%%PYTHON_SITELIBDIR%%/parti/scripts/repl.py
+%%PYTHON_SITELIBDIR%%/parti/scripts/repl.pyc
+%%PYTHON_SITELIBDIR%%/parti/scripts/repl.pyo
+%%PYTHON_SITELIBDIR%%/parti/test_bus.py
+%%PYTHON_SITELIBDIR%%/parti/test_bus.pyc
+%%PYTHON_SITELIBDIR%%/parti/test_bus.pyo
+%%PYTHON_SITELIBDIR%%/parti/tray.py
+%%PYTHON_SITELIBDIR%%/parti/tray.pyc
+%%PYTHON_SITELIBDIR%%/parti/tray.pyo
+%%PYTHON_SITELIBDIR%%/parti/trays/__init__.py
+%%PYTHON_SITELIBDIR%%/parti/trays/__init__.pyc
+%%PYTHON_SITELIBDIR%%/parti/trays/__init__.pyo
+%%PYTHON_SITELIBDIR%%/parti/trays/compositetest.py
+%%PYTHON_SITELIBDIR%%/parti/trays/compositetest.pyc
+%%PYTHON_SITELIBDIR%%/parti/trays/compositetest.pyo
+%%PYTHON_SITELIBDIR%%/parti/trays/simpletab.py
+%%PYTHON_SITELIBDIR%%/parti/trays/simpletab.pyc
+%%PYTHON_SITELIBDIR%%/parti/trays/simpletab.pyo
+%%PYTHON_SITELIBDIR%%/parti/world_organizer.py
+%%PYTHON_SITELIBDIR%%/parti/world_organizer.pyc
+%%PYTHON_SITELIBDIR%%/parti/world_organizer.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/__init__.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/composite.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/composite.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/composite.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/error.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/error.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/error.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/gdk/__init__.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/gdk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/gdk/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/gdk/gdk_atoms.so
 %%PYTHON_SITELIBDIR%%/wimpiggy/gobject_compat.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/gobject_compat.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/gobject_compat.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/keys.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/keys.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/keys.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/log.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/log.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/log.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel/__init__.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel/__init__.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel/bindings.so
 %%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel/send_wm.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel/send_wm.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel/send_wm.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/prop.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/prop.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/prop.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/selection.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/selection.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/selection.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/util.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/util.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/util.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/window.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/window.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/window.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/wm.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/wm.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/wm.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/world_window.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/world_window.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/world_window.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/xsettings_prop.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/xsettings_prop.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/xsettings_prop.pyo
 %%PYTHON_SITELIBDIR%%/xpra/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/batch_delay_calculator.py
 %%PYTHON_SITELIBDIR%%/xpra/batch_delay_calculator.pyc
+%%PYTHON_SITELIBDIR%%/xpra/batch_delay_calculator.pyo
 %%PYTHON_SITELIBDIR%%/xpra/bencode.py
 %%PYTHON_SITELIBDIR%%/xpra/bencode.pyc
+%%PYTHON_SITELIBDIR%%/xpra/bencode.pyo
 %%PYTHON_SITELIBDIR%%/xpra/build_info.py
 %%PYTHON_SITELIBDIR%%/xpra/build_info.pyc
+%%PYTHON_SITELIBDIR%%/xpra/build_info.pyo
 %%PYTHON_SITELIBDIR%%/xpra/bytestreams.py
 %%PYTHON_SITELIBDIR%%/xpra/bytestreams.pyc
+%%PYTHON_SITELIBDIR%%/xpra/bytestreams.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client.py
 %%PYTHON_SITELIBDIR%%/xpra/client.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client_base.py
 %%PYTHON_SITELIBDIR%%/xpra/client_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client_base.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client_window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/dbus_notifications_forwarder.py
 %%PYTHON_SITELIBDIR%%/xpra/dbus_notifications_forwarder.pyc
+%%PYTHON_SITELIBDIR%%/xpra/dbus_notifications_forwarder.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/gl_client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/gl_client_window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl_client_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gl_colorspace_conversions.py
 %%PYTHON_SITELIBDIR%%/xpra/gl_colorspace_conversions.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl_colorspace_conversions.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gl_window_backing.py
 %%PYTHON_SITELIBDIR%%/xpra/gl_window_backing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl_window_backing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gtk_view_keyboard.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_view_keyboard.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gtk_view_keyboard.pyo
 %%PYTHON_SITELIBDIR%%/xpra/keys.py
 %%PYTHON_SITELIBDIR%%/xpra/keys.pyc
+%%PYTHON_SITELIBDIR%%/xpra/keys.pyo
 %%PYTHON_SITELIBDIR%%/xpra/maths.py
 %%PYTHON_SITELIBDIR%%/xpra/maths.pyc
+%%PYTHON_SITELIBDIR%%/xpra/maths.pyo
 %%PYTHON_SITELIBDIR%%/xpra/nested_main.py
 %%PYTHON_SITELIBDIR%%/xpra/nested_main.pyc
+%%PYTHON_SITELIBDIR%%/xpra/nested_main.pyo
 %%PYTHON_SITELIBDIR%%/xpra/pixbuf_to_rgb.py
 %%PYTHON_SITELIBDIR%%/xpra/pixbuf_to_rgb.pyc
+%%PYTHON_SITELIBDIR%%/xpra/pixbuf_to_rgb.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/client_extras_base.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/client_extras_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/client_extras_base.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/clipboard_base.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/clipboard_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/clipboard_base.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/gdk_clipboard.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/gdk_clipboard.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/gdk_clipboard.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/graph.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/graph.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/graph.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/gui.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/gui.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/gui.pyo
 %%PYTHON_SITELIBDIR%%/xpra/protocol.py
 %%PYTHON_SITELIBDIR%%/xpra/protocol.pyc
+%%PYTHON_SITELIBDIR%%/xpra/protocol.pyo
 %%PYTHON_SITELIBDIR%%/xpra/proxy.py
 %%PYTHON_SITELIBDIR%%/xpra/proxy.pyc
+%%PYTHON_SITELIBDIR%%/xpra/proxy.pyo
 %%PYTHON_SITELIBDIR%%/xpra/rencode/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/rencode/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/rencode/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/rencode/_rencode.so
 %%PYTHON_SITELIBDIR%%/xpra/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/scripts/client_launcher.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/client_launcher.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/client_launcher.pyo
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyo
 %%PYTHON_SITELIBDIR%%/xpra/scripts/server.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/server.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server.py
 %%PYTHON_SITELIBDIR%%/xpra/server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server_source.py
 %%PYTHON_SITELIBDIR%%/xpra/server_source.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server_source.pyo
 %%PYTHON_SITELIBDIR%%/xpra/version_util.py
 %%PYTHON_SITELIBDIR%%/xpra/version_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/version_util.pyo
 %%PYTHON_SITELIBDIR%%/xpra/vpx/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/vpx/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/vpx/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/vpx/codec.so
 %%PYTHON_SITELIBDIR%%/xpra/wait_for_x_server.so
+%%PYTHON_SITELIBDIR%%/xpra/webm/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/webm/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/webm/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/webm/decode.py
+%%PYTHON_SITELIBDIR%%/xpra/webm/decode.pyc
+%%PYTHON_SITELIBDIR%%/xpra/webm/decode.pyo
+%%PYTHON_SITELIBDIR%%/xpra/webm/encode.py
+%%PYTHON_SITELIBDIR%%/xpra/webm/encode.pyc
+%%PYTHON_SITELIBDIR%%/xpra/webm/encode.pyo
+%%PYTHON_SITELIBDIR%%/xpra/webm/handlers.py
+%%PYTHON_SITELIBDIR%%/xpra/webm/handlers.pyc
+%%PYTHON_SITELIBDIR%%/xpra/webm/handlers.pyo
+%%PYTHON_SITELIBDIR%%/xpra/webm/yuv.py
+%%PYTHON_SITELIBDIR%%/xpra/webm/yuv.pyc
+%%PYTHON_SITELIBDIR%%/xpra/webm/yuv.pyo
 %%PYTHON_SITELIBDIR%%/xpra/window_backing.py
 %%PYTHON_SITELIBDIR%%/xpra/window_backing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/window_backing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/window_source.py
 %%PYTHON_SITELIBDIR%%/xpra/window_source.pyc
+%%PYTHON_SITELIBDIR%%/xpra/window_source.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x264/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x264/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x264/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x264/codec.so
 %%PYTHON_SITELIBDIR%%/xpra/xkbhelper.py
 %%PYTHON_SITELIBDIR%%/xpra/xkbhelper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xkbhelper.pyo
 %%PYTHON_SITELIBDIR%%/xpra/xposix/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/xposix/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xposix/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/xposix/gui.py
 %%PYTHON_SITELIBDIR%%/xpra/xposix/gui.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xposix/gui.pyo
 %%PYTHON_SITELIBDIR%%/xpra/xposix/test_xsettings.py
 %%PYTHON_SITELIBDIR%%/xpra/xposix/test_xsettings.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xposix/test_xsettings.pyo
 %%PYTHON_SITELIBDIR%%/xpra/xposix/xroot_props.py
 %%PYTHON_SITELIBDIR%%/xpra/xposix/xroot_props.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xposix/xroot_props.pyo
 %%PYTHON_SITELIBDIR%%/xpra/xposix/xsettings.py
 %%PYTHON_SITELIBDIR%%/xpra/xposix/xsettings.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xposix/xsettings.pyo
+share/applications/xpra_launcher.desktop
+share/icons/xpra.png
+share/parti/README
+share/parti/parti.README
+share/wimpiggy/wimpiggy.README
+share/xpra/xpra.README
+share/xpra/COPYING
+share/xpra/icons/quit.png
+share/xpra/icons/retry.png
+share/xpra/icons/xpra.ico
+share/xpra/icons/slider.png
+share/xpra/icons/keyboard.png
+share/xpra/icons/compressed.png
+share/xpra/icons/raise.png
+share/xpra/icons/clipboard.png
+share/xpra/icons/close.png
+share/xpra/icons/statistics.png
+share/xpra/icons/xpra.png
+share/xpra/icons/information.png
+share/xpra/icons/encoding.png
+share/xpra/webm/LICENSE
+@dirrm %%PYTHON_SITELIBDIR%%/parti/trays
+@dirrm %%PYTHON_SITELIBDIR%%/parti/addons
+@dirrm %%PYTHON_SITELIBDIR%%/parti/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/parti
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/platform
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/rencode
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/vpx
+@dirrm %%PYTHON_SITELIBDIR%%/xpra/webm
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/x264
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/xposix
 @dirrm %%PYTHON_SITELIBDIR%%/xpra
 @dirrm %%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel
 @dirrm %%PYTHON_SITELIBDIR%%/wimpiggy/gdk
 @dirrm %%PYTHON_SITELIBDIR%%/wimpiggy
+@dirrm %%DATADIR%%/webm
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrm share/parti
+@dirrm share/wimpiggy
 @dirrmtry etc/xpra