From 913fdd071c8b2650a8285b2b662b719c573980d9 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Fri, 26 Jun 2015 15:40:01 -0700
Subject: [PATCH] Set up gramps module and info.plist for Gramps42 branch.

---
 mac/Info.plist     |  6 +++---
 mac/gramps.modules | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/mac/Info.plist b/mac/Info.plist
index 5a9252364..8860035a3 100755
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>master, (C) 1997-2015 The Gramps Team http://www.gramps-project.org</string>
+    <string>Gramps-4.2.0beta1, (C) 1997-2015 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>Master</string>
+    <string>4.2.0beta1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>Master</string>
+    <string>Gramps-4.2.0beta1-1</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 1997 - 2015 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
diff --git a/mac/gramps.modules b/mac/gramps.modules
index f7793d855..89d4d47be 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -23,6 +23,8 @@
 	     href="http://www.johnstowers.co.nz/files/"/>
   <repository type="git" name="github"
 	      href="git://github.com/"/>
+  <repository type="tarball" name="github-tarball"
+	      href="https://github.com/"/>
   <repository type="tarball" name="graphviz"
 	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
   <repository type="tarball" name="exiv2.org"
@@ -52,12 +54,22 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
 -->
 
-  <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
-  <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+  <!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/-->
+  <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
 
   <distutils id="gramps-git" supports-non-srcdir-builds="no">
     <branch module="gramps-project/gramps.git" repo="github"
-	    checkoutdir="gramps-git"/>
+	    checkoutdir="gramps-git" tag="maintenance/gramps42"/>
+    <dependencies>
+      <dep package="meta-python2-modules"/>
+      <dep package="meta-python3-modules"/>
+    </dependencies>
+  </distutils>
+
+  <distutils id="gramps" supports-non-srcdir-builds="no">
+    <branch module="gramps-project/gramps/archive/gramps-4.2.0beta1.tar.gz"
+	    repo="github-tarball" version="4.2.0beta1"
+	    checkoutdir="gramps-gramps-4.2.0beta1"/>
     <dependencies>
       <dep package="meta-python2-modules"/>
       <dep package="meta-python3-modules"/>
@@ -178,6 +190,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
  <metamodule id="meta-python3-modules">
    <dependencies>
      <dep package="python3"/>
+     <dep package="berkeleydb"/>
      <dep package="pycairo-python3"/>
      <dep package="pygobject3"/>
      <dep package='pyicu'/>