- Update finance/gnucash to 3.1

- Remove portscout limitation
- Add TEST option, disabled by default
- Remove upstreamed patch
- Update WWW link in pkg-descr
- Update finance/gnucash-docs to 3.1

Version 3.x brings various changes:
- Based on gtk3
- Using webkit2
- Using cmake to build
- Dropped support for guile1

For a full changelog visit https://gnucash.org/news.phtml

10 files changed, 352 insertions, 347 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 62e98f5b099d..f1ea6c4aea4b 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -2,7 +2,8 @@
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
 
 PORTNAME=	gnucash
-PORTVERSION=	2.6.21
+PORTVERSION=	3.1
+DISTVERSIONSUFFIX=	-1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -13,77 +14,57 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring \
-		libwebkitgtk-1.0.so:www/webkit-gtk2 \
-		libgoffice-0.8.so:devel/goffice \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libsecret-1.so:security/libsecret \
-		libsoup-2.4.so:devel/libsoup
+		libsoup-2.4.so:devel/libsoup \
+		libguile-2.0.so:lang/guile2 \
+		libgc-threaded.so:devel/boehm-gc-threaded \
+		libboost_date_time.so:devel/boost-libs \
+		libicudata.so:devel/icu
 RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
 		p5-Date-Manip>=0:devel/p5-Date-Manip \
 		p5-Finance-Quote>=0:finance/p5-Finance-Quote
 
-PORTSCOUT=	 limitw:1,even
-
-FLAVORS=		guile2 guile1
-
-guile1_PKGNAMESUFFIX=	-guile1
-guile1_LIB_DEPENDS=     libguile.so:lang/guile \
-			libgmp.so:math/gmp \
-			libltdl.so:devel/libltdl
-guile1_BUILD_DEPENDS=	slib-guile>0:lang/slib-guile
-guile1_RUN_DEPENDS=	slib-guile>0:lang/slib-guile
-guile1_CONFLICTS_INSTALL=	gnucash-[0-9]*
-guile2_LIB_DEPENDS=     libguile-2.0.so:lang/guile2 \
-			libgc-threaded.so:devel/boehm-gc-threaded
-guile2_BUILD_DEPENDS=	slib-guile2>0:lang/slib-guile2
-guile2_RUN_DEPENDS=	slib-guile2>0:lang/slib-guile2
-guile2_CONFLICTS_INSTALL=	gnucash-guile1-[0-9]*
-
-OPTIONS_DEFINE=		AQBANKING DATABASE DOCS GTKMM LOCALE_TAX NLS OFX PYTHON
+OPTIONS_DEFINE=	AQBANKING DATABASE DOCS NLS OFX PYTHON TEST
 OPTIONS_DEFAULT=	AQBANKING OFX
 
 AQBANKING_DESC=	AqBanking support (HBCI/OpenHBCI)
 DATABASE_DESC=	Enable SQL database backends
-GTKMM_DESC=	Enable GTKMM based UI
-LOCALE_TAX_DESC=	Enable localized tax categories
 OFX_DESC=	OFX support
 
 OPTIONS_SUB=		yes
-AQBANKING_CONFIGURE_ENABLE=aqbanking
-AQBANKING_LIB_DEPENDS=	libgwengui-gtk2.so:devel/gwenhywfar-gtk2 \
+AQBANKING_CMAKE_BOOL=	WITH_AQBANKING
+AQBANKING_LIB_DEPENDS=	libgwenhywfar.so:devel/gwenhywfar \
 			libgwenhywfar.so:devel/gwenhywfar \
 			libktoblzcheck.so:finance/ktoblzcheck \
 			libaqbanking.so:finance/aqbanking
 AQBANKING_VARS=		GLIB_SCHEMAS+=org.gnucash.dialogs.import.hbci.gschema.xml
-DATABASE_CONFIGURE_ENABLE=dbi
+DATABASE_CMAKE_BOOL=	WITH_SQL
 DATABASE_BUILD_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
 DATABASE_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DATABASE_RUN_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
-DATABASE_CONFIGURE_ON=	--with-dbi-dbd-dir=${LOCALBASE}/lib/dbd
-GTKMM_USE=		GNOME=gtkmm24
-GTKMM_CONFIGURE_ON=	--enable-gtkmm
-GTKMM_CONFIGURE_OFF=	--disable-gtkmm
-LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax
-NLS_CONFIGURE_ENABLE=	nls
+NLS_CMAKE_BOOL_OFF=	DISABLE_NLS
 NLS_USES=		gettext-runtime
-OFX_CONFIGURE_ENABLE=	ofx
+OFX_CMAKE_BOOL=		WITH_OFX
 OFX_LIB_DEPENDS=	libofx.so:finance/libofx
 OFX_VARS=		GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml
-PYTHON_CONFIGURE_ON=	--enable-python
-PYTHON_USES=		python:2.7
+PYTHON_CMAKE_BOOL=	WITH_PYTHON
+PYTHON_USES=		python:3.3+
+TEST_BUILD_DEPENDS=	${NONEXISTENT}:devel/googlemock:build \
+			gtest-config:devel/googletest
 
-USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake libtool localbase \
+USES=		cmake compiler:c++11-lib desktop-file-utils gettext-tools libtool localbase \
 		perl5 pkgconfig shebangfix tar:bzip2
 USE_XORG=	x11
 USE_CXXSTD=	c++11
 INSTALLS_ICONS=	yes
-USE_GNOME+=	cairo gtk20 intltool libgnomecanvas libxml2 libxslt
-GNU_CONFIGURE=	yes
+USE_GNOME+=	cairo gtk30 intltool libxml2 libxslt
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-error-on-warning \
-		--disable-doxygen
-SHEBANG_FILES=	src/gnc-test-env.pl src/quotes/gnc-fq-dump
+CMAKE_ARGS=	-DCOMPILE_GSCHEMAS=OFF \
+		-DENABLE_BINRELOC=OFF
+SHEBANG_FILES=	common/gnc-test-env.pl libgnucash/quotes/gnc-fq-dump
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 GLIB_SCHEMAS=	org.gnucash.dialogs.business.gschema.xml \
@@ -104,20 +85,24 @@ GLIB_SCHEMAS=	org.gnucash.dialogs.business.gschema.xml \
 		org.gnucash.window.pages.account.tree.gschema.xml \
 		org.gnucash.window.pages.gschema.xml
 
