Update to 2.6.0

Changelog:
2.6.0 - 29 Dec 2013

       The GnuCash development team proudly announces GnuCash 2.6.0,
       the latest stable release of the GnuCash Free Accounting
       Software. GnuCash Users can experience the following new features:

       * Preferences have been migrated from GConf to GSettings. This
	 is a simpler and more robust backend which writes to the OS's
	 native prefs -- defaults on OS X and the Registry on
	 MSWindows -- and allows us to remove several troublesome
	 dependencies including GConf, ORBit, and DBus. The change
	 includes a migration script that will run at Gnucash startup.

       * New date handling which allows GnuCash to use dates after March 2038.

       * Guile-2 compatibility: GnuCash now requires either Guile-1.8
         or Guile-2.0

       * Documents outside of GnuCash, images of receipts for example,
         can now be linked to transactions, with the facility of
         opening them in the default application for the document
         type.

       * Cutsom Reports can now be saved without renaming the report,
         and modifications can overwrite an existing report.

       * The import assistant now finishes much more quickly after
         assigning contra-accounts.

       * GnuCash now requires Gtk+-2.24.0 and GLib-2.26.0. Most of the
         dependencies on obsolete libraries have been removed; only
         libgnomecanvas remains. Unfortunately the effort to rewrite
         the register code to use GtkTreeModel wasn't completed in
         time, so GnuCash is not on the cusp of converting to Gtk3.

       * The Business Module has been substantially revamped,
         including support for Credit Notes and import of customers
         and vendors from a CSV file.

       * The Num field in the register display is now optionally
         per-split, so for example a check number can be entered for
         the checking account split and an invoice number for the
         expense account split.

       * GnuCash can now open locked books read-only so that more than
         one user can view a file. GnuCash still does not support
         multiple simultaneous writers.

       * By agreement of all authors, GnuCash is now licensed under
         the GNU General Public License Version 2 or later rather than
         simply Version 2. This allows derivative works to be licensed
         under the GPL Version 3 if the author of such a work so
         desires.

       * Fixed more than 500 bugs.

       For those keeping score, the following changes have occurred
       since 2.5.10:

       Bug Fixes:

       Bug 157247 - Asset account's "total" value should use most
                    recent transaction prices
       Bug 710823 - libofx can supply broken UTF-8 for account id
       Bug 710824 - GnuCash should sanitise UTF-8 before serialising files
                    to avoid writing broken unparseable XML.
       Bug 720555 - General Ledger - Can't Enter Transaction Amounts
       Bug 720556 - The Tip of the Day preference isn't getting saved
       Bug 720646 - New Book Tabs on Windows

       Other Changes:

       * Don't create a second account hierarchy page when cancelling
         the Hierarchy Assistant or when using Actions->New Account
         Hierarchy on an already open book.

       * Reset Warnings dialog: show translated warnings

       * The locale-names for Help and the Tutorial and Concepts Guide
         have been renamed to language-only so that, for example,
         someone using the Swiss-German locale will be shown help in
         German instead of English.

      Translations Updated: British, Dutch, French, Italian, Lithuanian.

2.5.10 - 15 December 2013
         This is the eleventh and final release in the UNSTABLE 2.5 series.
	 It is the second beta release. Barring any surprises, we will release
	 a STABLE 2.6.0 on 29 December.

	 Changes since the last release have been entirely bug fixes
	 and translation updates, though not all bug fixes had
	 associated bug reports. Note that WebKit 1.2 is now tested
	 for in configure; it had been 1.0, but GnuCash wouldn't
	 actually compile with versions earlier than 1.1.5.

	 Bug Fixes:

	 Bug 336843 - Attach images/files/urls to transactions:
	    Disable the "show attachment" menu item if the transaction
	    has no attached file.

	 Bug 619478 - Build warning in html/gnc-html-webkit.c
	 Bug 627575 - Stylesheet names with non-alphanumeric characters
	     and saved-reports
	 Bug 630578 - current date instead of posting date in exchange rate,
	    when posting a bill
	 Bug 632588 - Scrub doesn't fix missing currency
	 Bug 639371 - Welcome Sample Report reports wrong version and
	    has a broken report
	 Bug 653594 - wrong amount printed on checks
	 Bug 705714 - QIF Import - File selection pop-up is not on top
	     during qif import
	 Bug 708526 - GnuCash Crashes when opening About page:
	     Downgrade the error to a critical warning.
	 Bug 711317 - Indian Rupee Symbol appears as "?" marks
	 Bug 715123 - Post invoice problem, cannot unpost
	 Bug 719481 - GnuCash report crashes with Guile2
	 Bug 719521 - Missing radio button in "Edit security" dialog
	 Bug 719726 - Click on File -> Open seg-faults
	 Bug 720235 - Python bindings should load environment file just
	     like gnucash does
	 Fix Python tests to no longer require gsettings schemas installed.
	 Fix the CuteCash (Qt GUI based) build
	 Multi-currency "Post invoice" improvements
	 Protect gnc_mktime against bad dates.
	 Protect against null account pointers in a couple of place to
	     avoid asserts.
	 Qif Import Assistant: Don't disable the whole dialog, just the
	     Forward button
	 QifImport: Fix crash from attempting to import an empty file.
	 Add the ability to search for transactions that are, or are not,
	     book closing entries.
	 Move customer, bill, and invoice importers form the business menu
	     to the file menu.
	 Rename some directories in src/import-export so that the
	     gschema.xml.in.in files within them don't have pathnames that
	     are too long for tar when the GnuCash version exceeds 5 digits
	     (e.g., 2.5.10).

	 Translation Updates: Italian, German, French
	 New Translations: Arabic!

