gnucash-on-osx master: Build 3.7 Release.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/4488c2b6 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/3b27d119 (commit)



commit 4488c2b6d2de5a4054ae19995149cc6c57531bf9
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Sep 7 18:14:11 2019 -0700

    Build 3.7 Release.

diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index f7e4397..fedd25e 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Gnucash</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Gnucash version 3.6-1 © 2019 Gnucash Contributors</string>
+	<string>Gnucash version 3.7-1 © 2019 Gnucash Contributors</string>
 	<key>CFBundleIconFile</key>
 	<string>gnucash.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>3.6-1 © 2019 Gnucash Contributors</string>
+	<string>3.7-1 © 2019 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6-1</string>
+	<string>3.7-1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.6-1</string>
+	<string>3.7-1</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 8deead0..82f0686 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -48,7 +48,12 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
 	     autogenargs="--with-guis='gtk3' --enable-local-install">
+<<<<<<< HEAD
     <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2" repo="aqbanking">
+=======
+    <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2"
+            repo="aqbanking" >
+>>>>>>> Build 3.7 Release.
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip='1'/>
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
     </branch>
@@ -84,8 +89,8 @@
 
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
-    <branch module="107/aqbanking-5.8.2.tar.gz" repo="aqbanking" version="5.8.2">
-      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/aqbanking-aqhbci-la.patch" strip="1"/>
+    <branch module="107/aqbanking-5.8.2.tar.gz" version="5.8.2"
+            repo="aqbanking">
     </branch>
     <dependencies>
       <dep package="gwenhywfar"/>
@@ -266,8 +271,8 @@
 
 <cmake id="gnucash"
         cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
-   <branch repo="sourceforge" module="gnucash/gnucash%20%28stable%29/3.6/gnucash-3.6.tar.bz2"
-           version="3.6" />
+   <branch module="gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
+           repo="sourceforge" version="3.7" />
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="libofx"/>
@@ -349,8 +354,8 @@
   <autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
 	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
 	    makeargs=" html" makeinstallargs="install-html" >
-    <branch  module="gnucash/gnucash%20%28stable%29/3.6/gnucash-docs-3.6.tar.gz"
-	     version="3.6" repo="sourceforge"/>
+    <branch  module="gnucash/gnucash%20%28stable%29/3.7/gnucash-docs-3.7.tar.gz"
+	     version="3.7" repo="sourceforge"/>
   </autotools>
 
   <autotools id="scrollkeeper" autogen-sh="configure">



Summary of changes:
 gnucash-bundler/Info.plist |  8 ++++----
 modulesets/gnucash.modules | 17 +++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)