- Update to 0.9.2

PR:             110343
Submitted by:   KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 470 insertions, 76 deletions

diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index ca721d103484..75cd9be712a4 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gaphor
-PORTVERSION=	0.7.1
+PORTVERSION=	0.9.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,22 +15,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UML modeling environment written in Python
 
-BUILD_DEPENDS=	diacanvas2>=0:${PORTSDIR}/graphics/diacanvas2
-RUN_DEPENDS=	${BUILD_DEPENDS}
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
 .endif
 
-USE_PYTHON=	2.2+
+CONFLICTS=	zope-3*
 
-do-configure:
-	@cd ${WRKSRC}; ${PYTHON_CMD} setup.py config
-
-do-build:
-	@cd ${WRKSRC}; ${PYTHON_CMD} setup.py build; ${PYTHON_CMD} setup.py build_mo
-
-do-install:
-	@cd ${WRKSRC}; ${PYTHON_CMD} setup.py install --install-data=${PREFIX}/share/gaphor; ${PYTHON_CMD} setup.py install_mo
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}
+USE_GNOME=	pygnome2
+USE_PYTHON=	2.4+
+USE_PYDISTUTILS=	yes
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/gaphor/distinfo b/devel/gaphor/distinfo
index 1171e60319ea..5f4cda4a959a 100644
--- a/devel/gaphor/distinfo
+++ b/devel/gaphor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gaphor-0.7.1.tar.gz) = 2f6d15a5637688439aca9837107a22f0
-SHA256 (gnome2/gaphor-0.7.1.tar.gz) = ce247553b075d716c9edb305ea2a2450d923d8d4b11282cda4a0c4fc8a54cbf2
-SIZE (gnome2/gaphor-0.7.1.tar.gz) = 322884
+MD5 (gnome2/gaphor-0.9.2.tar.gz) = aef4875fb557f0f52579d1e71224bd38
+SHA256 (gnome2/gaphor-0.9.2.tar.gz) = e88c434c98153d56fa63f4e9c88a749711658f3fbf8a5dc916862f4fc379fc95
+SIZE (gnome2/gaphor-0.9.2.tar.gz) = 509882
diff --git a/devel/gaphor/files/patch-setup.py b/devel/gaphor/files/patch-setup.py
deleted file mode 100644
index 1bd381c5572d..000000000000
--- a/devel/gaphor/files/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup.py.orig	Sat Dec 24 01:34:18 2005
-+++ setup.py	Sat Dec 24 01:34:48 2005
-@@ -390,8 +390,7 @@
-       scripts=['bin/gaphor'],
- 
-       distclass=Distribution,
--      cmdclass={'config': config_Gaphor,
--                'build_py': build_py_Gaphor,
-+      cmdclass={'build_py': build_py_Gaphor,
-                 #'install_schemas': install_schemas,
-                 'build': build_Gaphor,
- #                'build_ext': BuildExt,
diff --git a/devel/gaphor/pkg-plist b/devel/gaphor/pkg-plist
index 27f2720dee30..889706f35c91 100644
--- a/devel/gaphor/pkg-plist
+++ b/devel/gaphor/pkg-plist
@@ -1,185 +1,596 @@
 bin/gaphor
+bin/gaphorconvert
+%%PYTHON_SITELIBDIR%%/gaphas/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphas/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/canvas.py
+%%PYTHON_SITELIBDIR%%/gaphas/canvas.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/canvas.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/constraint.py
+%%PYTHON_SITELIBDIR%%/gaphas/constraint.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/constraint.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/decorators.py
+%%PYTHON_SITELIBDIR%%/gaphas/decorators.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/decorators.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/examples.py
+%%PYTHON_SITELIBDIR%%/gaphas/examples.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/examples.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/geometry.py
+%%PYTHON_SITELIBDIR%%/gaphas/geometry.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/geometry.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/item.py
+%%PYTHON_SITELIBDIR%%/gaphas/item.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/item.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/painter.py
+%%PYTHON_SITELIBDIR%%/gaphas/painter.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/painter.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/solver.py
+%%PYTHON_SITELIBDIR%%/gaphas/solver.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/solver.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/tool.py
+%%PYTHON_SITELIBDIR%%/gaphas/tool.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/tool.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/tree.py
+%%PYTHON_SITELIBDIR%%/gaphas/tree.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/tree.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/util.py
+%%PYTHON_SITELIBDIR%%/gaphas/util.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/util.pyo
+%%PYTHON_SITELIBDIR%%/gaphas/view.py
+%%PYTHON_SITELIBDIR%%/gaphas/view.pyc
+%%PYTHON_SITELIBDIR%%/gaphas/view.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/__init__.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/collection.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/collection.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/collection.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/diagram.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/diagram.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/diagram.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/element.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/element.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/element.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/elementfactory.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/elementfactory.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/elementfactory.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/event.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/event.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/event.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/interfaces.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/interfaces.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/properties.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/properties.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/properties.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_elementfactory.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_elementfactory.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_elementfactory.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_properties.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_properties.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_properties.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_uml2.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_uml2.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_uml2.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_umllex.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_umllex.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/tests/test_umllex.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/uml2.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/uml2.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/uml2.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/UML/umllex.py
 %%PYTHON_SITELIBDIR%%/gaphor/UML/umllex.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/umllex.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/UML/util.py
+%%PYTHON_SITELIBDIR%%/gaphor/UML/util.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/UML/util.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/__init__.py
 %%PYTHON_SITELIBDIR%%/gaphor/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/diagramactions.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/diagramactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/diagramactions.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/editoractions.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/editoractions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/editoractions.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/itemactions.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/itemactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/itemactions.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/mainactions.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/mainactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/mainactions.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/placementactions.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/placementactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/placementactions.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/test_itemactions.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/test_itemactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/test_itemactions.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/test_placementactions.py
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/test_placementactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/actions/tests/test_placementactions.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/connectors.py
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/connectors.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/connectors.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/editors.py
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/editors.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/editors.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/test_connector.py
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/test_connector.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/test_connector.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/test_editor.py
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/test_editor.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/adapters/tests/test_editor.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/__init__.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/action.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/action.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/action.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/activitynodes.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/activitynodes.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/activitynodes.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/actor.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/actor.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/actor.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/artifact.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/artifact.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/artifact.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/association.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/association.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/attribute.py
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/attribute.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/association.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/classifier.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/classifier.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/classifier.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/comment.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/comment.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/comment.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/commentline.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/commentline.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/commentline.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/component.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/component.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/component.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/connector.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/connector.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/connector.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/dependency.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/dependency.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/dependency.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/diagramitem.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/diagramitem.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/diagramitem.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/diagramline.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/diagramline.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/diagramline.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/elementitem.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/elementitem.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/elementitem.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/extend.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/extend.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/extend.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/extension.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/extension.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/extension.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/feature.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/feature.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/feature.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/flow.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/flow.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/flow.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/font.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/font.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/font.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/generalization.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/generalization.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/generalization.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/groupable.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/groupable.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/groupable.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/implementation.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/implementation.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/implementation.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/include.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/include.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/include.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/interaction.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/interaction.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/interaction.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/interface.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/interface.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/itemactions.py
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/itemactions.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/itemtool.py
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/itemtool.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/interface.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/interfaces.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/items.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/items.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/items.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/klass.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/klass.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/klass.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/lifeline.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/lifeline.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/lifeline.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/message.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/message.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/message.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/nameditem.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/nameditem.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/nameditem.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/node.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/node.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/operation.py
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/operation.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/node.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/objectnode.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/objectnode.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/objectnode.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/package.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/package.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/placementactions.py
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/placementactions.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/placementtool.py
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/placementtool.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/relationship.py
-%%PYTHON_SITELIBDIR%%/gaphor/diagram/relationship.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/package.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/style.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/style.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/style.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_action.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_action.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_action.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_activitynodes.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_activitynodes.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_activitynodes.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_association.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_association.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_association.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_class.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_class.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_class.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_diagramitem.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_diagramitem.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_diagramitem.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_handletool.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_handletool.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_handletool.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_interface.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_interface.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_interface.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_interfaces.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_interfaces.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_interfaces.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_style.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_style.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tests/test_style.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tool.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tool.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/tool.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/usecase.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/usecase.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/usecase.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/event.py
+%%PYTHON_SITELIBDIR%%/gaphor/event.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/event.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/i18n.py
 %%PYTHON_SITELIBDIR%%/gaphor/i18n.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/i18n.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/interfaces.py
+%%PYTHON_SITELIBDIR%%/gaphor/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/interfaces.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/__init__.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/action.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/action.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/action.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/aspects.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/aspects.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/aspects.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/conf.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/conf.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/conf.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/console.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/console.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/console.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/errorhandler.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/errorhandler.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/errorhandler.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/gidlethread.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/gidlethread.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/gidlethread.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/misc/ipair.py
+%%PYTHON_SITELIBDIR%%/gaphor/misc/ipair.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/ipair.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/logger.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/logger.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/logger.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/odict.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/odict.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/odict.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/misc/partial.py
+%%PYTHON_SITELIBDIR%%/gaphor/misc/partial.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/partial.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/resource.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/resource.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/resource.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/signal.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/signal.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/misc/singleton.py
-%%PYTHON_SITELIBDIR%%/gaphor/misc/singleton.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/signal.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/uniqueid.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/uniqueid.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/uniqueid.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/misc/xmlwriter.py
 %%PYTHON_SITELIBDIR%%/gaphor/misc/xmlwriter.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/misc/xmlwriter.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/parser.py
 %%PYTHON_SITELIBDIR%%/gaphor/parser.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/parser.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/plugin.py
 %%PYTHON_SITELIBDIR%%/gaphor/plugin.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/plugin.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/pluginmanager.py
 %%PYTHON_SITELIBDIR%%/gaphor/pluginmanager.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/pluginmanager.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/storage.py
 %%PYTHON_SITELIBDIR%%/gaphor/storage.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/storage.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/__init__.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/abstractwindow.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/abstractwindow.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/abstractwindow.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/consolewindow.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/consolewindow.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/ui/diagramactions.py
-%%PYTHON_SITELIBDIR%%/gaphor/ui/diagramactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/consolewindow.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/diagramtab.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/diagramtab.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/diagramtab.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/diagramview.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/diagramview.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/ui/editoractions.py
-%%PYTHON_SITELIBDIR%%/gaphor/ui/editoractions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/diagramview.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/editorwindow.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/editorwindow.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/ui/mainactions.py
-%%PYTHON_SITELIBDIR%%/gaphor/ui/mainactions.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/editorwindow.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/mainwindow.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/mainwindow.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/mainwindow.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/menufactory.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/menufactory.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/menufactory.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/namespace.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/namespace.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/namespace.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/ui/objectinspector.py
+%%PYTHON_SITELIBDIR%%/gaphor/ui/objectinspector.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/objectinspector.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/stock.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/stock.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/stock.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_diagramtab.py
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_diagramtab.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_diagramtab.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_mainwindow.py
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_mainwindow.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_mainwindow.pyo
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_namespace.py
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_namespace.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/tests/test_namespace.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/toolbox.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/toolbox.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/toolbox.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/ui/wrapbox.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/wrapbox.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/ui/wrapbox.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/undomanager.py
 %%PYTHON_SITELIBDIR%%/gaphor/undomanager.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/undomanager.pyo
 %%PYTHON_SITELIBDIR%%/gaphor/version.py
 %%PYTHON_SITELIBDIR%%/gaphor/version.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/version.pyo
+%%PYTHON_SITELIBDIR%%/zope/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/component/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/adapter.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/adapter.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/adapter.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/contextdependent.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/contextdependent.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/contextdependent.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/exceptions.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/interfaces.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/service.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/service.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/service.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/servicenames.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/servicenames.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/servicenames.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/components.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/components.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/components.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/placelesssetup.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/placelesssetup.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/placelesssetup.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/request.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/request.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/request.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_service.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_service.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_service.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_utilityservice.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_utilityservice.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_utilityservice.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/utility.py
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/utility.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/bbb/utility.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/factory.py
+%%PYTHON_SITELIBDIR%%/zope/component/factory.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/factory.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/interfaces.py
+%%PYTHON_SITELIBDIR%%/zope/component/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/site.py
+%%PYTHON_SITELIBDIR%%/zope/component/site.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/site.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/testing.py
+%%PYTHON_SITELIBDIR%%/zope/component/testing.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/testing.pyo
+%%PYTHON_SITELIBDIR%%/zope/component/tests.py
+%%PYTHON_SITELIBDIR%%/zope/component/tests.pyc
+%%PYTHON_SITELIBDIR%%/zope/component/tests.pyo
+%%PYTHON_SITELIBDIR%%/zope/deprecation/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/deprecation/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/deprecation/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/deprecation/deprecation.py
+%%PYTHON_SITELIBDIR%%/zope/deprecation/deprecation.pyc
+%%PYTHON_SITELIBDIR%%/zope/deprecation/deprecation.pyo
+%%PYTHON_SITELIBDIR%%/zope/deprecation/tests.py
+%%PYTHON_SITELIBDIR%%/zope/deprecation/tests.pyc
+%%PYTHON_SITELIBDIR%%/zope/deprecation/tests.pyo
+%%PYTHON_SITELIBDIR%%/zope/exceptions/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/exceptions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/exceptions/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/exceptions/_duplicate.py
+%%PYTHON_SITELIBDIR%%/zope/exceptions/_duplicate.pyc
+%%PYTHON_SITELIBDIR%%/zope/exceptions/_duplicate.pyo
+%%PYTHON_SITELIBDIR%%/zope/exceptions/_notfounderror.py
+%%PYTHON_SITELIBDIR%%/zope/exceptions/_notfounderror.pyc
+%%PYTHON_SITELIBDIR%%/zope/exceptions/_notfounderror.pyo
+%%PYTHON_SITELIBDIR%%/zope/exceptions/exceptionformatter.py
+%%PYTHON_SITELIBDIR%%/zope/exceptions/exceptionformatter.pyc
+%%PYTHON_SITELIBDIR%%/zope/exceptions/exceptionformatter.pyo
+%%PYTHON_SITELIBDIR%%/zope/exceptions/interfaces.py
+%%PYTHON_SITELIBDIR%%/zope/exceptions/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/zope/exceptions/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/interface/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/_flatten.py
+%%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/adapter.py
+%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/advice.py
+%%PYTHON_SITELIBDIR%%/zope/interface/advice.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/advice.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/idatetime.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/idatetime.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/idatetime.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/interfaces.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/mapping.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/mapping.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/mapping.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/common/sequence.py
+%%PYTHON_SITELIBDIR%%/zope/interface/common/sequence.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/common/sequence.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/declarations.py
+%%PYTHON_SITELIBDIR%%/zope/interface/declarations.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/declarations.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/document.py
+%%PYTHON_SITELIBDIR%%/zope/interface/document.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/document.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/exceptions.py
+%%PYTHON_SITELIBDIR%%/zope/interface/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/interface.py
+%%PYTHON_SITELIBDIR%%/zope/interface/interface.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/interface.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/interfaces.py
+%%PYTHON_SITELIBDIR%%/zope/interface/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/ro.py
+%%PYTHON_SITELIBDIR%%/zope/interface/ro.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/ro.pyo
+%%PYTHON_SITELIBDIR%%/zope/interface/verify.py
+%%PYTHON_SITELIBDIR%%/zope/interface/verify.pyc
+%%PYTHON_SITELIBDIR%%/zope/interface/verify.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/__init__.py
+%%PYTHON_SITELIBDIR%%/zope/testing/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/cleanup.py
+%%PYTHON_SITELIBDIR%%/zope/testing/cleanup.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/cleanup.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/doctest.py
+%%PYTHON_SITELIBDIR%%/zope/testing/doctest.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/doctest.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/doctestunit.py
+%%PYTHON_SITELIBDIR%%/zope/testing/doctestunit.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/doctestunit.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/formparser.py
+%%PYTHON_SITELIBDIR%%/zope/testing/formparser.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/formparser.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/loggingsupport.py
+%%PYTHON_SITELIBDIR%%/zope/testing/loggingsupport.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/loggingsupport.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/loghandler.py
+%%PYTHON_SITELIBDIR%%/zope/testing/loghandler.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/loghandler.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/module.py
+%%PYTHON_SITELIBDIR%%/zope/testing/module.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/module.pyo
+%%PYTHON_SITELIBDIR%%/zope/testing/tests.py
+%%PYTHON_SITELIBDIR%%/zope/testing/tests.pyc
+%%PYTHON_SITELIBDIR%%/zope/testing/tests.pyo
 %%DATADIR%%/icons.xml
 %%DATADIR%%/pixmaps/action24.png
 %%DATADIR%%/pixmaps/activityfinalnode24.png
 %%DATADIR%%/pixmaps/actor24.png
 %%DATADIR%%/pixmaps/artifact24.png
+%%DATADIR%%/pixmaps/assembly-connector.png
 %%DATADIR%%/pixmaps/association24.png
 %%DATADIR%%/pixmaps/attribute24.png
 %%DATADIR%%/pixmaps/class24.png
 %%DATADIR%%/pixmaps/comment24.png
 %%DATADIR%%/pixmaps/commentline24.png
 %%DATADIR%%/pixmaps/component24.png
+%%DATADIR%%/pixmaps/connector.png
 %%DATADIR%%/pixmaps/controlflow24.png
 %%DATADIR%%/pixmaps/decisionnode24.png
 %%DATADIR%%/pixmaps/dependency24.png
 %%DATADIR%%/pixmaps/diagram16.png
 %%DATADIR%%/pixmaps/extend24.png
 %%DATADIR%%/pixmaps/extension24.png
+%%DATADIR%%/pixmaps/flowfinalnode.png
+%%DATADIR%%/pixmaps/forknode.png
 %%DATADIR%%/pixmaps/generalization24.png
 %%DATADIR%%/pixmaps/implementation24.png
 %%DATADIR%%/pixmaps/include24.png
@@ -189,6 +600,7 @@ bin/gaphor
 %%DATADIR%%/pixmaps/lifeline24.png
 %%DATADIR%%/pixmaps/logo.png
 %%DATADIR%%/pixmaps/node24.png
+%%DATADIR%%/pixmaps/objectnode.png
 %%DATADIR%%/pixmaps/operation24.png
 %%DATADIR%%/pixmaps/package24.png
 %%DATADIR%%/pixmaps/pointer24.png
@@ -196,70 +608,71 @@ bin/gaphor
 %%DATADIR%%/pixmaps/stereotype24.png
 %%DATADIR%%/pixmaps/usecase24.png
 %%DATADIR%%/plugins/alignment/__init__.py
-%%DATADIR%%/plugins/alignment/__init__.pyc
 %%DATADIR%%/plugins/alignment/alignment.py
-%%DATADIR%%/plugins/alignment/alignment.pyc
 %%DATADIR%%/plugins/alignment/plugin.xml
 %%DATADIR%%/plugins/checkmetamodel/__init__.py
-%%DATADIR%%/plugins/checkmetamodel/__init__.pyc
 %%DATADIR%%/plugins/checkmetamodel/checkmodel.py
-%%DATADIR%%/plugins/checkmetamodel/checkmodel.pyc
 %%DATADIR%%/plugins/checkmetamodel/checkmodelgui.py
-%%DATADIR%%/plugins/checkmetamodel/checkmodelgui.pyc
 %%DATADIR%%/plugins/checkmetamodel/plugin.xml
 %%DATADIR%%/plugins/diagramlayout/__init__.py
-%%DATADIR%%/plugins/diagramlayout/__init__.pyc
 %%DATADIR%%/plugins/diagramlayout/plugin.xml
 %%DATADIR%%/plugins/diagramlayout/toposort.py
-%%DATADIR%%/plugins/diagramlayout/toposort.pyc
 %%DATADIR%%/plugins/liveobjectbrowser/__init__.py
-%%DATADIR%%/plugins/liveobjectbrowser/__init__.pyc
 %%DATADIR%%/plugins/liveobjectbrowser/browser.py
-%%DATADIR%%/plugins/liveobjectbrowser/browser.pyc
 %%DATADIR%%/plugins/liveobjectbrowser/plugin.xml
+%%DATADIR%%/plugins/pdfexport/__init__.py
+%%DATADIR%%/plugins/pdfexport/plugin.xml
 %%DATADIR%%/plugins/plugineditor/__init__.py
-%%DATADIR%%/plugins/plugineditor/__init__.pyc
 %%DATADIR%%/plugins/plugineditor/plugin.xml
 %%DATADIR%%/plugins/plugineditor/plugineditor.py
-%%DATADIR%%/plugins/plugineditor/plugineditor.pyc
 %%DATADIR%%/plugins/pngexport/__init__.py
-%%DATADIR%%/plugins/pngexport/__init__.pyc
 %%DATADIR%%/plugins/pngexport/plugin.xml
-%%DATADIR%%/plugins/pngexport/pngexport.py
-%%DATADIR%%/plugins/pngexport/pngexport.pyc
 %%DATADIR%%/plugins/pynsource/__init__.py
-%%DATADIR%%/plugins/pynsource/__init__.pyc
 %%DATADIR%%/plugins/pynsource/engineer.py
-%%DATADIR%%/plugins/pynsource/engineer.pyc
 %%DATADIR%%/plugins/pynsource/keywords.py
-%%DATADIR%%/plugins/pynsource/keywords.pyc
 %%DATADIR%%/plugins/pynsource/plugin.xml
 %%DATADIR%%/plugins/pynsource/pynsource.py
-%%DATADIR%%/plugins/pynsource/pynsource.pyc
 %%DATADIR%%/plugins/svgexport/__init__.py
-%%DATADIR%%/plugins/svgexport/__init__.pyc
 %%DATADIR%%/plugins/svgexport/plugin.xml
 %%DATADIR%%/plugins/xmiexport/__init__.py
-%%DATADIR%%/plugins/xmiexport/__init__.pyc
 %%DATADIR%%/plugins/xmiexport/exportmodel.py
-%%DATADIR%%/plugins/xmiexport/exportmodel.pyc
 %%DATADIR%%/plugins/xmiexport/plugin.xml
-share/locale/nl/LC_MESSAGES/gaphor.mo
+share/locale/ca/LC_MESSAGES/gaphor.mo
 share/locale/es/LC_MESSAGES/gaphor.mo
-@dirrm %%DATADIR%%/plugins/alignment
+share/locale/nl/LC_MESSAGES/gaphor.mo
+share/locale/sv/LC_MESSAGES/gaphor.mo
+@dirrm %%DATADIR%%/plugins/xmiexport
+@dirrm %%DATADIR%%/plugins/svgexport
 @dirrm %%DATADIR%%/plugins/pynsource
-@dirrm %%DATADIR%%/plugins/plugineditor
 @dirrm %%DATADIR%%/plugins/pngexport
+@dirrm %%DATADIR%%/plugins/plugineditor
+@dirrm %%DATADIR%%/plugins/pdfexport
 @dirrm %%DATADIR%%/plugins/liveobjectbrowser
 @dirrm %%DATADIR%%/plugins/diagramlayout
 @dirrm %%DATADIR%%/plugins/checkmetamodel
-@dirrm %%DATADIR%%/plugins/svgexport
-@dirrm %%DATADIR%%/plugins/xmiexport
+@dirrm %%DATADIR%%/plugins/alignment
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/zope/testing
+@dirrm %%PYTHON_SITELIBDIR%%/zope/interface/common
+@dirrm %%PYTHON_SITELIBDIR%%/zope/interface
+@dirrm %%PYTHON_SITELIBDIR%%/zope/exceptions
+@dirrm %%PYTHON_SITELIBDIR%%/zope/deprecation
+@dirrm %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests
+@dirrm %%PYTHON_SITELIBDIR%%/zope/component/bbb
+@dirrm %%PYTHON_SITELIBDIR%%/zope/component
+@dirrm %%PYTHON_SITELIBDIR%%/zope
+@dirrm %%PYTHON_SITELIBDIR%%/gaphor/ui/tests
 @dirrm %%PYTHON_SITELIBDIR%%/gaphor/ui
 @dirrm %%PYTHON_SITELIBDIR%%/gaphor/misc
+@dirrm %%PYTHON_SITELIBDIR%%/gaphor/diagram/tests
 @dirrm %%PYTHON_SITELIBDIR%%/gaphor/diagram
+@dirrm %%PYTHON_SITELIBDIR%%/gaphor/adapters/tests
+@dirrm %%PYTHON_SITELIBDIR%%/gaphor/adapters
+@dirrm %%PYTHON_SITELIBDIR%%/gaphor/actions/tests
+@dirrm %%PYTHON_SITELIBDIR%%/gaphor/actions
+@dirrm %%PYTHON_SITELIBDIR%%/gaphor/UML/tests
 @dirrm %%PYTHON_SITELIBDIR%%/gaphor/UML
 @dirrm %%PYTHON_SITELIBDIR%%/gaphor
+@dirrm %%PYTHON_SITELIBDIR%%/gaphas