2.5.9 - 1 December 2013
         This is the tenth release in the UNSTABLE 2.5 series.
	 It is the first beta release.

	 Barring any surprises, there will be one more beta release in
	 two weeks, followed by the release of 2.6.0 on 29 December.

	 Changes since the last release have principally been code
	 cleanup, including KVP storage in the SQL Backend, Python
	 testing in out-of-source builds, test failures when using
	 Guile-2, ensure that saved state (especially KVP) is deleted
	 along with the primary object, use the progress bar when
	 loading the PriceDB.

	 Translator note: We found it advisable to correct some typos
	 and to add two translatable strings "Bill Information" and
	 "Voucher Information".

	 Bug Fixes:
	 644044 - Lots: SQL backend loses link to Gain/Loss Txn
 	 704506 - Connection loss to mysql after resume from hibernation
	 707311 - Tax Invoice fails to open when using guile 2
 	 710871 - Python site-packages not found when not installed to
	 	 default location using --prefix
 	 710905 - Column withs, visibility, order and sort order not saved
	 	 and restored
 	 711289 - time zone handling is inconsistent between 2.4 and 2.5
	 712299 - Tax Invoice with guile 2 doesn't display currency symbols
	 715041 - Crash opening a file when a file is already open.
 	 715184 - Bill or Invoice; a new Bill gives a new Invoice
	 719471 - Unused commodities saved to XML file

	 Translations updated: German, Italian

 2.5.8 - 17 November 2013

         This is the ninth release in the UNSTABLE 2.5 series. This
         release is the last alpha release.

	 String and feature freeze are now in effect: Only bug fixes
	 which have no effect on UI, API, or translatable strings
	 should be committed to trunk until after the release of
	 GnuCash 2.6, currently scheduled for 29 December 2013.

	 Translators: Please use the tarballs from this release to
	 prepare your translations.

	 New contributor Patrick has provided a beginning
	 implementation of linking attachments to transactions. This
	 is accessed through the Transaction menu and the transaction
	 context menu. In this initial version, linked files are
	 displayed in the default viewer for the file type. E.g., html
	 files will open in a browser and jpegs will open in the
	 default picture viewer.

	 Bug Fixes:
	 707311 - Tax Invoice fails to open when using guile 2
	 709589 - make check fails with guile 2
	 711289 - Time Zone Handling is Inconsistent between 2.4 and 2.5
	 	 Partial fix that may also correct 699997
	 711294 - Gnucash repeatedly ask associated income account
	  	 when import qfx file. Patch by Kuang-che Wu <kcwu@csie.org>

	 711493 - Fix unselected account that is NULL

	 Translations Updated: German

 2.5.7 - 3 November 2013
       	 This is the eighth release in the UNSTABLE 2.5 series.

	 Register2 is now a configure option. Default builds,
	 including the Windows and Mac All-in-one packages, will use
	 only the old register. We've decided that it isn't ready for
	 general use and the principal author doesn't have time to
	 make it ready in time for a 2.6 release.

	 Frédéric Perrin has contributed a change to display currency
	 symbols whenever they are known and unambiguous.

	 Geert Janssens has cleaned up most of the issues from the
	 initial GSettings preference changes. There's a new
	 configure option, --with-xdg-data-dirs to overide the
	 environment and defaults if necessary.

	 Building Gnucash now requires Automake version 1.11 or later.

	 Configure will abort if --enable-ofx is set but no libofx
	 configuration files are found.  Budget periods may no longer
	 set to values greater than the budget's num_periods, and the
	 budget options descriptions will wrap. Contributed by Robert
	 Ratliff.

	 Bug Fixes:

	 668530 - In budget flow report options, change the maximum
	       value for period to 60 (Note the FIXMEs) Author: Robert
	       Ratliff
	 687478 - Bills due reminder doesn't work well with credit notes
	 687479 - Automatic invoice/payment matching on posting an
	       invoice should be an optional feature
	 693244 - View Lots window enhancements
 	 708659 - Totals column moves to right hand side when periods are added
	       Remove unneeded gnc_plugin_page_budget_refresh_cb
	       Author: R Ratliff
 	 710055 - advanced portfolio report counts capital gains split
 	       as dividend. Author: Jason McCarty <jmccarty@sent.com>
	 710311 - Missing ChangeLogs
	 710739 - Fill in field for remote bank account information
	       also for SEPA transfers.
	 710871 - Fix for Python site-packages not found when not
	       installed to default location
	 710979 - Crash in gnc_plugin_page_invoice_summarybar_position_changed

      	 Translations Updated: None

 2.5.6 - 7 October 2013
       	 This is the seventh release in the UNSTABLE 2.5 series.

	 Geert Janssens has rewritten the preferences system to use
	 GSettings from GIO (GLib) instead of GConf. This is a simpler
	 and more robust backend which writes to the OS's native prefs
	 -- defaults on OS X and the Registry on MSWindows -- and
	 allows us to remove several troublesome dependencies
	 including GConf, ORBit, and DBus. The change includes a
	 migration script that will run at Gnucash startup.

	 WARNING: the saved settings in gconf are not (yet) migrated
         to gsettings !  running gnucash as of this commit will start
         you with default values for all preferences !  You can of
         course change your preferences, your changes will be saved
         properly in gsettings and restored when you restart
         gnucash. But what has been set in GConf before will basically
         be ignored.

	 Bug Fixes:

	 Bug 632362 - Unable to create "reversing transaction" again
	 after it is removed

	 Bug 654196 - "make check" fails when built with --enable-dbi

	 Bug 674862 - 2038 bug in libdbi

	 Bug 682280 - bill/invoice importer fails to save imported bills/invoice

	 Bug 684670 - Interest amount calculation is wrong in Sqlite3 format

	 Bug 699450- New budgets cause Account Name column to expand
	 until display bigger than screen. -- Robert Ratliff
	 <ratliff.bobby@gmail.com>

	 Bug 708700 - "make check" fails (missing glib bits)--
	 Frédéric Perrin <fred+gnome@resel.fr>

	 Bug 704039 - time zone is not respected in Windows -- Thanks
	 to Kuang-che Wu <kcwu@csie.org>


      	 Translations Updated: Dutch

 2.5.5 - 10 September 2013
       	 This is the sixth release in the UNSTABLE 2.5 series.

	 No new features are added in this release.

	 Bug Fixes:

	 334939 - Account Report and Account Transaction Report are
	 apparently the same, but different. Change menu entry for the single
	 transaction Account Report from "Accout Transaction Report" to
	 "Account Report - Single Transaction" Author: Carsten Rinke

	 603183 - Equity statement shows incorrect changes
	 Add function gnc:account-get-total-flow to report-utilities.scm
	 This function filters the splits from the source to the target accounts
	 and returns a commodity collector.
	 It does NOT do currency exchanges. Export the new function
	 gnc:account-get-total-flow from report-utilities.scm. Apply the new
	 function gnc:account-get-total-flow for the "Withdrawal" calculation.
	 Author: Carsten Rinke

	 629136 - Move the code that updates the sensitivity
	 of immutable page actions from gnc_main_window_switch_page to
	 gnc_main_window_generate_title. Patch by Guilherme Salgado.

	 696492 - Change report name in menu or in report output to be
	 consistent Change the register name to "Accout Transaction Report"
	 when the register type is GENERAL_LEDGER, INCOME_LEDGER, or default
	 in function gnc_reg_get_name().  Patch by Carsten Rinke.

	 704039 - time zone is not respected on windows Author: Kuang-che Wu

	 704056 - Online Banking (Online Actions) does not appear in Action menu
	 Ensure that all functions are exported to the dll.

	 704525 - When you have a mix of chart types (bar charts and pie
	 charts). Add new procedure gnc:substring-replace-from-to
	 Similar to gnc:substring-replace, but offers the possibility to
	 replace substrings in a range of occurances. Add calls to
	 gnc:substring-replace-from-to to procedure gnc:report-run.
	 Filter out all occurances of jquery.min.js and jquery.jqplot.js
	 except for the first occurances.  Author: Carsten Rinke

	 Translations updated: Lithuatnian

 2.5.4 - 4 August 2013
         This is the fifth release in the UNSTABLE 2.5 series.

	 New Features:

	 Register2 work: Restore the delete-transaction-up/down
	 feature, replace the filter-and-sort model with a qof query
	 which loads only a subset of transactions to improve speed,
	 and some date and cursor changes.

	 Aurimas Fišeras contribued patches to make CSV Account import
	 table header translatable, to fix translation of table
	 headers, fix dash marker usage, and some other translation
	 issues.

	 Revert the Bitcoin support until the patch is rewritten with
	 a better UI.

	 Bug Fixes:
	 703897: Functions which can return null always return a Python
	  object, Tom Lofts.
	 704183: ofx file import tries to match online_id against
	  ACCTID[space]ACCTKEY even when ACCTKEY is empty, G. Paul Ziemba
	 704185: GnuCash 2.5 doesn't build on FreeBSD

	 Translations Updated: Catalan, Danish, Italian, and  Lithuanian

 2.5.3 - 7 July 2013
         This is the fourth release in the UNSTABLE 2.5 series.

	 New Features:
	 Save and Save As for custom report templates (Geert Jansens)
	 Customized report settings can now be saved without renaming
	 the report, and updates saved directly replacing the previously
	 saved report or "saved as" to a new name.

	 It's now possible to post multiple invoices from the find
	 dialog. GnuCash was crashing if you searched for all unposted
	 invoices, selected two or more of them, and posted them.
	 This was because the list of invoices to be posted changed
	 while it was being processed.  As part of fixing this the
	 prompt for post date, due date, etc. will only be given once,
	 not once per invoice.

	 Register2 work: Better commodity/currency handling, sanity checks
	 when converting TreePaths, Posted Dates now work like the old Register,

	 PostedDate is now recorded only as a date, with no time.

	 Peter Broadberry contributed faster versions of several reports.

	 Bug Fixes:
	 703272: list of windows in OSX Windows menu
	 699686: Startup dialog windows should be top level (Simon Arlot)
	 701670: (OSX)Command-V in reconcile window pastes data in register
	 702899: Fix crash in scrubbing code
	 703305: Fix crash on entering a non-valid date
	 The crash that occurs when duplicating multiple invoices from Find
	  results.
	 691587: Catch scheme exceptions when converting error messages
	 669964: Fix txn creation that forgot to set a txn currency.
	 672595: After creation of a new book, make sure to set it to dirty
	 700582: Enable online actions in Register2
	 Now works with automake 1.13

	 Translations Updated: Catalan, Italian, Lithuanian

 2.5.2 - 27 May 2013
         This is the third release in the UNSTABLE 2.5 series.

	 Robert Fewell continues his work on the GtkTreeModel register,
	 including better transaction editing without using the mouse and
	 some display issues.

	 Sam Morris contributed a patch supporting retrieving Bitcoin and
	 Litecoin exchange rates from Mt. Gox with Finance::Quote

	 Fix Bug 700197, backend errors when creating Customers with the
	 Python bindings. Patch by Tom Lofts

	 Carsten Rinke provided several patches:
	 Bug #682800 Generated balances on Report different than calculated
	 balances on Ledger when using "open subaccounts"
	 Bug #622778 Miscalculation in cashflow reports
	 Bug #584869 net change line in general journal report

	 Bug #589865 - Budget flow period doesn't work. Patches by Carsten
	 Rinke and Mikhail Tsaplin

	 The translation files have been copied from the 2.4 branch.
	 Translators may start working on the new strings, though string
	 freeze is scheduled for 2.5.5 in early September.

	 Translations Updated: Danish, German, Italian

 2.5.1 -  5 May 2013
         This is the second release in the UNSTABLE 2.5 series.

	 Robert Fewell has continued his work on the GtkTreeModel register.
	 It is now the default for account registers.

	 Geert Janssens has begun work on replacing the GConf configuration
	 management tool with the newer GSettings API from recent versions
	 of GLib.

	 Tom Lofts contributed the beginning of a RESTful Python API
	 to enable access to minimal account, invoice, and customer
	 information in a JSON format.

	 Christian Stimming fixed the very long wait time for the UI to
	 become responsive when running the import matcher.

	 Also some bug fixes, package upgrades, and minor improvements.

 2.5.0 - 30 Mar 2013

         The Gnucash Development Team is pleased to release Gnucash 2.5.0,
	 the first release of an unstable series leading to Gnucash 2.6.0.

	 This release is UNSTABLE and SHOULD NOT BE USED in production.

	 Robert Fewell has contributed a rewrite of the ledger
	 (Gnucash's primary interface window) to use the GtkTreeModel
	 (select "register 2" from the menu) as well as a new CSV
	 import/export facility for account trees.

	 Gnucash now requires Gtk+-2.24 and GLib-2.26. We've removed
	 most of the dependencies on libraries obsoleted by project
	 Ridley and will be in position to move to Gtk+-3.x once the
	 GtkTreeModel register window work is complete. This means
	 that Gnucash 2.5 requires Debian 6, RHEL 6, or one of the
	 more aggressive distributions like Ubuntu.

	 Gnucash now works with Guile-2.0.

	 The business module has been revamped and we introduce a new
	 feature, Credit Notes. It is now possible to import customers
	 and vendors from a CSV file as well.

	 The "Num" field is now optionally per-split rather than
	 per-transaction.

	 When opening a locked "book" one now has the option of
	 opening it read-only. Note that Gnucash is still a
	 single-user program and that the database backends are still
	 used only as a data store.

	 Gnucash is no longer subject to the "2038" bug, so that
	 30-year mortgages can now be entered correctly.

	 By agreement of all authors we have relicensed Gnucash to the
	 Gnu Public License Version 2 or later from just Version 2.

4 files changed, 238 insertions, 221 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index f4209655a36..66acb424ec0 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.191 2014/01/01 11:52:15 wiz Exp $
+# $NetBSD: Makefile,v 1.192 2014/01/02 01:25:49 ryoon Exp $
 
-DISTNAME=		gnucash-2.4.13
-PKGREVISION=		6
+DISTNAME=		gnucash-2.6.0
 CATEGORIES=		finance
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,7 +23,8 @@ INFO_FILES=		YES
 
 CONFIGURE_ARGS+=	--with-html-engine=webkit
 CONFIGURE_ARGS+=	--disable-dbi
-CONFIGURE_ARGS+=	--enable-python-bindings
+CONFIGURE_ARGS+=	--enable-python
+CONFIGURE_ARGS+=	--with-xdg-data-dirs=${PREFIX}/share
 
 REPLACE_PERL+=		src/quotes/gnc-fq-dump
 REPLACE_PERL+=		packaging/win32/exetype.pl
@@ -33,30 +33,12 @@ REPLACE_PERL+=		src/quotes/Quote_example.pl
 
 PY_PATCHPLIST=		yes
 
-CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-
 PKG_SYSCONFSUBDIR=	gnucash
 CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/config ${PKG_SYSCONFDIR}/config
 CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/environment ${PKG_SYSCONFDIR}/environment
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/gnucash
 
-GCONF_SCHEMAS+=	apps_gnucash_history.schemas
-GCONF_SCHEMAS+=	apps_gnucash_dialog_commodities.schemas
-GCONF_SCHEMAS+=	apps_gnucash_dialog_common.schemas
-GCONF_SCHEMAS+=	apps_gnucash_dialog_print_checks.schemas
-GCONF_SCHEMAS+=	apps_gnucash_dialog_prices.schemas
-GCONF_SCHEMAS+=	apps_gnucash_warnings.schemas
-GCONF_SCHEMAS+=	apps_gnucash_dialog_reconcile.schemas
-GCONF_SCHEMAS+=	apps_gnucash_dialog_totd.schemas
-GCONF_SCHEMAS+=	apps_gnucash_general.schemas
-GCONF_SCHEMAS+=	apps_gnucash_window_pages_account_tree.schemas
-GCONF_SCHEMAS+=	apps_gnucash_window_pages_register.schemas
-GCONF_SCHEMAS+=	apps_gnucash_import_generic_matcher.schemas
-#GCONF_SCHEMAS+=	apps_gnucash_dialog_hbci.schemas
-GCONF_SCHEMAS+=	apps_gnucash_dialog_business_common.schemas
-
-.include "../../devel/GConf/schemas.mk"
+.include "../../devel/glib2/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../finance/libofx/buildlink3.mk"
diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST
index 4c8163457a2..69da7d601b2 100644
--- a/finance/gnucash/PLIST
+++ b/finance/gnucash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2013/07/08 09:18:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.49 2014/01/02 01:25:49 ryoon Exp $
 bin/gnc-fq-check
 bin/gnc-fq-dump
 bin/gnc-fq-helper
@@ -7,11 +7,9 @@ bin/gnucash
 bin/gnucash-env
 bin/gnucash-make-guids
 bin/gnucash-valgrind
-bin/update-gnucash-gconf
 include/gnucash/Account.h
 include/gnucash/FreqSpec.h
 include/gnucash/GNCId.h
-include/gnucash/Period.h
 include/gnucash/Query.h
 include/gnucash/QuickFill.h
 include/gnucash/Recurrence.h
@@ -25,7 +23,10 @@ include/gnucash/Split.h
 include/gnucash/TransLog.h
 include/gnucash/Transaction.h
 include/gnucash/account-quickfill.h
+include/gnucash/assistant-utils.h
+include/gnucash/assistant-xml-encoding.h
 include/gnucash/basiccell.h
+include/gnucash/business-helpers.h
 include/gnucash/business-options.h
 include/gnucash/cap-gains.h
 include/gnucash/cashobjects.h
@@ -36,23 +37,22 @@ include/gnucash/combocell.h
 include/gnucash/datecell.h
 include/gnucash/dialog-account.h
 include/gnucash/dialog-book-close.h
-include/gnucash/dialog-column-view.h
 include/gnucash/dialog-commodity.h
 include/gnucash/dialog-custom-report.h
+include/gnucash/dialog-dup-trans.h
 include/gnucash/dialog-file-access.h
 include/gnucash/dialog-object-references.h
 include/gnucash/dialog-options.h
 include/gnucash/dialog-preferences.h
-include/gnucash/dialog-query-list.h
+include/gnucash/dialog-query-view.h
+include/gnucash/dialog-report-column-view.h
+include/gnucash/dialog-report-style-sheet.h
 include/gnucash/dialog-reset-warnings.h
 include/gnucash/dialog-search.h
-include/gnucash/dialog-style-sheet.h
 include/gnucash/dialog-totd.h
 include/gnucash/dialog-transfer.h
 include/gnucash/dialog-utils.h
-include/gnucash/druid-gconf-setup.h
-include/gnucash/druid-gnc-xml-import.h
-include/gnucash/druid-utils.h
+include/gnucash/engine-helpers-guile.h
 include/gnucash/engine-helpers.h
 include/gnucash/file-utils.h
 include/gnucash/formulacell.h
@@ -63,9 +63,12 @@ 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-associate-account.h
 include/gnucash/gnc-basic-gobject.h
 include/gnucash/gnc-budget.h
+include/gnucash/gnc-cell-renderer-date.h
+include/gnucash/gnc-cell-renderer-popup-entry.h
+include/gnucash/gnc-cell-renderer-popup.h
+include/gnucash/gnc-combott.h
 include/gnucash/gnc-commodity-edit.h
 include/gnucash/gnc-commodity.h
 include/gnucash/gnc-component-manager.h
@@ -78,49 +81,31 @@ include/gnucash/gnc-date.h
 include/gnucash/gnc-dense-cal-model.h
 include/gnucash/gnc-dense-cal-store.h
 include/gnucash/gnc-dense-cal.h
-include/gnucash/gnc-dialog.h
-include/gnucash/gnc-druid-cb.h
-include/gnucash/gnc-druid-gnome-ui.h
-include/gnucash/gnc-druid-provider-desc-edge.h
-include/gnucash/gnc-druid-provider-desc-file.h
-include/gnucash/gnc-druid-provider-desc-multifile.h
-include/gnucash/gnc-druid-provider-desc.h
-include/gnucash/gnc-druid-provider-file-cb.h
-include/gnucash/gnc-druid-provider.h
-include/gnucash/gnc-druid.h
 include/gnucash/gnc-embedded-window.h
 include/gnucash/gnc-engine.h
 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
 include/gnucash/gnc-general-select.h
 include/gnucash/gnc-gettext-util.h
 include/gnucash/gnc-gnome-utils.h
+include/gnucash/gnc-gsettings.h
 include/gnucash/gnc-gui-query.h
 include/gnucash/gnc-help-utils.h
 include/gnucash/gnc-helpers.h
 include/gnucash/gnc-hooks.h
 include/gnucash/gnc-html-extras.h
 include/gnucash/gnc-html-factory.h
-include/gnucash/gnc-html-graph-gog-extras.h
-include/gnucash/gnc-html-graph-gog-gtkhtml.h
-include/gnucash/gnc-html-graph-gog-webkit.h
-include/gnucash/gnc-html-graph-gog.h
-include/gnucash/gnc-html-gtkhtml-p.h
-include/gnucash/gnc-html-gtkhtml.h
 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.h
 include/gnucash/gnc-icons.h
-include/gnucash/gnc-import-desc-format.h
-include/gnucash/gnc-import-format-cb.h
 include/gnucash/gnc-keyring.h
 include/gnucash/gnc-main-window.h
 include/gnucash/gnc-menu-extensions.h
@@ -134,27 +119,35 @@ include/gnucash/gnc-plugin-menu-additions.h
 include/gnucash/gnc-plugin-page-report.h
 include/gnucash/gnc-plugin-page.h
 include/gnucash/gnc-plugin.h
+include/gnucash/gnc-prefs-utils.h
 include/gnucash/gnc-pricedb.h
-include/gnucash/gnc-query-list.h
+include/gnucash/gnc-query-view.h
 include/gnucash/gnc-recurrence.h
 include/gnucash/gnc-report.h
-include/gnucash/gnc-session-scm.h
 include/gnucash/gnc-session.h
 include/gnucash/gnc-splash.h
+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-tree-control-split-reg.h
 include/gnucash/gnc-tree-model-account-types.h
 include/gnucash/gnc-tree-model-account.h
 include/gnucash/gnc-tree-model-budget.h
 include/gnucash/gnc-tree-model-commodity.h
+include/gnucash/gnc-tree-model-owner.h
 include/gnucash/gnc-tree-model-price.h
+include/gnucash/gnc-tree-model-split-reg.h
 include/gnucash/gnc-tree-model.h
+include/gnucash/gnc-tree-util-split-reg.h
 include/gnucash/gnc-tree-view-account.h
 include/gnucash/gnc-tree-view-commodity.h
+include/gnucash/gnc-tree-view-owner.h
 include/gnucash/gnc-tree-view-price.h
+include/gnucash/gnc-tree-view-split-reg.h
 include/gnucash/gnc-tree-view-sx-list.h
 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-window.h
@@ -204,12 +197,10 @@ include/gnucash/qof.h
 include/gnucash/qofbackend-p.h
 include/gnucash/qofbackend.h
 include/gnucash/qofbook.h
-include/gnucash/qofbookmerge.h
 include/gnucash/qofbookslots.h
 include/gnucash/qofchoice.h
 include/gnucash/qofclass.h
 include/gnucash/qofevent.h
-include/gnucash/qofgobj.h
 include/gnucash/qofid-p.h
 include/gnucash/qofid.h
 include/gnucash/qofinstance-p.h
@@ -220,7 +211,6 @@ include/gnucash/qofquery.h
 include/gnucash/qofquerycore.h
 include/gnucash/qofreference.h
 include/gnucash/qofsession.h
-include/gnucash/qofsql.h
 include/gnucash/qofutil.h
 include/gnucash/quickfillcell.h
 include/gnucash/recncell.h
@@ -229,17 +219,17 @@ include/gnucash/table-allgui.h
 include/gnucash/table-control.h
 include/gnucash/table-layout.h
 include/gnucash/table-model.h
+include/gnucash/tree-view-utils.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
+lib/gnucash/libgncmod-app-utils-python.la
 lib/gnucash/libgncmod-app-utils.la
 lib/gnucash/libgncmod-backend-xml.la
 lib/gnucash/libgncmod-bi_import.la
-lib/gnucash/libgncmod-business-core.la
 lib/gnucash/libgncmod-business-gnome.la
-lib/gnucash/libgncmod-business-utils.la
-lib/gnucash/libgncmod-calculation.la
-lib/gnucash/libgncmod-csv.la
-lib/gnucash/libgncmod-dialog-tax-table.la
+lib/gnucash/libgncmod-csv-export.la
+lib/gnucash/libgncmod-csv-import.la
+lib/gnucash/libgncmod-customer_import.la
 lib/gnucash/libgncmod-engine.la
 lib/gnucash/libgncmod-generic-import.la
 lib/gnucash/libgncmod-gnome-search.la
@@ -249,6 +239,7 @@ lib/gnucash/libgncmod-ledger-core.la
 lib/gnucash/libgncmod-locale-reports-us.la
 lib/gnucash/libgncmod-log-replay.la
 lib/gnucash/libgncmod-ofx.la
+lib/gnucash/libgncmod-python.la
 lib/gnucash/libgncmod-qif-import.la
 lib/gnucash/libgncmod-qif.la
 lib/gnucash/libgncmod-register-core.la
@@ -262,6 +253,7 @@ lib/gnucash/libgncmod-utility-reports.la
 lib/libgnc-backend-sql.la
 lib/libgnc-backend-xml-utils.la
 lib/libgnc-business-ledger.la
+lib/libgnc-core-utils-python.la
 lib/libgnc-core-utils.la
 lib/libgnc-gnome.la
 lib/libgnc-module.la
@@ -275,25 +267,85 @@ ${PYSITELIB}/gnucash/gnucash_core_c.py
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
 libexec/gnucash/overrides/guile
+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
+man/man1/gnc-fq-helper.1
 man/man1/gnucash.1
+share/appdata/gnucash.appdata.xml
 share/applications/gnucash.desktop
+share/doc/gnucash/AUTHORS
+share/doc/gnucash/COPYING
+share/doc/gnucash/ChangeLog
+share/doc/gnucash/ChangeLog.2003
+share/doc/gnucash/ChangeLog.2004
+share/doc/gnucash/ChangeLog.2005
+share/doc/gnucash/ChangeLog.2006
+share/doc/gnucash/ChangeLog.2007
+share/doc/gnucash/ChangeLog.2008
+share/doc/gnucash/ChangeLog.2009
+share/doc/gnucash/ChangeLog.2010
+share/doc/gnucash/ChangeLog.2011
+share/doc/gnucash/ChangeLog.2012
+share/doc/gnucash/DOCUMENTERS
+share/doc/gnucash/HACKING
+share/doc/gnucash/INSTALL
+share/doc/gnucash/LICENSE
+share/doc/gnucash/Money95bank_fr.qif
+share/doc/gnucash/Money95invst_fr.qif
+share/doc/gnucash/Money95mfunds_fr.qif
+share/doc/gnucash/Money95stocks_fr.qif
+share/doc/gnucash/NEWS
+share/doc/gnucash/README
+share/doc/gnucash/README-de.win32-bin.txt
+share/doc/gnucash/README-fr.win32-bin.txt
+share/doc/gnucash/README-it.win32-bin.txt
+share/doc/gnucash/README-lv.win32-bin.txt
+share/doc/gnucash/README-nl.win32-bin.txt
+share/doc/gnucash/README-zh_CN.win32-bin.txt
+share/doc/gnucash/README-zh_TW.win32-bin.txt
+share/doc/gnucash/README.dependencies
+share/doc/gnucash/README.francais
+share/doc/gnucash/README.german
+share/doc/gnucash/README.win32-bin.txt
+share/doc/gnucash/README_invoice
+share/doc/gnucash/abc-all.qif
+share/doc/gnucash/abc.qif
+share/doc/gnucash/bogus.qif
+share/doc/gnucash/cbb-export.qif
+share/doc/gnucash/currency_tree_xml.gnucash
+share/doc/gnucash/every.qif
+share/doc/gnucash/guile-hackers.txt
+share/doc/gnucash/invoice.csv
+share/doc/gnucash/ms-money.qif
+share/doc/gnucash/projects.html
+share/doc/gnucash/quicktest.qif
+share/doc/gnucash/swipe.qif
+share/doc/gnucash/taxreport.gnucash
+share/doc/gnucash/web.qif
 share/examples/gnucash/gnucash/config
 share/examples/gnucash/gnucash/environment
-share/gconf/schemas/apps_gnucash_dialog_business_common.schemas
-share/gconf/schemas/apps_gnucash_dialog_commodities.schemas
-share/gconf/schemas/apps_gnucash_dialog_common.schemas
-share/gconf/schemas/apps_gnucash_dialog_prices.schemas
-share/gconf/schemas/apps_gnucash_dialog_print_checks.schemas
-share/gconf/schemas/apps_gnucash_dialog_reconcile.schemas
-share/gconf/schemas/apps_gnucash_dialog_scheduled_transctions.schemas
-share/gconf/schemas/apps_gnucash_dialog_totd.schemas
-share/gconf/schemas/apps_gnucash_general.schemas
-share/gconf/schemas/apps_gnucash_history.schemas
-share/gconf/schemas/apps_gnucash_import_generic_matcher.schemas
-share/gconf/schemas/apps_gnucash_import_qif.schemas
-share/gconf/schemas/apps_gnucash_warnings.schemas
-share/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas
-share/gconf/schemas/apps_gnucash_window_pages_register.schemas
+share/glib-2.0/schemas/org.gnucash.dialogs.business.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.checkprinting.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.commodities.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.export.csv.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.import.csv.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.import.generic.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.import.ofx.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.import.qif.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.reconcile.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.sxs.gschema.xml
+share/glib-2.0/schemas/org.gnucash.dialogs.totd.gschema.xml
+share/glib-2.0/schemas/org.gnucash.gschema.xml
+share/glib-2.0/schemas/org.gnucash.history.gschema.xml
+share/glib-2.0/schemas/org.gnucash.warnings.gschema.xml
+share/glib-2.0/schemas/org.gnucash.window.pages.account.tree.gschema.xml
+share/glib-2.0/schemas/org.gnucash.window.pages.gschema.xml
 share/gnucash/accounts/C/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/C/acctchrt_business.gnucash-xea
 share/gnucash/accounts/C/acctchrt_carloan.gnucash-xea
@@ -645,114 +697,74 @@ share/gnucash/accounts/zh_CN/acctchrt_spouseretire.gnucash-xea
 share/gnucash/checks/deluxe.chk
 share/gnucash/checks/liberty.chk
 share/gnucash/checks/quicken.chk
+share/gnucash/checks/quicken_3part.chk
 share/gnucash/checks/quicken_check_21.chk
 share/gnucash/checks/quicken_wallet.chk
 share/gnucash/checks/voucher.chk
-share/gnucash/doc/AUTHORS
-share/gnucash/doc/COPYING
-share/gnucash/doc/ChangeLog
-share/gnucash/doc/ChangeLog.2003
-share/gnucash/doc/ChangeLog.2004
-share/gnucash/doc/ChangeLog.2005
-share/gnucash/doc/ChangeLog.2006
-share/gnucash/doc/ChangeLog.2007
-share/gnucash/doc/ChangeLog.2008
-share/gnucash/doc/ChangeLog.2009
-share/gnucash/doc/ChangeLog.2010
-share/gnucash/doc/DOCUMENTERS
-share/gnucash/doc/HACKING
-share/gnucash/doc/INSTALL
-share/gnucash/doc/LICENSE
-share/gnucash/doc/NEWS
-share/gnucash/doc/README
-share/gnucash/doc/README-de.win32-bin.txt
-share/gnucash/doc/README-fr.win32-bin.txt
-share/gnucash/doc/README-it.win32-bin.txt
-share/gnucash/doc/README-lv.win32-bin.txt
-share/gnucash/doc/README-nl.win32-bin.txt
-share/gnucash/doc/README-zh_CN.win32-bin.txt
-share/gnucash/doc/README-zh_TW.win32-bin.txt
-share/gnucash/doc/README.dependencies
-share/gnucash/doc/README.francais
-share/gnucash/doc/README.german
-share/gnucash/doc/README.win32-bin.txt
-share/gnucash/doc/examples/Money95bank_fr.qif
-share/gnucash/doc/examples/Money95invst_fr.qif
-share/gnucash/doc/examples/Money95mfunds_fr.qif
-share/gnucash/doc/examples/Money95stocks_fr.qif
-share/gnucash/doc/examples/README
-share/gnucash/doc/examples/abc-all.qif
-share/gnucash/doc/examples/abc.qif
-share/gnucash/doc/examples/bogus.qif
-share/gnucash/doc/examples/cbb-export.qif
-share/gnucash/doc/examples/currency_tree_xml.gnucash
-share/gnucash/doc/examples/every.qif
-share/gnucash/doc/examples/ms-money.qif
-share/gnucash/doc/examples/quicktest.qif
-share/gnucash/doc/examples/swipe.qif
-share/gnucash/doc/examples/taxreport.gnucash
-share/gnucash/doc/examples/web.qif
-share/gnucash/doc/guile-hackers.txt
-share/gnucash/doc/projects.html
-share/gnucash/glade/account.glade
-share/gnucash/glade/acctperiod.glade
-share/gnucash/glade/autoclear.glade
-share/gnucash/glade/bi_import.glade
-share/gnucash/glade/billterms.glade
-share/gnucash/glade/budget.glade
-share/gnucash/glade/businessprefs.glade
-share/gnucash/glade/choose-owner.glade
-share/gnucash/glade/commodities.glade
-share/gnucash/glade/commodity.glade
-share/gnucash/glade/custom-report-dialog.glade
-share/gnucash/glade/customer.glade
-share/gnucash/glade/date-close.glade
-share/gnucash/glade/dialog-book-close.glade
-share/gnucash/glade/dialog-file-access.glade
-share/gnucash/glade/dialog-object-references.glade
-share/gnucash/glade/dialog-query-list.glade
-share/gnucash/glade/dialog-reset-warnings.glade
-share/gnucash/glade/druid-gconf-setup.glade
-share/gnucash/glade/druid-gnc-xml-import.glade
-share/gnucash/glade/druid-provider-multifile.glade
-share/gnucash/glade/employee.glade
-share/gnucash/glade/exchange-dialog.glade
-share/gnucash/glade/fincalc.glade
-share/gnucash/glade/generic-import.glade
-share/gnucash/glade/gnc-csv-preview-dialog.glade
-share/gnucash/glade/gnc-date-format.glade
-share/gnucash/glade/gnc-gui-query.glade
-share/gnucash/glade/import-provider-format.glade
-share/gnucash/glade/invoice.glade
-share/gnucash/glade/job.glade
-share/gnucash/glade/lots.glade
-share/gnucash/glade/newuser.glade
-share/gnucash/glade/order.glade
-share/gnucash/glade/payment.glade
-share/gnucash/glade/preferences.glade
-share/gnucash/glade/price.glade
-share/gnucash/glade/print.glade
-share/gnucash/glade/progress.glade
-share/gnucash/glade/qif.glade
-share/gnucash/glade/reconcile.glade
-share/gnucash/glade/register.glade
-share/gnucash/glade/report.glade
-share/gnucash/glade/sched-xact.glade
-share/gnucash/glade/search.glade
-share/gnucash/glade/stocks.glade
-share/gnucash/glade/tax-tables.glade
-share/gnucash/glade/tax.glade
-share/gnucash/glade/totd.glade
-share/gnucash/glade/transfer.glade
-share/gnucash/glade/userpass.glade
-share/gnucash/glade/vendor.glade
 share/gnucash/gnome
+share/gnucash/gtkbuilder/assistant-acct-period.glade
+share/gnucash/gtkbuilder/assistant-csv-account-import.glade
+share/gnucash/gtkbuilder/assistant-csv-export.glade
+share/gnucash/gtkbuilder/assistant-csv-trans-import.glade
+share/gnucash/gtkbuilder/assistant-hierarchy.glade
+share/gnucash/gtkbuilder/assistant-loan.glade
+share/gnucash/gtkbuilder/assistant-qif-import.glade
+share/gnucash/gtkbuilder/assistant-stock-split.glade
+share/gnucash/gtkbuilder/assistant-xml-encoding.glade
+share/gnucash/gtkbuilder/business-options-gnome.glade
+share/gnucash/gtkbuilder/business-prefs.glade
+share/gnucash/gtkbuilder/dialog-account-picker.glade
+share/gnucash/gtkbuilder/dialog-account.glade
+share/gnucash/gtkbuilder/dialog-bi-import-gui.glade
+share/gnucash/gtkbuilder/dialog-billterms.glade
+share/gnucash/gtkbuilder/dialog-book-close.glade
+share/gnucash/gtkbuilder/dialog-choose-owner.glade
+share/gnucash/gtkbuilder/dialog-commodities.glade
+share/gnucash/gtkbuilder/dialog-commodity.glade
+share/gnucash/gtkbuilder/dialog-custom-report.glade
+share/gnucash/gtkbuilder/dialog-customer-import-gui.glade
+share/gnucash/gtkbuilder/dialog-customer.glade
+share/gnucash/gtkbuilder/dialog-date-close.glade
+share/gnucash/gtkbuilder/dialog-employee.glade
+share/gnucash/gtkbuilder/dialog-file-access.glade
+share/gnucash/gtkbuilder/dialog-fincalc.glade
+share/gnucash/gtkbuilder/dialog-import.glade
+share/gnucash/gtkbuilder/dialog-invoice.glade
+share/gnucash/gtkbuilder/dialog-job.glade
+share/gnucash/gtkbuilder/dialog-lot-viewer.glade
+share/gnucash/gtkbuilder/dialog-new-user.glade
+share/gnucash/gtkbuilder/dialog-object-references.glade
+share/gnucash/gtkbuilder/dialog-options.glade
+share/gnucash/gtkbuilder/dialog-order.glade
+share/gnucash/gtkbuilder/dialog-payment.glade
+share/gnucash/gtkbuilder/dialog-preferences.glade
+share/gnucash/gtkbuilder/dialog-price.glade
+share/gnucash/gtkbuilder/dialog-print-check.glade
+share/gnucash/gtkbuilder/dialog-progress.glade
+share/gnucash/gtkbuilder/dialog-query-view.glade
+share/gnucash/gtkbuilder/dialog-report.glade
+share/gnucash/gtkbuilder/dialog-reset-warnings.glade
+share/gnucash/gtkbuilder/dialog-search.glade
+share/gnucash/gtkbuilder/dialog-sx.glade
+share/gnucash/gtkbuilder/dialog-tax-info.glade
+share/gnucash/gtkbuilder/dialog-tax-table.glade
+share/gnucash/gtkbuilder/dialog-totd.glade
+share/gnucash/gtkbuilder/dialog-transfer.glade
+share/gnucash/gtkbuilder/dialog-userpass.glade
+share/gnucash/gtkbuilder/dialog-vendor.glade
+share/gnucash/gtkbuilder/gnc-date-format.glade
+share/gnucash/gtkbuilder/gnc-frequency.glade
+share/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
+share/gnucash/gtkbuilder/gnc-plugin-page-register.glade
+share/gnucash/gtkbuilder/gnc-plugin-page-register2.glade
+share/gnucash/gtkbuilder/gnc-recurrence.glade
+share/gnucash/gtkbuilder/gnc-tree-view-owner.glade
+share/gnucash/gtkbuilder/window-autoclear.glade
+share/gnucash/gtkbuilder/window-reconcile.glade
 share/gnucash/guile-modules/gnucash/app-utils.scm
 share/gnucash/guile-modules/gnucash/business-core.scm
 share/gnucash/guile-modules/gnucash/business-gnome.scm
-share/gnucash/guile-modules/gnucash/business-utils.scm
 share/gnucash/guile-modules/gnucash/core-utils.scm
-share/gnucash/guile-modules/gnucash/dialog-tax-table.scm
 share/gnucash/guile-modules/gnucash/engine.scm
 share/gnucash/guile-modules/gnucash/gnc-module.scm
 share/gnucash/guile-modules/gnucash/gnome-utils.scm
@@ -781,6 +793,9 @@ share/gnucash/guile-modules/gnucash/report/payables.scm
 share/gnucash/guile-modules/gnucash/report/receivables.scm
 share/gnucash/guile-modules/gnucash/report/report-gnome.scm
 share/gnucash/guile-modules/gnucash/report/report-system.scm
+share/gnucash/guile-modules/gnucash/report/report-system/collectors.scm
+share/gnucash/guile-modules/gnucash/report/report-system/list-extras.scm
+share/gnucash/guile-modules/gnucash/report/report-system/report-collectors.scm
 share/gnucash/guile-modules/gnucash/report/standard-reports.scm
 share/gnucash/guile-modules/gnucash/report/standard-reports/account-piecharts.scm
 share/gnucash/guile-modules/gnucash/report/standard-reports/account-summary.scm
@@ -822,6 +837,41 @@ share/gnucash/guile-modules/gnucash/report/view-column.scm
 share/gnucash/guile-modules/gnucash/report/welcome-to-gnucash.scm
 share/gnucash/guile-modules/gnucash/tax/de_DE.scm
 share/gnucash/guile-modules/gnucash/tax/us.scm
+share/gnucash/guile-modules/gnucash/unittest-support.scm
+share/gnucash/guile-modules/www/cgi.scm
+share/gnucash/guile-modules/www/http.scm
+share/gnucash/guile-modules/www/main.scm
+share/gnucash/guile-modules/www/url.scm
+share/gnucash/jqplot/jqplot.BezierCurveRenderer.js
+share/gnucash/jqplot/jqplot.barRenderer.js
+share/gnucash/jqplot/jqplot.blockRenderer.js
+share/gnucash/jqplot/jqplot.bubbleRenderer.js
+share/gnucash/jqplot/jqplot.canvasAxisLabelRenderer.js
+share/gnucash/jqplot/jqplot.canvasAxisTickRenderer.js
+share/gnucash/jqplot/jqplot.canvasTextRenderer.js
+share/gnucash/jqplot/jqplot.categoryAxisRenderer.js
+share/gnucash/jqplot/jqplot.ciParser.js
+share/gnucash/jqplot/jqplot.cursor.js
+share/gnucash/jqplot/jqplot.dateAxisRenderer.js
+share/gnucash/jqplot/jqplot.donutRenderer.js
+share/gnucash/jqplot/jqplot.dragable.js
+share/gnucash/jqplot/jqplot.enhancedLegendRenderer.js
+share/gnucash/jqplot/jqplot.funnelRenderer.js
+share/gnucash/jqplot/jqplot.highlighter.js
+share/gnucash/jqplot/jqplot.json2.js
+share/gnucash/jqplot/jqplot.logAxisRenderer.js
+share/gnucash/jqplot/jqplot.mekkoAxisRenderer.js
+share/gnucash/jqplot/jqplot.mekkoRenderer.js
+share/gnucash/jqplot/jqplot.meterGaugeRenderer.js
+share/gnucash/jqplot/jqplot.ohlcRenderer.js
+share/gnucash/jqplot/jqplot.pieRenderer.js
+share/gnucash/jqplot/jqplot.pointLabels.js
+share/gnucash/jqplot/jqplot.trendline.js
+share/gnucash/jqplot/jquery.jqplot.css
+share/gnucash/jqplot/jquery.jqplot.js
+share/gnucash/jqplot/jquery.min.js
+share/gnucash/make-prefs-migration-script.xsl
+share/gnucash/migratable-prefs.xml
 share/gnucash/pixmaps/gnc-account-16.png
 share/gnucash/pixmaps/gnc-account-delete-16.png
 share/gnucash/pixmaps/gnc-account-delete.png
@@ -832,6 +882,8 @@ share/gnucash/pixmaps/gnc-account-new.png
 share/gnucash/pixmaps/gnc-account-open-16.png
 share/gnucash/pixmaps/gnc-account-open.png
 share/gnucash/pixmaps/gnc-account.png
+share/gnucash/pixmaps/gnc-gnome-pdf-16.png
+share/gnucash/pixmaps/gnc-gnome-pdf-24.png
 share/gnucash/pixmaps/gnc-invoice-16.png
 share/gnucash/pixmaps/gnc-invoice-duplicate-16.png
 share/gnucash/pixmaps/gnc-invoice-duplicate.png
@@ -866,16 +918,22 @@ share/gnucash/pixmaps/gnucash-icon.ico
 share/gnucash/pixmaps/gnucash_splash.png
 share/gnucash/pixmaps/stock_split_title.png
 share/gnucash/pixmaps/stock_split_watermark.png
+share/gnucash/python/init.py
+share/gnucash/python/pycons/__init__.py
+share/gnucash/python/pycons/console.py
+share/gnucash/python/pycons/ishell.py
+share/gnucash/python/pycons/pycons
+share/gnucash/python/pycons/setup.py
+share/gnucash/python/pycons/shell.py
+share/gnucash/python/pycons/simple_plot.py
 share/gnucash/scm/build-config.scm
 share/gnucash/scm/business-options.scm
 share/gnucash/scm/business-prefs.scm
 share/gnucash/scm/c-interface.scm
-share/gnucash/scm/command-line.scm
 share/gnucash/scm/commodity-table.scm
 share/gnucash/scm/commodity-utilities.scm
 share/gnucash/scm/config-var.scm
 share/gnucash/scm/date-utilities.scm
-share/gnucash/scm/doc.scm
 share/gnucash/scm/engine-interface.scm
 share/gnucash/scm/engine-utilities.scm
 share/gnucash/scm/fin.scm
@@ -888,6 +946,7 @@ share/gnucash/scm/html-acct-table.scm
 share/gnucash/scm/html-barchart.scm
 share/gnucash/scm/html-document.scm
 share/gnucash/scm/html-fonts.scm
+share/gnucash/scm/html-jqplot.scm
 share/gnucash/scm/html-linechart.scm
 share/gnucash/scm/html-piechart.scm
 share/gnucash/scm/html-scatter.scm
@@ -896,7 +955,7 @@ share/gnucash/scm/html-style-sheet.scm
 share/gnucash/scm/html-table.scm
 share/gnucash/scm/html-text.scm
 share/gnucash/scm/html-utilities.scm
-share/gnucash/scm/main-window.scm
+share/gnucash/scm/migrate-prefs.scm
 share/gnucash/scm/options-utilities.scm
 share/gnucash/scm/options.scm
 share/gnucash/scm/prefs.scm
@@ -923,27 +982,37 @@ share/gnucash/tip_of_the_day.list
 share/gnucash/ui/gnc-main-window-ui.xml
 share/gnucash/ui/gnc-plugin-account-tree-ui.xml
 share/gnucash/ui/gnc-plugin-basic-commands-ui.xml
-share/gnucash/ui/gnc-plugin-bi_import-ui.xml
+share/gnucash/ui/gnc-plugin-bi-import-ui.xml
 share/gnucash/ui/gnc-plugin-budget-ui.xml
 share/gnucash/ui/gnc-plugin-business-ui.xml
-share/gnucash/ui/gnc-plugin-csv-ui.xml
+share/gnucash/ui/gnc-plugin-csv-export-ui.xml
+share/gnucash/ui/gnc-plugin-csv-import-ui.xml
+share/gnucash/ui/gnc-plugin-customer_import-ui.xml
 share/gnucash/ui/gnc-plugin-file-history-ui.xml
 share/gnucash/ui/gnc-plugin-log-replay-ui.xml
 share/gnucash/ui/gnc-plugin-ofx-ui.xml
 share/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
+share/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
 share/gnucash/ui/gnc-plugin-page-budget-ui.xml
 share/gnucash/ui/gnc-plugin-page-invoice-ui.xml
+share/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
 share/gnucash/ui/gnc-plugin-page-register-ui.xml
+share/gnucash/ui/gnc-plugin-page-register2-ui.xml
 share/gnucash/ui/gnc-plugin-page-report-ui.xml
 share/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
+share/gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
 share/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
 share/gnucash/ui/gnc-plugin-qif-import-ui.xml
 share/gnucash/ui/gnc-plugin-register-ui.xml
+share/gnucash/ui/gnc-plugin-register2-ui.xml
+share/gnucash/ui/gnc-plugin-register22-ui.xml
 share/gnucash/ui/gnc-plugin-stylesheets-ui.xml
 share/gnucash/ui/gnc-reconcile-window-ui.xml
 share/gnucash/ui/gnc-sxed-to-create-window-ui.xml
 share/gnucash/ui/gnc-sxed-window-ui-full.xml
 share/gnucash/ui/gnc-sxed-window-ui.xml
+share/gnucash/ui/gnc-windows-menu-ui-quartz.xml
+share/gnucash/ui/gnc-windows-menu-ui.xml
 share/gnucash/ui/osx_accel_map
 share/icons/hicolor/128x128/apps/gnucash-icon.png
 share/icons/hicolor/16x16/apps/gnucash-icon.png
@@ -955,6 +1024,7 @@ share/icons/hicolor/48x48/apps/gnucash-icon.png
 share/icons/hicolor/64x64/apps/gnucash-icon.png
 share/icons/hicolor/96x96/apps/gnucash-icon.png
 share/icons/hicolor/scalable/apps/gnucash-icon.svg
+share/locale/ar/LC_MESSAGES/gnucash.mo
 share/locale/bg/LC_MESSAGES/gnucash.mo
 share/locale/ca/LC_MESSAGES/gnucash.mo
 share/locale/cs/LC_MESSAGES/gnucash.mo
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 3c6b04e4dd6..e4d9d717ae9 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.59 2013/07/29 18:16:53 wiz Exp $
+$NetBSD: distinfo,v 1.60 2014/01/02 01:25:49 ryoon Exp $
 
-SHA1 (gnucash-2.4.13.tar.bz2) = cd28d4e7d84d71ade56173734d634ccadc59ed81
-RMD160 (gnucash-2.4.13.tar.bz2) = 5d6c9dc836ccdf7b4613523004bb5a297eb70f97
-Size (gnucash-2.4.13.tar.bz2) = 9400405 bytes
-SHA1 (patch-configure) = a7fb5175e4f79a30da8b7e64d6f1a3ecd458fad8
+SHA1 (gnucash-2.6.0.tar.bz2) = 9715468bbe9e4cef6559bfa9825d51ac10d6ff84
+RMD160 (gnucash-2.6.0.tar.bz2) = 157279328ed614fa9ee020348525c3b210881007
+Size (gnucash-2.6.0.tar.bz2) = 10691364 bytes
 SHA1 (patch-src_scm_price-quotes.scm) = 59273628b7271ed639a97636b76958baa45ef104
diff --git a/finance/gnucash/patches/patch-configure b/finance/gnucash/patches/patch-configure
deleted file mode 100644
index 122c5f70f71..00000000000
--- a/finance/gnucash/patches/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2013/07/29 10:38:54 wiz Exp $
-
-Test guile-www by using its http module, the main module is
-removed since 2.37.
-
-Fix unportable test(1) construct.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686830
-
---- configure.orig	2013-04-20 21:07:33.000000000 +0000
-+++ configure
-@@ -21347,10 +21347,10 @@ fi
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if (www main) is available" >&5
--$as_echo_n "checking if (www main) is available... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if (www http) is available" >&5
-+$as_echo_n "checking if (www http) is available... " >&6; }
- 
--  $GUILE -c "(use-modules (www main)) (exit ((lambda () 0)))" > /dev/null 2>&1
-+  $GUILE -c "(use-modules (www http)) (exit ((lambda () 0)))" > /dev/null 2>&1
-   gnc_have_guile_www=$?
- 
- 	  if test "$gnc_have_guile_www" = "0" ; then gnc_have_guile_www=yes ; else gnc_have_guile_www=no ; fi
-@@ -21807,7 +21807,7 @@ else
-   CUSTOM_GNC_DBD_DIR_FALSE=
- fi
- 
-- if test "x$ac_cv_header_dbi_dbi_h" == xyes; then
-+ if test "x$ac_cv_header_dbi_dbi_h" = xyes; then
-   WITH_DBI_TRUE=
-   WITH_DBI_FALSE='#'
- else