-.if ${FLAVOR:U} == guile1
-CONFIGURE_ARGS+=	--with-guile=1.8
-PLIST_SUB+=		GUILE2="@comment "
-.elif ${FLAVOR:U${FLAVORS:[1]}} == guile2
-CONFIGURE_ARGS+=	--with-guile=2.0
-PLIST_SUB+=		GUILE2=""
-.endif
-
 .include <bsd.port.pre.mk>
 
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-LDFLAGS+=	-lstdc++
+.if ${PORT_OPTIONS:MTEST}
+GMOCK_WRKSRC!=	cd ${PORTSDIR}/devel/googlemock && ${MAKE} -V WRKSRC
+CONFIGURE_ENV+=	GMOCK_ROOT="${GMOCK_WRKSRC}"
 .endif
 
+post-patch-TEST-off:
+	@(cd ${WRKSRC} ; \
+		${FIND} . -type f -name CMakeLists.txt \
+		-exec ${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY *(test.*)/d' \
+		-e '/ENABLE_TESTING()/d' -e '/INCLUDE (GncAddTest)/d' \
+		-e '/GNC_GTEST_CONFIGURE()/d' {} +)
+
+post-install:
+	@(cd ${STAGEDIR}${DATADIR}/icons/hicolor && \
+		${RMDIR} 22x22 32x32 48x48 64x64 96x96 128x128 256x256 scalable)
+
 post-install-PYTHON-on:
 	@(cd ${STAGEDIR}${PREFIX} \
 		&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
@@ -127,8 +112,4 @@ post-install-PYTHON-on:
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME})
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*so*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnucash/lib*.so
-
 .include <bsd.port.post.mk>
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index d6134df9caae..cccb6562e256 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524233488
-SHA256 (gnucash-2.6.21.tar.bz2) = 2c3bed2a9366ac0def3e1abf39e148b2850f5ef34c99d0497acd2643db4ffa58
-SIZE (gnucash-2.6.21.tar.bz2) = 13685082
+TIMESTAMP = 1525419034
+SHA256 (gnucash-3.1-1.tar.bz2) = a1ef66cec3b8b74b7b8bfe791ff12456796a69cc004427e8d9205b6872bdd261
+SIZE (gnucash-3.1-1.tar.bz2) = 13374530
diff --git a/finance/gnucash/files/patch-CMakeLists.txt b/finance/gnucash/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..57d89d5e1057
--- /dev/null
+++ b/finance/gnucash/files/patch-CMakeLists.txt
@@ -0,0 +1,21 @@
+--- CMakeLists.txt.orig	2018-04-30 18:58:18 UTC
++++ CMakeLists.txt
+@@ -43,6 +43,7 @@ INCLUDE (MacroAppendForeach)
+ INCLUDE (MacroAddSourceFileCompileFlags)
+ INCLUDE (GncAddSwigCommand)
+ INCLUDE (CheckIncludeFiles)
++INCLUDE (CheckSymbolExists)
+ INCLUDE (GncAddSchemeTargets)
+ INCLUDE (GncAddGSchemaTargets)
+ INCLUDE (GncAddTest)
+@@ -550,8 +551,8 @@ SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
+ 
+ 
+ IF (UNIX)
+-  SET( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
+-  SET( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused ${CMAKE_CXX_FLAGS}")
++  SET( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
++  SET( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused ${CMAKE_CXX_FLAGS}")
+   SET( CMAKE_C_FLAGS "-Wno-deprecated-declarations -std=gnu11 ${CMAKE_C_FLAGS}")
+   SET( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
+ ENDIF (UNIX)
diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure
deleted file mode 100644
index 58657343078b..000000000000
--- a/finance/gnucash/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2017-09-22 22:13:51 UTC
-+++ configure
-@@ -21090,6 +21090,7 @@ $as_echo_n "checking for guile-2.0 >= 2.0.0... " >&6; 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-             succeeded=yes
-+            GUILE_EFFECTIVE_VERSION=1.8
- 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking GUILE_CFLAGS" >&5
- $as_echo_n "checking GUILE_CFLAGS... " >&6; }
diff --git a/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c b/finance/gnucash/files/patch-gnucash_import-export_ofx_gnc-ofx-import.c
index fa5311a4672a..b99a480876b3 100644
--- a/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c
+++ b/finance/gnucash/files/patch-gnucash_import-export_ofx_gnc-ofx-import.c
@@ -1,18 +1,19 @@
---- src/import-export/ofx/gnc-ofx-import.c.orig	2016-12-15 21:46:51 UTC
-+++ src/import-export/ofx/gnc-ofx-import.c
-@@ -336,8 +336,25 @@ fix_ofx_bug_39 (time64 t)
+--- gnucash/import-export/ofx/gnc-ofx-import.c.orig	2018-03-31 22:46:37 UTC
++++ gnucash/import-export/ofx/gnc-ofx-import.c
+@@ -337,8 +337,26 @@ fix_ofx_bug_39 (time64 t)
  {
  #if HAVE_OFX_BUG_39
      struct tm stm;
-+
 +#ifdef __FreeBSD__
 +    time64 now;
 +    /*
 +     * FreeBSD has it's own libc implementation which differs from glibc. In particular:
-+     * There is no daylight global
-+     * tzname members are set to the string "   " (three spaces) when not explicitly populated
++     * There is no daylight global.
++     * tzname members are set to the string "   " (three spaces) when not explicitly
++     * populated
 +     *
-+     * To check that the current timezone does not observe DST I check if tzname[1] starts with a space.
++     * To check that the current timezone does not observe DST I check if tzname[1]
++     * starts with a space.
 +     */
 +    now = gnc_time (NULL);
 +    gnc_localtime_r(&now, &stm);
@@ -23,6 +24,6 @@
      gnc_localtime_r(&t, &stm);
      if (daylight && !stm.tm_isdst)
 +#endif
-       t += 3600;
+         t += 3600;
  #endif
      return t;
diff --git a/finance/gnucash/files/patch-libgnucash_app-utils_guile-util.c b/finance/gnucash/files/patch-libgnucash_app-utils_guile-util.c
new file mode 100644
index 000000000000..cdc44f7b5816
--- /dev/null
+++ b/finance/gnucash/files/patch-libgnucash_app-utils_guile-util.c
@@ -0,0 +1,11 @@
+--- libgnucash/app-utils/guile-util.c.orig	2018-03-31 22:46:38 UTC
++++ libgnucash/app-utils/guile-util.c
+@@ -1095,6 +1095,8 @@ gnc_parse_time_to_time64 (const gchar *s, const gchar 
+ 
+     g_return_val_if_fail(s && format, -1);
+ 
++    bzero(&tm, sizeof(tm));
++
+     if (!strptime(s, format, &tm))
+         return -1;
+ 
diff --git a/finance/gnucash/files/patch-src_app-utils_guile-util.c b/finance/gnucash/files/patch-src_app-utils_guile-util.c
deleted file mode 100644
index 88c4be03b959..000000000000
--- a/finance/gnucash/files/patch-src_app-utils_guile-util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/app-utils/guile-util.c.orig	2017-09-19 23:23:17 UTC
-+++ src/app-utils/guile-util.c
-@@ -1083,6 +1083,8 @@ gnc_parse_time_to_time64 (const gchar *s, const gchar 
- 
-     g_return_val_if_fail(s && format, -1);
- 
-+    bzero(&tm, sizeof(tm));
-+
-     if (!strptime(s, format, &tm))
-         return -1;
- 
diff --git a/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in b/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in
deleted file mode 100644
index 04f1c6176f48..000000000000
--- a/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/report/report-gnome/Makefile.in.orig	2017-09-22 22:13:50 UTC
-+++ src/report/report-gnome/Makefile.in
-@@ -599,6 +599,7 @@ EXTRA_DIST = \
- @GNC_HAVE_GUILE_2_TRUE@GUILE_COMPILE_ENV = \
- @GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/app-utils \
- @GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/engine \
-+@GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/report/report-gnome \
- @GNC_HAVE_GUILE_2_TRUE@  --guile-load-dir ${top_builddir}/src/app-utils \
- @GNC_HAVE_GUILE_2_TRUE@  --guile-load-dir ${top_builddir}/src/core-utils \
- @GNC_HAVE_GUILE_2_TRUE@  --guile-load-dir ${top_builddir}/src/engine \
diff --git a/finance/gnucash/pkg-descr b/finance/gnucash/pkg-descr
index 3be1a025ee5b..48d95632ea6a 100644
--- a/finance/gnucash/pkg-descr
+++ b/finance/gnucash/pkg-descr
@@ -9,4 +9,4 @@ Its features include:
 * Separate the GUI from the actual "account/transaction engine"
 * Multiple accounts ( Check, Credit, Cash, Mutual Funds, etc.. )
 
-WWW: http://www.gnucash.org/
+WWW: https://www.gnucash.org/
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index b4186e0acfd2..7654906053fb 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -3,11 +3,8 @@ bin/gnc-fq-dump
 bin/gnc-fq-helper
 bin/gnc-fq-update
 bin/gnucash
-bin/gnucash-env
-bin/gnucash-make-guids
 bin/gnucash-valgrind
-etc/gnucash/config
-etc/gnucash/environment
+%%ETCDIR%%/environment
 include/gnucash/Account.h
 include/gnucash/FreqSpec.h
 include/gnucash/Query.h
@@ -63,6 +60,7 @@ include/gnucash/gnc-account-sel.h
 include/gnucash/gnc-accounting-period.h
 include/gnucash/gnc-addr-quickfill.h
 include/gnucash/gnc-amount-edit.h
+include/gnucash/gnc-aqbanking-templates.h
 include/gnucash/gnc-basic-gobject.h
 include/gnucash/gnc-budget.h
 include/gnucash/gnc-cell-renderer-date.h
@@ -76,8 +74,8 @@ include/gnucash/gnc-currency-edit.h
 include/gnucash/gnc-date-delta.h
 include/gnucash/gnc-date-edit.h
 include/gnucash/gnc-date-format.h
-include/gnucash/gnc-date-p.h
 include/gnucash/gnc-date.h
+include/gnucash/gnc-datetime.hpp
 include/gnucash/gnc-dense-cal-model.h
 include/gnucash/gnc-dense-cal-store.h
 include/gnucash/gnc-dense-cal.h
@@ -87,6 +85,7 @@ include/gnucash/gnc-entry-quickfill.h
 include/gnucash/gnc-euro.h
 include/gnucash/gnc-event.h
 include/gnucash/gnc-exp-parser.h
+include/gnucash/gnc-features.h
 include/gnucash/gnc-file.h
 include/gnucash/gnc-frequency.h
 include/gnucash/gnc-general-search.h
@@ -104,6 +103,7 @@ include/gnucash/gnc-html-history.h
 include/gnucash/gnc-html-p.h
 include/gnucash/gnc-html-webkit-p.h
 include/gnucash/gnc-html-webkit.h
+include/gnucash/gnc-html-webkit2.h
 include/gnucash/gnc-html.h
 include/gnucash/gnc-icons.h
 include/gnucash/gnc-keyring.h
@@ -112,6 +112,7 @@ include/gnucash/gnc-menu-extensions.h
 include/gnucash/gnc-module-api.h
 include/gnucash/gnc-module.h
 include/gnucash/gnc-numeric.h
+include/gnucash/gnc-numeric.hpp
 include/gnucash/gnc-period-select.h
 include/gnucash/gnc-plugin-file-history.h
 include/gnucash/gnc-plugin-manager.h
@@ -122,6 +123,8 @@ include/gnucash/gnc-plugin.h
 include/gnucash/gnc-prefs-utils.h
 include/gnucash/gnc-pricedb.h
 include/gnucash/gnc-query-view.h
+include/gnucash/gnc-rational-rounding.hpp
+include/gnucash/gnc-rational.hpp
 include/gnucash/gnc-recurrence.h
 include/gnucash/gnc-report.h
 include/gnucash/gnc-session.h
@@ -130,6 +133,7 @@ include/gnucash/gnc-state.h
 include/gnucash/gnc-sx-instance-dense-cal-adapter.h
 include/gnucash/gnc-sx-instance-model.h
 include/gnucash/gnc-sx-list-tree-model-adapter.h
+include/gnucash/gnc-timezone.hpp
 include/gnucash/gnc-tree-control-split-reg.h
 include/gnucash/gnc-tree-model-account-types.h
 include/gnucash/gnc-tree-model-account.h
@@ -150,6 +154,7 @@ include/gnucash/gnc-tree-view.h
 include/gnucash/gnc-ui-balances.h
 include/gnucash/gnc-ui-util.h
 include/gnucash/gnc-ui.h
+include/gnucash/gnc-uri-utils.h
 include/gnucash/gnc-window.h
 include/gnucash/gncAddress.h
 include/gnucash/gncAddressP.h
@@ -178,23 +183,22 @@ include/gnucash/gncVendor.h
 include/gnucash/gncVendorP.h
 include/gnucash/gtable.h
 include/gnucash/guid.h
+include/gnucash/guid.hpp
 include/gnucash/guile-util.h
-include/gnucash/import-match-map.h
 include/gnucash/import-parse.h
+include/gnucash/kvp-frame.hpp
 include/gnucash/kvp-scm.h
-include/gnucash/kvp-util-p.h
-include/gnucash/kvp-util.h
-include/gnucash/kvp_frame.h
+include/gnucash/kvp-value.hpp
 include/gnucash/misc-gnome-utils.h
 include/gnucash/numcell.h
 include/gnucash/option-util.h
 include/gnucash/policy.h
 include/gnucash/pricecell.h
 include/gnucash/print-session.h
+include/gnucash/qof-backend.hpp
 include/gnucash/qof-gobject.h
 include/gnucash/qof-string-cache.h
 include/gnucash/qof.h
-include/gnucash/qofbackend-p.h
 include/gnucash/qofbackend.h
 include/gnucash/qofbook.h
 include/gnucash/qofbookslots.h
@@ -209,8 +213,8 @@ include/gnucash/qoflog.h
 include/gnucash/qofobject.h
 include/gnucash/qofquery.h
 include/gnucash/qofquerycore.h
-include/gnucash/qofreference.h
 include/gnucash/qofsession.h
+include/gnucash/qofsession.hpp
 include/gnucash/qofutil.h
 include/gnucash/quickfillcell.h
 include/gnucash/recncell.h
@@ -222,222 +226,215 @@ include/gnucash/table-model.h
 include/gnucash/tree-view-utils.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
-%%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so
-%%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so.0
-%%PYTHON%%lib/gnucash/libgncmod-app-utils-python.so.0.0.0
 lib/gnucash/libgncmod-app-utils.so
 %%AQBANKING%%lib/gnucash/libgncmod-aqbanking.so
 %%DATABASE%%lib/gnucash/libgncmod-backend-dbi.so
 lib/gnucash/libgncmod-backend-xml.so
-lib/gnucash/libgncmod-bi_import.so
-lib/gnucash/libgncmod-business-gnome.so
+lib/gnucash/libgncmod-bi-import.so
 lib/gnucash/libgncmod-csv-export.so
 lib/gnucash/libgncmod-csv-import.so
-lib/gnucash/libgncmod-customer_import.so
+lib/gnucash/libgncmod-customer-import.so
 lib/gnucash/libgncmod-engine.so
 lib/gnucash/libgncmod-generic-import.so
 lib/gnucash/libgncmod-gnome-search.so
 lib/gnucash/libgncmod-gnome-utils.so
-%%GTKMM%%lib/gnucash/libgncmod-gtkmm.so
 lib/gnucash/libgncmod-html.so
 lib/gnucash/libgncmod-ledger-core.so
 lib/gnucash/libgncmod-locale-reports-us.so
 lib/gnucash/libgncmod-log-replay.so
 %%OFX%%lib/gnucash/libgncmod-ofx.so
-%%PYTHON%%lib/gnucash/libgncmod-python.so
 lib/gnucash/libgncmod-qif-import.so
 lib/gnucash/libgncmod-qif.so
-lib/gnucash/libgncmod-qif.so.0
-lib/gnucash/libgncmod-qif.so.0.0.0
 lib/gnucash/libgncmod-register-core.so
 lib/gnucash/libgncmod-register-gnome.so
 lib/gnucash/libgncmod-report-gnome.so
 lib/gnucash/libgncmod-report-system.so
-lib/gnucash/libgncmod-standard-reports.so
 lib/gnucash/libgncmod-stylesheets.so
 lib/gnucash/libgncmod-tax-us.so
-lib/gnucash/libgncmod-utility-reports.so
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/build-config.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/business-options.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/business-prefs.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/c-interface.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/commodity-table.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/commodity-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/config-var.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/date-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/engine-interface.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/engine-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/fin.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnc-menu-extensions.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnc-numeric.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/app-utils.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/business-core.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/business-gnome.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/core-utils.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/engine.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/gettext.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-module.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/gnome-utils.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/import-export/qif-import.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/main.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/price-quotes.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/printf.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/aging.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/balsheet-eg.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/business-reports.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/customer-summary.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/easy-invoice.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-gnc.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-html-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/fancy-invoice.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/hello-world.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/invoice.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/job-report.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/de_DE.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/us.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/owner-report.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/payables.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/receivables.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/collectors.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/list-extras.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/report-collectors.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-piecharts.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-summary.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/advanced-portfolio.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/average-balance.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/balance-sheet.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-balance-sheet.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-barchart.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-flow.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-income-statement.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/cash-flow.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/category-barchart.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/daily-reports.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/equity-statement.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-journal.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-ledger.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-statement.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-barchart.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-linechart.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/portfolio.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/price-scatter.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/register.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/sx-summary.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/transaction.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/trial-balance.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-easy.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-fancy.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-footer.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-plain.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheets.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/taxinvoice.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf-de_DE.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/utility-reports.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/view-column.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/report/welcome-to-gnucash.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/tax/de_DE.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/tax/us.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnucash/unittest-support.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnumeric/gnumeric-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/gnumeric/table-utils.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/hooks.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-acct-table.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-barchart.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-document.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-fonts.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-jqplot.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-linechart.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-piechart.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-scatter.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-style-info.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-style-sheet.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-table.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-text.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/html-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/migrate-prefs.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/options-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/options.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/prefs.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-dialog-utils.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-file.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-guess-map.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-import.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-merge-groups.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-objects.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-parse.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-to-gnc.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/qif-import/qif-utils.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/report-utilities.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/report.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/simple-obj.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/string.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/substring-search.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf-de_DE.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf-help-de_DE.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf-help.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/txf.go
-%%GUILE2%%lib/gnucash/scm/ccache/2.0/xml-generator.go
-lib/libgnc-backend-sql.so
-lib/libgnc-backend-sql.so.0
-lib/libgnc-backend-sql.so.0.0.0
+lib/gnucash/scm/ccache/2.0/business-options.go
+lib/gnucash/scm/ccache/2.0/business-prefs.go
+lib/gnucash/scm/ccache/2.0/c-interface.go
+lib/gnucash/scm/ccache/2.0/commodity-table.go
+lib/gnucash/scm/ccache/2.0/commodity-utilities.go
+lib/gnucash/scm/ccache/2.0/config-var.go
+lib/gnucash/scm/ccache/2.0/date-utilities.go
+lib/gnucash/scm/ccache/2.0/engine-interface.go
+lib/gnucash/scm/ccache/2.0/engine-utilities.go
+lib/gnucash/scm/ccache/2.0/fin.go
+lib/gnucash/scm/ccache/2.0/gnc-menu-extensions.go
+lib/gnucash/scm/ccache/2.0/gnc-numeric.go
+lib/gnucash/scm/ccache/2.0/gnucash/app-utils.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/baz.go
+lib/gnucash/scm/ccache/2.0/gnucash/business-core.go
+lib/gnucash/scm/ccache/2.0/gnucash/core-utils.go
+lib/gnucash/scm/ccache/2.0/gnucash/engine.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/engine/test/test-extras.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/foo.go
+lib/gnucash/scm/ccache/2.0/gnucash/gettext.go
+lib/gnucash/scm/ccache/2.0/gnucash/gnc-module.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-load-deps.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-load-scm.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-init.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-module.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-scm-multi.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/gnc-modules/test/test-gnc-module-swigged-c.go
+lib/gnucash/scm/ccache/2.0/gnucash/gnome-utils.go
+lib/gnucash/scm/ccache/2.0/gnucash/import-export/qif-import.go
+lib/gnucash/scm/ccache/2.0/gnucash/import-export/string.go
+lib/gnucash/scm/ccache/2.0/gnucash/price-quotes.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/aging.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/balsheet-eg.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/business-reports.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/customer-summary.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/easy-invoice.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-gnc.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-html-utilities.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/eguile-utilities.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/fancy-invoice.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/hello-world.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/invoice.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/job-report.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/de_DE.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/us.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/owner-report.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/payables.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/receipt.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/receivables.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/collectors.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/list-extras.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/report-collectors.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-collectors.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-extras.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-list-extras.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-load-report-system-module.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-report-utilities.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-piecharts.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-summary.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/advanced-portfolio.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/average-balance.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/balance-sheet.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-balance-sheet.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-barchart.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-flow.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget-income-statement.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/budget.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/cash-flow.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/cashflow-barchart.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/category-barchart.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/daily-reports.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/equity-statement.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-journal.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-ledger.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-gst-statement.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-statement.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-barchart.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-linechart.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/portfolio.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/price-scatter.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/register.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/sx-summary.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-cash-flow.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-cashflow-barchart.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-generic-category-report.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-generic-net-barchart.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-generic-net-linechart.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-category-report.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-net-barchart.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-net-linechart.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/transaction.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/trial-balance.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-easy.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-fancy.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-footer.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-head-or-tail.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-plain.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheets.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/taxinvoice.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf-de_DE.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/taxtxf.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/test-load-report-stylesheets-module.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/utility-reports.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/view-column.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/welcome-to-gnucash.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/reports/test-load-app-utils-module.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/reports/test-load-gnome-utils-module.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/reports/test-load-report-gnome-module.go
+lib/gnucash/scm/ccache/2.0/gnucash/tax/de_DE.go
+lib/gnucash/scm/ccache/2.0/gnucash/tax/us.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/unittest-support.go
+lib/gnucash/scm/ccache/2.0/gnucash/utilities.go
+lib/gnucash/scm/ccache/2.0/hooks.go
+lib/gnucash/scm/ccache/2.0/html-acct-table.go
+lib/gnucash/scm/ccache/2.0/html-barchart.go
+lib/gnucash/scm/ccache/2.0/html-document.go
+lib/gnucash/scm/ccache/2.0/html-fonts.go
+lib/gnucash/scm/ccache/2.0/html-linechart.go
+lib/gnucash/scm/ccache/2.0/html-piechart.go
+lib/gnucash/scm/ccache/2.0/html-scatter.go
+lib/gnucash/scm/ccache/2.0/html-style-info.go
+lib/gnucash/scm/ccache/2.0/html-style-sheet.go
+lib/gnucash/scm/ccache/2.0/html-table.go
+lib/gnucash/scm/ccache/2.0/html-text.go
+lib/gnucash/scm/ccache/2.0/html-utilities.go
+lib/gnucash/scm/ccache/2.0/migrate-prefs.go
+lib/gnucash/scm/ccache/2.0/options-utilities.go
+lib/gnucash/scm/ccache/2.0/options.go
+lib/gnucash/scm/ccache/2.0/prefs.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-dialog-utils.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-file.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-guess-map.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-import.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-merge-groups.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-objects.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-parse.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-to-gnc.go
+lib/gnucash/scm/ccache/2.0/qif-import/qif-utils.go
+lib/gnucash/scm/ccache/2.0/report-utilities.go
+lib/gnucash/scm/ccache/2.0/report.go
+lib/gnucash/scm/ccache/2.0/simple-obj.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/test-account.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/test-c-interface.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/test-create-account.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/test-split.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/test-test-extras.go
+lib/gnucash/scm/ccache/2.0/txf-de_DE.go
+lib/gnucash/scm/ccache/2.0/txf-help-de_DE.go
+lib/gnucash/scm/ccache/2.0/txf-help.go
+lib/gnucash/scm/ccache/2.0/txf.go
+%%DATABASE%%lib/libgnc-backend-sql.so
 lib/libgnc-backend-xml-utils.so
-lib/libgnc-backend-xml-utils.so.0
-lib/libgnc-backend-xml-utils.so.0.0.0
-lib/libgnc-business-ledger.so
-lib/libgnc-business-ledger.so.0
-lib/libgnc-business-ledger.so.0.0.0
-%%PYTHON%%lib/libgnc-core-utils-python.so
-%%PYTHON%%lib/libgnc-core-utils-python.so.0
-%%PYTHON%%lib/libgnc-core-utils-python.so.0.0.0
 lib/libgnc-core-utils.so
-lib/libgnc-core-utils.so.0
-lib/libgnc-core-utils.so.0.0.0
 lib/libgnc-gnome.so
-lib/libgnc-gnome.so.0
-lib/libgnc-gnome.so.0.0.0
 lib/libgnc-module.so
-lib/libgnc-module.so.0
-lib/libgnc-module.so.0.0.0
-lib/libgnc-qof.so
-lib/libgnc-qof.so.1
-lib/libgnc-qof.so.1.0.4
+%%AQBANKING%%lib/libgwengui-gtk3.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__init__.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/__init__.cpython-36.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/__init__.cpython-36.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/function_class.cpython-36.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/function_class.cpython-36.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/gnucash_business.cpython-36.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/gnucash_business.cpython-36.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/gnucash_core.cpython-36.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/gnucash_core.cpython-36.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/gnucash_core_c.cpython-36.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/gnucash_core_c.cpython-36.%%PYTHON_PYOEXTENSION%%
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/_gnucash_core_c.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/_sw_app_utils.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/_sw_core_utils.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/function_class.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/function_class.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/function_class.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_business.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_business.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_business.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core_c.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core_c.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core_c.pyo
-libexec/gnucash/overrides/gnucash-env
-libexec/gnucash/overrides/gnucash-make-guids
-libexec/gnucash/src/libqof/qof/test/kvp_frame.h
-libexec/gnucash/src/libqof/qof/test/qofbook.h
-libexec/gnucash/src/libqof/qof/test/qofinstance.h
-libexec/gnucash/src/libqof/qof/test/qofobject.h
-libexec/gnucash/src/libqof/qof/test/qofsession.h
-libexec/gnucash/src/libqof/qof/test/unittest-support.h
 man/man1/gnc-fq-dump.1.gz
 man/man1/gnc-fq-helper.1.gz
 man/man1/gnucash.1.gz
 share/appdata/gnucash.appdata.xml
 share/applications/gnucash.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.1999
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2000
@@ -457,9 +454,9 @@ share/applications/gnucash.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2014
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2015
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2016
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2017
 %%PORTDOCS%%%%DOCSDIR%%/DOCUMENTERS
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/Money95bank_fr.qif
 %%PORTDOCS%%%%DOCSDIR%%/Money95invst_fr.qif
@@ -486,6 +483,7 @@ share/applications/gnucash.desktop
 %%PORTDOCS%%%%DOCSDIR%%/cbb-export.qif
 %%PORTDOCS%%%%DOCSDIR%%/currency_tree_xml.gnucash
 %%PORTDOCS%%%%DOCSDIR%%/every.qif
+%%PORTDOCS%%%%DOCSDIR%%/gtk-3.0.css
 %%PORTDOCS%%%%DOCSDIR%%/guile-hackers.txt
 %%PORTDOCS%%%%DOCSDIR%%/invoice.csv
 %%PORTDOCS%%%%DOCSDIR%%/ms-money.qif
@@ -880,11 +878,11 @@ share/applications/gnucash.desktop
 %%DATADIR%%/checks/quicken_check_21.chk
 %%DATADIR%%/checks/quicken_wallet.chk
 %%DATADIR%%/checks/voucher.chk
-%%DATADIR%%/gnome
 %%AQBANKING%%%%DATADIR%%/gtkbuilder/assistant-ab-initial.glade
 %%DATADIR%%/gtkbuilder/assistant-acct-period.glade
 %%DATADIR%%/gtkbuilder/assistant-csv-account-import.glade
 %%DATADIR%%/gtkbuilder/assistant-csv-export.glade
+%%DATADIR%%/gtkbuilder/assistant-csv-price-import.glade
 %%DATADIR%%/gtkbuilder/assistant-csv-trans-import.glade
 %%DATADIR%%/gtkbuilder/assistant-hierarchy.glade
 %%DATADIR%%/gtkbuilder/assistant-loan.glade
@@ -893,7 +891,11 @@ share/applications/gnucash.desktop
 %%DATADIR%%/gtkbuilder/assistant-xml-encoding.glade
 %%DATADIR%%/gtkbuilder/business-options-gnome.glade
 %%DATADIR%%/gtkbuilder/business-prefs.glade
+%%AQBANKING%%%%DATADIR%%/gtkbuilder/dialog-ab-pref.glade
 %%AQBANKING%%%%DATADIR%%/gtkbuilder/dialog-ab.glade
+%%DATADIR%%/gtkbuilder/dialog-find-account.glade
+%%DATADIR%%/gtkbuilder/dialog-imap-editor.glade
+%%DATADIR%%/gtkbuilder/dialog-trans-assoc.glade
 %%DATADIR%%/gtkbuilder/dialog-account-picker.glade
 %%DATADIR%%/gtkbuilder/dialog-account.glade
 %%DATADIR%%/gtkbuilder/dialog-bi-import-gui.glade
@@ -942,6 +944,42 @@ share/applications/gnucash.desktop
 %%DATADIR%%/gtkbuilder/gnc-tree-view-owner.glade
 %%DATADIR%%/gtkbuilder/window-autoclear.glade
 %%DATADIR%%/gtkbuilder/window-reconcile.glade
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-account-delete.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-account-edit.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-account-new.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-account-open.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-account-report.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-account.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-gnome-pdf.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-invoice-duplicate.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-invoice-edit.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-invoice-new.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-invoice-pay.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-invoice-post.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-invoice-unpost.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-invoice.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-jumpto.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-split-trans.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-sx-new.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gnc-transfer.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-account-delete.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-account-edit.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-account-new.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-account-open.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-account-report.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-account.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-gnome-pdf.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-invoice-duplicate.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-invoice-edit.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-invoice-new.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-invoice-pay.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-invoice-post.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-invoice-unpost.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-invoice.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-jumpto.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-split-trans.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-sx-new.png
+%%DATADIR%%/icons/hicolor/24x24/actions/gnc-transfer.png
 %%DATADIR%%/jqplot/jqplot.BezierCurveRenderer.js
 %%DATADIR%%/jqplot/jqplot.barRenderer.js
 %%DATADIR%%/jqplot/jqplot.blockRenderer.js
@@ -972,54 +1010,9 @@ share/applications/gnucash.desktop
 %%DATADIR%%/jqplot/jquery.min.js
 %%DATADIR%%/make-prefs-migration-script.xsl
 %%DATADIR%%/migratable-prefs.xml
-%%DATADIR%%/pixmaps/gnc-account-16.png
-%%DATADIR%%/pixmaps/gnc-account-delete-16.png
-%%DATADIR%%/pixmaps/gnc-account-delete.png
-%%DATADIR%%/pixmaps/gnc-account-edit-16.png
-%%DATADIR%%/pixmaps/gnc-account-edit.png
-%%DATADIR%%/pixmaps/gnc-account-new-16.png
-%%DATADIR%%/pixmaps/gnc-account-new.png
-%%DATADIR%%/pixmaps/gnc-account-open-16.png
-%%DATADIR%%/pixmaps/gnc-account-open.png
-%%DATADIR%%/pixmaps/gnc-account-report-16.png
-%%DATADIR%%/pixmaps/gnc-account-report.png
-%%DATADIR%%/pixmaps/gnc-account.png
-%%DATADIR%%/pixmaps/gnc-gnome-pdf-16.png
-%%DATADIR%%/pixmaps/gnc-gnome-pdf-24.png
-%%DATADIR%%/pixmaps/gnc-invoice-16.png
-%%DATADIR%%/pixmaps/gnc-invoice-duplicate-16.png
-%%DATADIR%%/pixmaps/gnc-invoice-duplicate.png
-%%DATADIR%%/pixmaps/gnc-invoice-edit-16.png
-%%DATADIR%%/pixmaps/gnc-invoice-edit.png
-%%DATADIR%%/pixmaps/gnc-invoice-new-16.png
-%%DATADIR%%/pixmaps/gnc-invoice-new.png
-%%DATADIR%%/pixmaps/gnc-invoice-pay-16.png
-%%DATADIR%%/pixmaps/gnc-invoice-pay.png
-%%DATADIR%%/pixmaps/gnc-invoice-post-16.png
-%%DATADIR%%/pixmaps/gnc-invoice-post.png
-%%DATADIR%%/pixmaps/gnc-invoice-unpost-16.png
-%%DATADIR%%/pixmaps/gnc-invoice-unpost.png
-%%DATADIR%%/pixmaps/gnc-invoice.png
-%%DATADIR%%/pixmaps/gnc-jumpto-16.png
-%%DATADIR%%/pixmaps/gnc-jumpto.png
-%%DATADIR%%/pixmaps/gnc-split-trans-16.png
-%%DATADIR%%/pixmaps/gnc-split-trans.png
-%%DATADIR%%/pixmaps/gnc-sx-new-16.png
-%%DATADIR%%/pixmaps/gnc-sx-new.png
-%%DATADIR%%/pixmaps/gnc-transfer-16.png
-%%DATADIR%%/pixmaps/gnc-transfer.png
-%%DATADIR%%/pixmaps/gnucash-icon-128x128.png
-%%DATADIR%%/pixmaps/gnucash-icon-16x16.png
-%%DATADIR%%/pixmaps/gnucash-icon-256x256.png
-%%DATADIR%%/pixmaps/gnucash-icon-32x32.png
 %%DATADIR%%/pixmaps/gnucash-icon-48x48.bmp
-%%DATADIR%%/pixmaps/gnucash-icon-48x48.png
-%%DATADIR%%/pixmaps/gnucash-icon-64x64.png
-%%DATADIR%%/pixmaps/gnucash-icon-96x96.png
 %%DATADIR%%/pixmaps/gnucash-icon.ico
 %%DATADIR%%/pixmaps/gnucash_splash.png
-%%DATADIR%%/pixmaps/stock_split_title.png
-%%DATADIR%%/pixmaps/stock_split_watermark.png
 %%PYTHON%%%%DATADIR%%/python/init.py
 %%PYTHON%%%%DATADIR%%/python/pycons/__init__.py
 %%PYTHON%%%%DATADIR%%/python/pycons/console.py
@@ -1028,7 +1021,6 @@ share/applications/gnucash.desktop
 %%PYTHON%%%%DATADIR%%/python/pycons/setup.py
 %%PYTHON%%%%DATADIR%%/python/pycons/shell.py
 %%PYTHON%%%%DATADIR%%/python/pycons/simple_plot.py
-%%DATADIR%%/scm/build-config.scm
 %%DATADIR%%/scm/business-options.scm
 %%DATADIR%%/scm/business-prefs.scm
 %%DATADIR%%/scm/c-interface.scm
@@ -1042,17 +1034,25 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnc-menu-extensions.scm
 %%DATADIR%%/scm/gnc-numeric.scm
 %%DATADIR%%/scm/gnucash/app-utils.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/baz.scm
 %%DATADIR%%/scm/gnucash/business-core.scm
-%%DATADIR%%/scm/gnucash/business-gnome.scm
 %%DATADIR%%/scm/gnucash/core-utils.scm
 %%DATADIR%%/scm/gnucash/engine.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/engine/test/test-extras.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/foo.scm
 %%DATADIR%%/scm/gnucash/gettext.scm
 %%DATADIR%%/scm/gnucash/gnc-module.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/gnc-modules/test/test-gnc-module-load-deps.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/gnc-modules/test/test-gnc-module-load-scm.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/gnc-modules/test/test-gnc-module-scm-init.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/gnc-modules/test/test-gnc-module-scm-module.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/gnc-modules/test/test-gnc-module-scm-multi.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/gnc-modules/test/test-gnc-module-swigged-c.scm
 %%DATADIR%%/scm/gnucash/gnome-utils.scm
 %%DATADIR%%/scm/gnucash/import-export/qif-import.scm
-%%DATADIR%%/scm/gnucash/main.scm
+%%DATADIR%%/scm/gnucash/import-export/string.scm
 %%DATADIR%%/scm/gnucash/price-quotes.scm
-%%DATADIR%%/scm/gnucash/printf.scm
 %%DATADIR%%/scm/gnucash/report/aging.scm
 %%DATADIR%%/scm/gnucash/report/balsheet-eg.css
 %%DATADIR%%/scm/gnucash/report/balsheet-eg.eguile.scm
@@ -1071,12 +1071,20 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/report/locale-specific/us.scm
 %%DATADIR%%/scm/gnucash/report/owner-report.scm
 %%DATADIR%%/scm/gnucash/report/payables.scm
+%%DATADIR%%/scm/gnucash/report/receipt.css
+%%DATADIR%%/scm/gnucash/report/receipt.eguile.scm
+%%DATADIR%%/scm/gnucash/report/receipt.scm
 %%DATADIR%%/scm/gnucash/report/receivables.scm
 %%DATADIR%%/scm/gnucash/report/report-gnome.scm
 %%DATADIR%%/scm/gnucash/report/report-system.scm
 %%DATADIR%%/scm/gnucash/report/report-system/collectors.scm
 %%DATADIR%%/scm/gnucash/report/report-system/list-extras.scm
 %%DATADIR%%/scm/gnucash/report/report-system/report-collectors.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-collectors.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-extras.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-list-extras.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-load-report-system-module.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-report-utilities.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/account-piecharts.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/account-summary.scm
@@ -1089,11 +1097,13 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/report/standard-reports/budget-income-statement.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/budget.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/cash-flow.scm
+%%DATADIR%%/scm/gnucash/report/standard-reports/cashflow-barchart.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/category-barchart.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/daily-reports.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/equity-statement.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/general-journal.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/general-ledger.scm
+%%DATADIR%%/scm/gnucash/report/standard-reports/income-gst-statement.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/income-statement.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/net-barchart.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/net-linechart.scm
@@ -1101,11 +1111,20 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/report/standard-reports/price-scatter.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/register.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/sx-summary.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-cash-flow.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-generic-category-report.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-generic-net-barchart.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-generic-net-linechart.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-category-report.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-net-barchart.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-net-linechart.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/transaction.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/trial-balance.scm
 %%DATADIR%%/scm/gnucash/report/stylesheet-easy.scm
 %%DATADIR%%/scm/gnucash/report/stylesheet-fancy.scm
 %%DATADIR%%/scm/gnucash/report/stylesheet-footer.scm
+%%DATADIR%%/scm/gnucash/report/stylesheet-head-or-tail.scm
 %%DATADIR%%/scm/gnucash/report/stylesheet-plain.scm
 %%DATADIR%%/scm/gnucash/report/stylesheets.scm
 %%DATADIR%%/scm/gnucash/report/taxinvoice.css
@@ -1113,20 +1132,22 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/report/taxinvoice.scm
 %%DATADIR%%/scm/gnucash/report/taxtxf-de_DE.scm
 %%DATADIR%%/scm/gnucash/report/taxtxf.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/test-load-report-stylesheets-module.scm
 %%DATADIR%%/scm/gnucash/report/utility-reports.scm
 %%DATADIR%%/scm/gnucash/report/view-column.scm
 %%DATADIR%%/scm/gnucash/report/welcome-to-gnucash.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/reports/test-load-app-utils-module.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/reports/test-load-gnome-utils-module.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/reports/test-load-report-gnome-module.scm
 %%DATADIR%%/scm/gnucash/tax/de_DE.scm
 %%DATADIR%%/scm/gnucash/tax/us.scm
-%%DATADIR%%/scm/gnucash/unittest-support.scm
-%%DATADIR%%/scm/gnumeric/gnumeric-utilities.scm
-%%DATADIR%%/scm/gnumeric/table-utils.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/unittest-support.scm
+%%DATADIR%%/scm/gnucash/utilities.scm
 %%DATADIR%%/scm/hooks.scm
 %%DATADIR%%/scm/html-acct-table.scm
 %%DATADIR%%/scm/html-barchart.scm
 %%DATADIR%%/scm/html-document.scm
 %%DATADIR%%/scm/html-fonts.scm
-%%DATADIR%%/scm/html-jqplot.scm
 %%DATADIR%%/scm/html-linechart.scm
 %%DATADIR%%/scm/html-piechart.scm
 %%DATADIR%%/scm/html-scatter.scm
@@ -1151,26 +1172,27 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/report-utilities.scm
 %%DATADIR%%/scm/report.scm
 %%DATADIR%%/scm/simple-obj.scm
-%%DATADIR%%/scm/string.scm
-%%DATADIR%%/scm/substring-search.scm
+%%TEST%%%%DATADIR%%/scm/test-account.scm
+%%TEST%%%%DATADIR%%/scm/test-c-interface.scm
+%%TEST%%%%DATADIR%%/scm/test-create-account.scm
+%%TEST%%%%DATADIR%%/scm/test-split.scm
+%%TEST%%%%DATADIR%%/scm/test-test-extras.scm
 %%DATADIR%%/scm/txf-de_DE.scm
 %%DATADIR%%/scm/txf-help-de_DE.scm
 %%DATADIR%%/scm/txf-help.scm
 %%DATADIR%%/scm/txf.scm
-%%DATADIR%%/scm/xml-generator.scm
 %%DATADIR%%/tip_of_the_day.list
 %%DATADIR%%/ui/gnc-main-window-ui.xml
 %%DATADIR%%/ui/gnc-plugin-bi-import-ui.xml
 %%DATADIR%%/ui/gnc-plugin-csv-export-ui.xml
 %%DATADIR%%/ui/gnc-plugin-csv-import-ui.xml
-%%DATADIR%%/ui/gnc-plugin-customer_import-ui.xml
 %%DATADIR%%/ui/gnc-plugin-account-tree-ui.xml
 %%AQBANKING%%%%DATADIR%%/ui/gnc-plugin-aqbanking-ui.xml
 %%DATADIR%%/ui/gnc-plugin-basic-commands-ui.xml
 %%DATADIR%%/ui/gnc-plugin-budget-ui.xml
 %%DATADIR%%/ui/gnc-plugin-business-ui.xml
+%%DATADIR%%/ui/gnc-plugin-customer-import-ui.xml
 %%DATADIR%%/ui/gnc-plugin-file-history-ui.xml
-%%GTKMM%%%%DATADIR%%/ui/gnc-plugin-gtkmm-ui.xml
 %%DATADIR%%/ui/gnc-plugin-log-replay-ui.xml
 %%OFX%%%%DATADIR%%/ui/gnc-plugin-ofx-ui.xml
 %%DATADIR%%/ui/gnc-plugin-page-account-tree2-ui.xml