--- a/components/desktop/dbus-python/dbus-python-GENFRAG.p5m Tue Nov 22 10:51:59 2016 -0800
+++ b/components/desktop/dbus-python/dbus-python-GENFRAG.p5m Wed Nov 23 12:49:20 2016 -0800
@@ -33,3 +33,9 @@
file path=usr/share/doc/dbus-python/README
file path=usr/share/doc/dbus-python/tutorial.txt
license COPYING license=MIT
+
+# Prevent conflicts with packages that used to deliver these files by
+# depending on obsolete versions of them.
+depend type=optional [email protected],5.12-5.12.0.0.0.112.0
+depend type=optional \
+ fmri=library/python-2/[email protected],5.12-5.12.0.0.0.112.0
--- a/components/desktop/dbus-python/dbus-python-PYVER.p5m Tue Nov 22 10:51:59 2016 -0800
+++ b/components/desktop/dbus-python/dbus-python-PYVER.p5m Wed Nov 23 12:49:20 2016 -0800
@@ -62,3 +62,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/dbus/service.py
file path=usr/lib/python$(PYVER)/vendor-packages/dbus/types.py
license COPYING license=MIT
+
+# force the rename with an optional dependency on the old name
+$(PYTHON_2.7_ONLY)depend type=optional \
+ fmri=library/python/[email protected],5.12-5.12.0.0.0.113.0
+
+# force a dependency on the dbus-python package
+depend type=require \
+ fmri=library/python/dbus-python@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)