Update to 1.9.6:

 1.9.6 - 14 May 2006
 	 o Welcome to GnuCash 1.9.6 aka "Time to make a difference" the first
	 beta release of the GnuCash Open Source Accounting Software which will
	 eventually lead to the stable version 2.0.0. This release contains
	 many bugfixes since the sixth unstable release.
	 o PLEASE TEST any and all features important to you. Then post any
	 bugs you find to bugzilla
	 http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
	 o We would like to encourage people to test this and any further
	 releases as much as possible and submit bug reports in order that we
	 can polish GnuCash to be as stable as possible for the 2.0.0 release
	 in a few weeks.
	 o Major bugfixes include -
	 o More Register fixes.
	 o Fixes to Scheduled Transactions.
	 o Many Report fixes.
 	 o Many updated translations.
	 o New icons
	 o Fixes to lots functionality
	 o Fixes to logging
	 o Many Qof fixes
	 o Fixes to budgeting
	 o HBCI fixes

6 files changed, 78 insertions, 64 deletions

diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index 1a3e50af322..5222c0d8b8f 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/04/29 20:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/05/16 17:32:50 wiz Exp $
 #
 
-DISTNAME=		gnucash-1.9.5
+DISTNAME=		gnucash-1.9.6
 CATEGORIES=		finance
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 
diff --git a/finance/gnucash-devel/PLIST b/finance/gnucash-devel/PLIST
index 0e230c609b0..c399864cb70 100644
--- a/finance/gnucash-devel/PLIST
+++ b/finance/gnucash-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/29 20:38:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/05/16 17:32:50 wiz Exp $
 bin/gnc-fq-check
 bin/gnc-fq-dump
 bin/gnc-fq-helper
@@ -237,10 +237,10 @@ lib/libcore-utils.la
 lib/libgnc-backend-file.la
 lib/libgncgnome.la
 lib/libgncmodule.la
+lib/libgncqof-backend-qsf.la
+lib/libgncqof.la
 lib/libgw-core-utils.la
 lib/libgw-gnc.la
-lib/libqof-backend-qsf.la
-lib/libqof.la
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
 libexec/gnucash/overrides/guile
@@ -281,6 +281,14 @@ share/gnucash/accounts/da/acctchrt_car.gnucash-xea
 share/gnucash/accounts/da/acctchrt_common.gnucash-xea
 share/gnucash/accounts/da/acctchrt_homeloan.gnucash-xea
 share/gnucash/accounts/da/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_auto.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_autoloan.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_business.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_common.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_houseown.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_investment.gnucash-xea
+share/gnucash/accounts/de_AT/acctchrt_kids.gnucash-xea
 share/gnucash/accounts/de_CH/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/de_CH/acctchrt_chkmu.gnucash-xea
 share/gnucash/accounts/de_CH/acctchrt_common.gnucash-xea
@@ -316,6 +324,22 @@ share/gnucash/accounts/es_ES/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_brokerage.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_business.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_carloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_childcare.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_common.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_currency.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_eduloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_homeloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_otherloan.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_renter.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_retiremt.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea
+share/gnucash/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea
 share/gnucash/accounts/fr_FR/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/fr_FR/acctchrt_business.gnucash-xea
 share/gnucash/accounts/fr_FR/acctchrt_carloan.gnucash-xea
@@ -606,25 +630,37 @@ 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/pixmaps/account-16.png
-share/gnucash/pixmaps/account.png
 share/gnucash/pixmaps/appicon.png
-share/gnucash/pixmaps/delete-account-16.png
-share/gnucash/pixmaps/delete-account.png
-share/gnucash/pixmaps/edit-account-16.png
-share/gnucash/pixmaps/edit-account.png
+share/gnucash/pixmaps/gnc-account-16.png
+share/gnucash/pixmaps/gnc-account-delete-16.png
+share/gnucash/pixmaps/gnc-account-delete.png
+share/gnucash/pixmaps/gnc-account-edit-16.png
+share/gnucash/pixmaps/gnc-account-edit.png
+share/gnucash/pixmaps/gnc-account-new-16.png
+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-invoice-16.png
+share/gnucash/pixmaps/gnc-invoice-edit-16.png
+share/gnucash/pixmaps/gnc-invoice-edit.png
+share/gnucash/pixmaps/gnc-invoice-post-16.png
+share/gnucash/pixmaps/gnc-invoice-post.png
+share/gnucash/pixmaps/gnc-invoice-unpost-16.png
+share/gnucash/pixmaps/gnc-invoice-unpost.png
+share/gnucash/pixmaps/gnc-invoice.png
+share/gnucash/pixmaps/gnc-jumpto-16.png
+share/gnucash/pixmaps/gnc-jumpto.png
+share/gnucash/pixmaps/gnc-split-trans-16.png
+share/gnucash/pixmaps/gnc-split-trans.png
+share/gnucash/pixmaps/gnc-sx-new-16.png
+share/gnucash/pixmaps/gnc-sx-new.png
+share/gnucash/pixmaps/gnc-transfer-16.png
+share/gnucash/pixmaps/gnc-transfer.png
 share/gnucash/pixmaps/gnucash-icon.png
 share/gnucash/pixmaps/gnucash_splash.png
