gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/55b6e1c5 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/a37f3db2 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/5386d4e3 (commit)



commit 55b6e1c5e8ffa2649f1ebe49127a143cd06dd98f
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 1 16:19:52 2018 -0700

    Temporary gnucash-docs-unstable for 3.0.
    
    This will get removed after juggling the gnucash and gnucash-docs branches.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 723f467..2d24289 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -318,6 +318,13 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
 	     version="2.6.20" repo="sourceforge"/>
   </autotools>
 
+  <autotools id="gnucash-docs-unstable" 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-docs/gnucash-docs-3.0.tar.gz"
+	     version="3.0" repo="sourceforge"/>
+  </autotools>
+
   <autotools id="scrollkeeper" autogen-sh="configure">
     <branch repo="sourceforge" module="scrollkeeper/scrollkeeper-0.3.14.tar.gz"
 	    version="0.3.14"/>

commit a37f3db26c3a185b111277a052f830068f2d57fb
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 1 16:17:59 2018 -0700

    Update stable gnucash docs to 2.6.20.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index db88682..723f467 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -314,8 +314,8 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
   <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-docs/gnucash-docs-2.6.19.tar.gz"
-	     version="2.6.19" repo="sourceforge"/>
+    <branch  module="gnucash/gnucash-docs/gnucash-docs-2.6.20.tar.gz"
+	     version="2.6.20" repo="sourceforge"/>
   </autotools>
 
   <autotools id="scrollkeeper" autogen-sh="configure">



Summary of changes:
 modulesets/gnucash.modules | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)