Consolidate Python2 and Python3 meta-modules.

GObject-Introspection now works with Python3 so the split isn't needed any more.
This commit is contained in:
John Ralls 2018-01-15 07:27:43 -08:00
parent 56122b0a54
commit 2fbc0b8aeb

View File

@ -169,9 +169,9 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
</dependencies> </dependencies>
</distutils> </distutils>
<metamodule id="meta-python2-modules"> <metamodule id="meta-gramps-modules">
<dependencies> <dependencies>
<dep package="python"/> <dep package="python3"/>
<dep package="meta-gtk-osx-gtk3"/> <dep package="meta-gtk-osx-gtk3"/>
<dep package="gtk-mac-integration-python"/> <dep package="gtk-mac-integration-python"/>
<dep package="meta-gtk-osx-gtk3-core-themes"/> <dep package="meta-gtk-osx-gtk3-core-themes"/>
@ -184,18 +184,12 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<dep package="graphviz"/> <dep package="graphviz"/>
<dep package="pil"/> <dep package="pil"/>
<dep package="gexiv2"/> <dep package="gexiv2"/>
</dependencies> <dep package="berkeleydb"/>
</metamodule> <dep package="pycairo"/>
<dep package="pygobject3"/>
<metamodule id="meta-python3-modules"> <dep package='pyicu'/>
<dependencies> <dep package='pybsddb'/>
<dep package="python3"/> </dependencies>
<dep package="berkeleydb"/> </metamodule>
<dep package="pycairo"/>
<dep package="pygobject3"/>
<dep package='pyicu'/>
<dep package='pybsddb'/>
</dependencies>
</metamodule>
</moduleset> </moduleset>