gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/0172722c (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/72791bd2 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/52c2382b (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/393c10cc (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/af678a29 (commit)



commit 0172722cb985f0be3da630e0a86d0880442ec0f3
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 10 12:01:28 2017 -0800

    Ensure byte-compiled Scheme files are actually included in bundle.

diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 3c6687e..b71e26d 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -142,8 +142,12 @@
     ${prefix}/share/guile
   </data>
 
-  <data>
-    ${prefix}/lib/guile
+  <data recurse="True">
+    ${prefix}/lib/guile/*.go
+  </data>
+
+  <data recurse="True">
+    ${prefix}/lib/gnucash/scm/*.go
   </data>
 
   <data>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index fac2d1b..92cd30a 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -144,8 +144,12 @@
     ${prefix}/share/guile
   </data>
 
-  <data>
-    ${prefix}/lib/guile
+  <data recurse="True">
+    ${prefix}/lib/guile/*.go
+  </data>
+
+  <data recurse="True">
+    ${prefix}/lib/gnucash/scm/*.go
   </data>
 
   <data>

commit 72791bd22442b20fa7eb3f7c1187d8c888f1a013
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 10 11:57:50 2017 -0800

    Fix bad tags in Info.plists.

diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 0112465..dd52b19 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -59,8 +59,8 @@
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
-	<key>LSApplicationCategoryType<key>
-	<string>public.app-category.finance<string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.finance</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2013 Gnucash Contributors</string>
 	<key>NSHighResolutionCapable</key>
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 8e35e40..729c620 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -59,8 +59,8 @@
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
-	<key>LSApplicationCategoryType<key>
-	<string>public.app-category.finance<string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.finance</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2016 Gnucash Contributors</string>
 	<key>NSHighResolutionCapable</key>

commit 52c2382b29d894229d438090b6611c8cdea49126
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 27 14:24:27 2016 -0800

    Change gnc-fq-* and libexec to data: They're scripts, not binaries.

diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 9bdd421..fac2d1b 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -87,14 +87,6 @@
     ${prefix}/lib/gwenhywfar
   </binary>
 
-  <binary>
-    ${prefix}/libexec
-  </binary>
-
-  <binary>
-    ${prefix}/bin/gnc-*
-  </binary>
-
   <binary dest="${bundle}/Contents/MacOS">
     ${prefix}/bin/aqbanking-cli
   </binary>
@@ -119,6 +111,14 @@
        "${bundle}", which refers to the bundle root directory.
   -->
   <data>
+    ${prefix}/libexec
+  </data>
+
+  <data>
+    ${prefix}/bin/gnc-*
+  </data>
+
+  <data>
     ${prefix}/etc/gnucash
   </data>
 

commit 393c10cc32948f21afe3007ef826d38683835bc5
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Dec 17 13:32:50 2016 -0800

    Release 2.6.15

diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 82cb04e..8e35e40 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 2.6.14 © 2016 Gnucash Contributors</string>
+	<string>Gnucash version 2.6.15 © 2016 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>2.6.14 © 2016 Gnucash Contributors</string>
+	<string>2.6.15 © 2016 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.14</string>
+	<string>2.6.15</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.14</string>
+	<string>2.6.15</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 7150256..7539446 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -225,7 +225,7 @@ for i in `ls $PREFIX/lib/libboost*`; do install_name_tool -id $i $i; done
   <autotools id="gnucash"
 	     autogen-sh="configure"
 	     autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
-    <branch module="gnucash/stable/gnucash-2.6.14.tar.bz2" version="2.6.14"
+    <branch module="gnucash/stable/gnucash-2.6.15.tar.bz2" version="2.6.15"
 	    repo="sourceforge">
     </branch>
     <dependencies>



Summary of changes:
 gnucash-bundler/Info-unstable.plist     |  4 ++--
 gnucash-bundler/Info.plist              | 12 ++++++------
 gnucash-bundler/gnucash-unstable.bundle |  8 ++++++--
 gnucash-bundler/gnucash.bundle          | 24 ++++++++++++++----------
 modulesets/gnucash.modules              |  2 +-
 5 files changed, 29 insertions(+), 21 deletions(-)