Fix a bundling omission and create python2 and python3 meta-modules.

The latter to improve automation.

mac/Info.plist

@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Trunk, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
+    <string>master, (C) 1997-2015 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,13 +17,13 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>Trunk</string>
+    <string>Master</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>Trunk</string>
+    <string>Master</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2012 The Gramps Team, GNU General Public License.</string>
+    <string>Copyright 1997 - 2015 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.5</string>
 </dict>

mac/gramps.bundle

@@ -151,6 +151,10 @@
     ${prefix}/lib/python3.4/site-packages/gramps/gen/utils/resource-path
   </data>
 
+  <data>
+    ${prefix}/include/python3.4m/pyconfig.h
+  </data>
+
   <data>
     ${prefix}/lib/girepository-1.0/
   </data>

mac/gramps.modules

@@ -61,18 +61,8 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     <branch module="source" repo="gramps"
 	    checkoutdir="gramps-git"/>
     <dependencies>
-      <dep package="meta-gtk-osx-python3-gtk3"/>
+      <dep package="meta-python2-modules"/>
-      <dep package="meta-gtk-osx-gtk3-core-themes"/>
+      <dep package="meta-python3-modules"/>
-      <dep package="goocanvas2"/>
-      <dep package="librsvg"/>
-      <dep package="shared-mime-info"/>
-      <dep package="hunspell"/>
-      <dep package="gtkspell3"/>
-      <dep package="osmgpsmap"/>
-      <dep package="graphviz"/>
-      <dep package="pil"/>
-      <dep package='pyicu'/>
-      <dep package="gexiv2"/>
     </dependencies>
   </distutils>
 
@@ -110,6 +100,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </autotools>
 
   <autotools id="osmgpsmap" skip-autogen="never"
+	     autogenargs="--disable-gtk-doc-html"
 	     supports-non-srcdir-builds="no">
     <branch module="nzjrs/osm-gps-map" revision="1.0.2" repo="github"/>
     <dependencies>
@@ -161,4 +152,32 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </distutils>
 
+  <metamodule id="meta-python2-modules">
+    <dependencies>
+      <dep package="python"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="gtk-mac-integration-python"/>
+      <dep package="meta-gtk-osx-gtk3-core-themes"/>
+      <dep package="goocanvas2"/>
+      <dep package="librsvg"/>
+      <dep package="shared-mime-info"/>
+      <dep package="hunspell"/>
+      <dep package="gtkspell3"/>
+      <dep package="osmgpsmap"/>
+      <dep package="graphviz"/>
+      <dep package="pil"/>
+      <dep package="gexiv2"/>
+   </dependencies>
+ </metamodule>
+
+ <metamodule id="meta-python3-modules">
+   <dependencies>
+     <dep package="python3"/>
+     <dep package="pycairo-python3"/>
+     <dep package="pygobject3"/>
+     <dep package='pyicu'/>
+     <dep package='pybsddb'/>
+   </dependencies>
+ </metamodule>
+
 </moduleset>