-share/gnucash/pixmaps/new-account-16.png
-share/gnucash/pixmaps/new-account.png
-share/gnucash/pixmaps/open-account-16.png
-share/gnucash/pixmaps/open-account.png
-share/gnucash/pixmaps/split-transaction-16.png
-share/gnucash/pixmaps/split-transaction.png
 share/gnucash/pixmaps/stock_split_title.png
 share/gnucash/pixmaps/stock_split_watermark.png
-share/gnucash/pixmaps/transfer-16.png
-share/gnucash/pixmaps/transfer.png
 share/gnucash/scm/build-config.scm
 share/gnucash/scm/business-options.scm
 share/gnucash/scm/business-prefs.scm
@@ -700,6 +736,10 @@ 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/xml/qsf/pilot-qsf-GnuCashInvoice.xml
+share/gnucash/xml/qsf/pilot-qsf-gncCustomer.xml
+share/gnucash/xml/qsf/qsf-map.xsd.xml
+share/gnucash/xml/qsf/qsf-object.xsd.xml
 share/locale/ca/LC_MESSAGES/gnucash.mo
 share/locale/cs/LC_MESSAGES/gnucash.mo
 share/locale/da/LC_MESSAGES/gnucash.mo
@@ -736,15 +776,12 @@ share/xml/gnucash/xsl/gnucash-gnccustomer-vcard2.xsl
 share/xml/gnucash/xsl/gnucash-std.xsl
 share/xml/gnucash/xsl/string.xsl
 share/xml/gnucash/xsl/vcard-gnccustomer.pl
-share/xml/qsf/pilot-qsf-GnuCashInvoice.xml
-share/xml/qsf/pilot-qsf-gncCustomer.xml
-share/xml/qsf/qsf-map.xsd.xml
-share/xml/qsf/qsf-object.xsd.xml
-@dirrm share/xml/qsf
 @dirrm share/xml/gnucash/xsl
 @dirrm share/xml/gnucash
 @comment in xmlcatmgr: @dirrm share/xml
 @comment in xdg-dirs: @dirrm share/mime-info
+@dirrm share/gnucash/xml/qsf
+@dirrm share/gnucash/xml
 @dirrm share/gnucash/ui
 @dirrm share/gnucash/scm/qif-import
 @dirrm share/gnucash/scm/printing
@@ -772,10 +809,12 @@ share/xml/qsf/qsf-object.xsd.xml
 @dirrm share/gnucash/accounts/it
 @dirrm share/gnucash/accounts/hu_HU
 @dirrm share/gnucash/accounts/fr_FR
+@dirrm share/gnucash/accounts/fr_CH
 @dirrm share/gnucash/accounts/es_ES
 @dirrm share/gnucash/accounts/el_GR
 @dirrm share/gnucash/accounts/de_DE
 @dirrm share/gnucash/accounts/de_CH
+@dirrm share/gnucash/accounts/de_AT
 @dirrm share/gnucash/accounts/da
 @dirrm share/gnucash/accounts/C
 @dirrm share/gnucash/accounts
diff --git a/finance/gnucash-devel/distinfo b/finance/gnucash-devel/distinfo
index bda54f88a2a..7b593dab8fd 100644
--- a/finance/gnucash-devel/distinfo
+++ b/finance/gnucash-devel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/04/29 20:38:57 wiz Exp $
+$NetBSD: distinfo,v 1.10 2006/05/16 17:32:50 wiz Exp $
 
-SHA1 (gnucash-1.9.5.tar.gz) = a7bbda9848345ca65f3a18f6f272edd2c86c93f9
-RMD160 (gnucash-1.9.5.tar.gz) = 078e4c4fe179e82633799a09f9cf203adbedf2e0
-Size (gnucash-1.9.5.tar.gz) = 10196556 bytes
+SHA1 (gnucash-1.9.6.tar.gz) = 925d895687f28f688c4e33efc8c9f461e8720da8
+RMD160 (gnucash-1.9.6.tar.gz) = 86d46f14bdcadfc8e6295c677dc19f1dc2a095d1
+Size (gnucash-1.9.6.tar.gz) = 10261263 bytes
 SHA1 (patch-aa) = db08a08fe8181822c1038d0adb3174dc2ebbcc12
-SHA1 (patch-ab) = 92eacff50b719f3488fcf692a96ba89c45559b88
-SHA1 (patch-ac) = e151916a2434a709c32c6a7169ddc287a0d5d229
+SHA1 (patch-ab) = 01547c8c1a41ee39773a4ba960ec27be5ab2e0a2
+SHA1 (patch-ac) = b832801e5980f7ad4aeb9eb82c422c6b658d660e
 SHA1 (patch-ad) = a28ccd08bb8c4a654bb5bdf619888925c854d53f
-SHA1 (patch-ae) = 32ae0e92bbfa617ef69145cd6419fd1d9a8d66bf
diff --git a/finance/gnucash-devel/patches/patch-ab b/finance/gnucash-devel/patches/patch-ab
index 35b6b7a064d..43a1e4ecad7 100644
--- a/finance/gnucash-devel/patches/patch-ab
+++ b/finance/gnucash-devel/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2006/04/29 20:38:57 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/05/16 17:32:50 wiz Exp $
 
---- src/app-utils/gnc-ui-util.c.orig	2006-04-16 23:52:14.000000000 +0000
+--- src/app-utils/gnc-ui-util.c.orig	2006-05-15 01:07:33.000000000 +0000
 +++ src/app-utils/gnc-ui-util.c
 @@ -100,6 +100,14 @@ gnc_configure_account_separator (void)
      free(string);
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/29 20:38:57 wiz Exp $
  
  static void
  gnc_configure_reverse_balance (void)
-@@ -749,15 +757,15 @@ gnc_localeconv (void)
+@@ -763,15 +771,15 @@ gnc_localeconv (void)
  
    lc = *localeconv();
  
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/29 20:38:57 wiz Exp $
  
    gnc_lconv_set_char(&lc.frac_digits, 2);
    gnc_lconv_set_char(&lc.int_frac_digits, 2);
-@@ -1261,13 +1269,13 @@ PrintAmountInternal(char *buf, gnc_numer
+@@ -1275,13 +1283,13 @@ PrintAmountInternal(char *buf, gnc_numer
  
      if (info->monetary)
      {
@@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/29 20:38:57 wiz Exp $
      }
  
      buf_ptr = buf;
-@@ -1335,7 +1343,7 @@ PrintAmountInternal(char *buf, gnc_numer
+@@ -1349,7 +1357,7 @@ PrintAmountInternal(char *buf, gnc_numer
    }
    else
    {
@@ -69,7 +69,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/29 20:38:57 wiz Exp $
      guint8 num_decimal_places = 0;
      char *temp_ptr = temp_buf;
  
-@@ -1618,13 +1626,13 @@ xaccParseAmount (const char * in_str, gb
+@@ -1632,13 +1640,13 @@ xaccParseAmount (const char * in_str, gb
    {
      group_separator = g_utf8_get_char(lc->mon_thousands_sep);
      decimal_point = g_utf8_get_char(lc->mon_decimal_point);
diff --git a/finance/gnucash-devel/patches/patch-ac b/finance/gnucash-devel/patches/patch-ac
index e07248dd11c..521074029c0 100644
--- a/finance/gnucash-devel/patches/patch-ac
+++ b/finance/gnucash-devel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2006/03/13 21:23:54 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2006/05/16 17:32:50 wiz Exp $
 
---- src/app-utils/gnc-exp-parser.c.orig	2006-03-07 05:08:14.000000000 +0000
+--- src/app-utils/gnc-exp-parser.c.orig	2006-05-15 01:07:33.000000000 +0000
 +++ src/app-utils/gnc-exp-parser.c
-@@ -548,9 +548,15 @@ gnc_exp_parser_parse_separate_vars (cons
+@@ -546,9 +546,15 @@ gnc_exp_parser_parse_separate_vars (cons
  
    lc = gnc_localeconv ();
  
diff --git a/finance/gnucash-devel/patches/patch-ae b/finance/gnucash-devel/patches/patch-ae
deleted file mode 100644
index 74e2bc0dc9b..00000000000
--- a/finance/gnucash-devel/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/29 20:38:57 wiz Exp $
-
---- src/gnome-utils/druid-gnc-xml-import.c.orig	2006-04-16 23:52:26.000000000 +0000
-+++ src/gnome-utils/druid-gnc-xml-import.c
-@@ -838,8 +838,8 @@ gxi_update_default_enc_combo (GncXmlImpo
- static void
- gxi_update_summary_label (GncXmlImportData *data)
- {
--  gchar *string;
--  gboolean show;
-+  gchar *string=NULL;
-+  gboolean show=FALSE;
- 
-   if (data->n_unassigned) {
-     if (data->n_impossible) {
-@@ -1149,7 +1149,7 @@ gxi_string_combo_changed_cb (GtkComboBox
-   GList *found, *default_conv;
-   gboolean is_active;
-   ambiguous_type *amb;
--  conv_type *prev_conv, *curr_conv;
-+  conv_type *prev_conv, *curr_conv=NULL;
-   gpointer ptr;
-   GQuark prev_enc, curr_enc;
-