Sync the g2 branch with the gnome2-merge-4 tag. (2003-10-24)

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gnucash-gnome2-dev@9637 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton
2003-10-25 06:04:01 +00:00
parent 89e8831a66
commit 2a3538b67b
17 changed files with 90 additions and 476 deletions

View File

@@ -2100,6 +2100,68 @@
-=-=-=- cvs HEAD ChangeLog is below this line -=-=-=-
2003-10-24 David Hampton <hampton@employees.org>
* src/import-export/hbci/druid-hbci-initial.c: Use the generic
import account picker.
* src/gnome-utils/Makefile.am:
* src/gnome-utils/dialog-account-pick.[ch]: Remove unused files.
2003-10-23 David Hampton <hampton@employees.org>
* src/AccWindow.h:
* src/gnome-utils/dialog-account.h: Move function declarations to
the right header file. Document them as well.
* (various): Include the right header file.
2003-10-23 Derek Atkins <derek@ihtfp.com>
* src/app-utils/prefs.scm:
* src/business/business-utils/business-prefs.scm:
Add new preferences for the default "fancy date format",
even if it's not used, yet. Another step to fixing #99574
* Added GPL boilerplates to many of my files.
2003-10-21 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/gnc-hbci-utils.c: Refactor some GUI
code. Improve user messages.
2003-10-20 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/hbci-interaction.c,
gnc-hbci-getbalance.c, dialog-hbcitrans.c: Improved user messages.
* src/import-export/hbci/gnc-hbci-utils.c: Fixed extremly stupid,
old bug that causes weird HBCI errors.
2003-10-18 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/druid-hbci-initial.c: Fix and initially
implement handling of multiple banks/users/customers.
* src/import-export/hbci/dialog-hbcitrans.c: Fix handling of HBCI
direct debits (fix wrong textkey).
2003-10-01 Derek Atkins <derek@ihtfp.com>
* src/backend/postgres/gncquery.c: Linas broke SQL when we renamed
the QueryObjects to QofClass.
2003-09-30 Derek Atkins <derek@ihtfp.com>
* src/engine/gnc-date.h: add a comment about minimum string length
* src/engine/Transaction.c: fix the ISO_DATELEN to be "long enough"
Fixes #123558
2003-09-18 Christian Stimming <stimming@tuhh.de>
* configure.in: Add correct configure test for openhbci version
required by mt940 module.
2003-09-16 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/gnc-hbci-kvp.c: Fix broken compile due to

View File

@@ -1,5 +1,5 @@
SUBDIRS = m4 debian doc lib src intl-scm po rpm accounts
SUBDIRS = m4 doc lib src intl-scm po rpm accounts
docdir = ${GNC_DOC_INSTALL_DIR}

View File

@@ -569,6 +569,27 @@ int ofx_proc_statement_cb(const struct OfxStatementData data) { return 0; }
fi
AC_SUBST(OFX_DIR)
### --------------------------------------------------------------------------
### MT940
AC_ARG_ENABLE( mt940,
[ --enable-mt940 compile with MT940 support (needs --enable-hbci)],
if test "x$enableval" != "xno" ; then
MT940_DIR=mt940
fi)
if test x${MT940_DIR} = xmt940 ;
then
AM_PATH_OPENHBCI(0.9.13.2)
# Note: HBCI_LIBS is changed again below in the --enable-hbci
# section. So check for mt940 first and *not* the other way round!
HBCI_LIBS="${OPENHBCI_LIBS}"
HBCI_CFLAGS="${OPENHBCI_CFLAGS}"
AS_SCRUB_INCLUDE(HBCI_CFLAGS)
AC_SUBST(HBCI_LIBS)
AC_SUBST(HBCI_CFLAGS)
fi
AC_SUBST(MT940_DIR)
### --------------------------------------------------------------------------
### HBCI
AC_ARG_ENABLE( hbci,
@@ -594,15 +615,6 @@ then
fi
AC_SUBST(HBCI_DIR)
### --------------------------------------------------------------------------
### MT940
AC_ARG_ENABLE( mt940,
[ --enable-mt940 compile with MT940 support (needs --enable-hbci)],
if test "x$enableval" != "xno" ; then
MT940_DIR=mt940
fi)
AC_SUBST(MT940_DIR)
### --------------------------------------------------------------------------
### i18n
@@ -1040,8 +1052,7 @@ chmod u+x ${srcdir}/src/bin/overrides/gnucash-make-guids
LIBOBJS_SEDSCRIPT="s,\.[[^.]]* ,$U&,g;s,\.[[^.]]*\$\$,$U&,"
AC_SUBST(LIBOBJS_SEDSCRIPT)
#AC_OUTPUT( m4/Makefile po/Makefile.in intl/Makefile
AC_OUTPUT( m4/Makefile
AC_OUTPUT( m4/Makefile po/Makefile.in
dnl # Makefiles
Makefile
accounts/Makefile
@@ -1052,11 +1063,10 @@ AC_OUTPUT( m4/Makefile
accounts/el_GR/Makefile
accounts/es_ES/Makefile
accounts/fr_FR/Makefile
accounts/it/Makefile
accounts/it/Makefile
accounts/pt_BR/Makefile
accounts/pt_PT/Makefile
accounts/sk/Makefile
debian/Makefile
doc/Makefile
doc/examples/Makefile
intl-scm/Makefile
@@ -1064,8 +1074,7 @@ AC_OUTPUT( m4/Makefile
lib/egg/Makefile
lib/guile-www/Makefile
lib/srfi/Makefile
lib/libc/Makefile
po/Makefile.in
lib/libc/Makefile
rpm/Makefile
src/Makefile
src/app-file/Makefile

15
debian/Makefile.am vendored
View File

@@ -1,15 +0,0 @@
# All the other files that go in the distribution tarfile that aren't
# included some other way...
EXTRA_DIST = \
README.debian \
changelog \
control \
control_fr \
copyright \
dirs \
gnucash.menu \
rules \
postinst

View File

@@ -1,9 +0,0 @@
gnucash for DEBIAN
----------------------
This is BETA software. It works to a degree but there may still be
bugs and unimplemented features. If you want a stable version, it
is recommended you use "xacc" which is also packaged for Debian.
Tyson Dowd <trd@cs.mu.oz.au>, Wed, 10 Mar 1999 13:00:12 +1100
John Goerzen <jgoerzen@complete.org> June 2, 2000

192
debian/changelog vendored
View File

@@ -1,192 +0,0 @@
gnucash (1.7.0.cvs20010719-0.1) unstable; urgency=low
* local cvs compile
-- James LewisMoss <jimdres@mindspring.com> Thu, 15 Feb 2001 00:19:03 -0500
gnucash (1.5.2.cvs20001105-0.1) unstable; urgency=low
* Perl files gone. Comment out stuff in rules that dealt with it.
* Local compile.
-- James LewisMoss <dres@debian.org> Sun, 5 Nov 2000 20:39:28 -0500
gnucash (1.5.2.cvs20001022-0.1) unstable; urgency=low
* local compile.
* Move perl files to correct place in perl heirarchy.
-- James LewisMoss <dres@debian.org> Sun, 22 Oct 2000 18:49:38 -0400
gnucash (1.5.2.cvs20000929-0.1) unstable; urgency=low
* More debian files fixes. Specifically rules to put the files in the
correct place and adding a postinst to call ldconfig.
* local compile.
-- James LewisMoss <dres@debian.org> Fri, 29 Sep 2000 15:25:07 -0400
gnucash (1.5.2.cvs20000928-0.1) unstable; urgency=low
* local compile
* Change copyright file to refer to correct license directory.
-- James LewisMoss <dres@debian.org> Thu, 28 Sep 2000 23:25:11 -0400
gnucash (1.3.8-1) unstable; urgency=low
* New Debian maintainer: John Goerzen <jgoerzen@complete.org>
* Closing already-fixed bugs. Closes: #62410, #62424, #62550.
* Updated package. Closes: #60387, #65000.
* Upstream bugfixes. Closes: #56979, #52990, #60901.
* Fixed 64-bit cleanliness issues. Now loads files without segfaulting
on Alpha.
* Print feature now here. It's in Reports -> Transaction Report
from the main menu. Closes: #57311.
* esd deps fixed. Closes: #60655.
* Strings longer. Closes: #44720.
* Suggests gnuplot. Closes: #62553.
-- John Goerzen <jgoerzen@complete.org> Wed, 31 May 2000 12:50:19 -0500
gnucash (1.3.4-3) frozen unstable; urgency=high
* Make wrapper script executable when installed.
Fixes #62424, #62410
-- Tyson Dowd <trd@cs.mu.oz.au> Mon, 17 Apr 2000 13:45:29 +1000
gnucash (1.3.4-2) frozen unstable; urgency=high
* Use wrapper script to avoid locale problems.
Should fix #60417 (another try at this one).
-- Tyson Dowd <trd@cs.mu.oz.au> Fri, 14 Apr 2000 13:34:31 +1000
gnucash (1.3.4-1) frozen unstable; urgency=high
* New upstream release. Should fix #60417, #60615, and #60655.
Thanks to Robert Merkel <rgmerk@mira.net> for his help in preparing
this release.
-- Tyson Dowd <trd@cs.mu.oz.au> Thu, 13 Apr 2000 13:14:49 +1100
gnucash (1.2.5.cvs.20000204-1) unstable; urgency=low
* New upsteam version (taken from CVS) including many bug fixes.
-- Tyson Dowd <trd@cs.mu.oz.au> Fri, 4 Feb 2000 12:32:41 +1100
gnucash (1.2.5.cvs.20000106-1) unstable; urgency=low
* New upstream version (taken from CVS).
-- Tyson Dowd <trd@cs.mu.oz.au> Thu, 6 Jan 2000 16:02:44 +1100
gnucash (1.2.3.cvs.19991026-5) unstable; urgency=low
* Depend on eperl. Fixes #51424. Thanks to Craig Sanders for
reporting this as I hadn't noticed it.
-- Tyson Dowd <trd@cs.mu.oz.au> Thu, 6 Jan 2000 16:02:40 +1100
gnucash (1.2.3.cvs.19991026-4) unstable; urgency=low
* Depend on libguile6-slib.
This should fix a few problems with the slib catalog not being
correctly setup, which causes gnucash to die when starting up.
(Fixes #51555, #51773)
* Use -fPIC instead of -fpic (Fixes #51545). Thanks to Ben Collins
for reporting and giving the fix.
-- Tyson Dowd <trd@cs.mu.oz.au> Thu, 2 Dec 1999 17:00:48 +1100
gnucash (1.2.3.cvs.19991026-3) unstable; urgency=low
* Add string.h to includes for FileDialog.
This should fix #49485.
-- Tyson Dowd <trd@cs.mu.oz.au> Sat, 27 Nov 1999 17:43:42 +1100
gnucash (1.2.3.cvs.19991026-2) unstable; urgency=low
* Rebuild to use new libguile6 instead of libguile4.
-- Tyson Dowd <trd@cs.mu.oz.au> Thu, 25 Nov 1999 02:30:33 +1100
gnucash (1.2.3.cvs.19991026-1) unstable; urgency=low
* New upstream version (Update from CVS version).
* Recompile for gnome.
-- Tyson Dowd <trd@cs.mu.oz.au> Thu, 25 Nov 1999 02:30:17 +1100
gnucash (1.2.3-3) unstable; urgency=low
* Add patch for powerpc supplied by
Konstantinos Margaritis <markos@debian.org> (Fixes #39050).
* Add improved documention in description as suggested by
reiter@netspace.net.au (Fixes #45229).
-- Tyson Dowd <trd@cs.mu.oz.au> Tue, 19 Oct 1999 16:37:23 +1000
gnucash (1.2.3-2) unstable; urgency=low
* Compiled against new lesstif package (Fixes #47692).
* Depend on perl-5.005 explicitly (Fixes #43823 and #43822).
-- Tyson Dowd <trd@cs.mu.oz.au> Tue, 19 Oct 1999 08:13:38 +0200
gnucash (1.2.3-1) unstable; urgency=low
* New upstream version.
* Compiled against potato.
-- Tyson Dowd <trd@cs.mu.oz.au> Tue, 10 Aug 1999 01:34:02 +0200
gnucash (1.2.1-1) unstable; urgency=low
* New upstream version.
* Add patch provided by Tomas Pospisek <tpo@spin.ch> to add a
menu entry for gnucash.
-- Tyson Dowd <trd@cs.mu.oz.au> Sat, 17 Jul 1999 17:29:48 -0700
gnucash (1.2.0-1) unstable; urgency=low
* New upstream version.
-- Tyson Dowd <trd@cs.mu.oz.au> Fri, 2 Jul 1999 22:13:58 -0700
gnucash (1.1.27-1) unstable; urgency=low
* New upstream version.
-- Tyson Dowd <trd@cs.mu.oz.au> Tue, 25 May 1999 16:02:44 +1000
gnucash (1.1.26-2) unstable; urgency=low
* Add a few missing dependencies.
-- Tyson Dowd <trd@cs.mu.oz.au> Mon, 15 Mar 1999 14:11:36 +1100
gnucash (1.1.26-1.1) unstable; urgency=low
* debian/rules: converted to debhelper
* debian/copyright: correct FSF address, fix spelling
* debian/control: add Conflicts: and Replaces: for xacc
* debian/control: add Depends: on libwww-perl
* debian/rules: let gnc-prices, gnucash{,.motif} have undocumented(7)
* debian/rules: strip usr/lib/gnucash/gnucash.so
-- Dirk Eddelbuettel <edd@debian.org> Wed, 10 Mar 1999 22:37:37 -0500
gnucash (1.1.26-1) unstable; urgency=low
* Initial Release.
-- Tyson Dowd <trd@cs.mu.oz.au> Wed, 10 Mar 1999 13:00:52 +1100
Local variables:
mode: debian-changelog
End:

20
debian/control vendored
View File

@@ -1,20 +0,0 @@
Source: gnucash
Section: utils
Priority: extra
Maintainer: John Goerzen <jgoerzen@complete.org>
Standards-Version: 3.1.0.0
Build-Depends: libguppi-dev, libguile-dev, libgtkhtml-dev, libxml-dev, libart-dev, libgnome-dev, libgwrapguile-dev, libglib1.2-dev, libghttp-dev, libgal-dev
Package: gnucash
Architecture: any
Depends: ${shlibs:Depends}, libwww-perl, guile1.4-slib
Suggests: gnuplot
Description: A personal finance tracking program.
Gnucash can track finances in multiple accounts, keeping running
and reconciled balances. It has an X based graphical user interface,
double entry, a hierarchy of accounts, expense accounts (categories),
and can import Quicken QIF files.
.
Gnucash is derived from xacc. It adds guile extensibility, and can
produce HTML output. It uses guppi to produce graphs.

15
debian/control_fr vendored
View File

@@ -1,15 +0,0 @@
Source: xacc
Section: utils
Priority: extra
Maintainer: John Goerzen <jgoerzen@complete.org>
Standards-Version: 2.3.0.1
Package: xacc
Architecture: any
Depends: ${shlibs:Depends}
Description: Un programme de suivi de vos finances personnelles.
X-Accountant (Comptable X) permet de suivre vos finances dans des
comptes multiples, utilisant des soldes de rapprochement et actuel.
Il a une interface utilisateur graphique sous X, une double entree,
une hierarchie de comptes, des comptes de depenses (categories),
et peut importer des fichiers QIF de Quicken.

34
debian/copyright vendored
View File

@@ -1,34 +0,0 @@
This is the Debian GNU/Linux prepackaged version of gnucash, an application
to track finances in multiple accounts, keeping running and reconciled
balances. Gnucash was written by Robin D. Clark and Linas Vepstas.
This package was debianized by Tyson Dowd <trd@cs.mu.oz.au> Wed, 10 Mar 1999
13:02:16 +1100. John Goerzen <jgoerzen@complete.org> is the Debian
maintainer effective June 2, 2000. It was downloaded from
ftp://ftp.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/1.3.3/gnucash-1.3.3.tar.gz
Copyright:
Gnucash is under the GNU GPL.
Copyright (C) 1997 Robin D. Clark
Copyright (C) 1997-2002 Linas Vepstas <linas@linas.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.

1
debian/dirs vendored
View File

@@ -1 +0,0 @@
usr/bin

4
debian/gnucash.menu vendored
View File

@@ -1,4 +0,0 @@
?package(gnucash):needs=x11 section=Apps/Tools \
title="GnuCash" \
longtitle="GnuCash personal finance tracking program" \
command="gnucash"

5
debian/postinst vendored
View File

@@ -1,5 +0,0 @@
#!/bin/sh
ldconfig
#DEBHELPER#

93
debian/rules vendored
View File

@@ -1,93 +0,0 @@
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Adapted for gnucash by Dirk Eddelbuettel. March 1999. GPL'ed
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
package=gnucash
id= $(shell pwd)/debian/tmp
AUTOGEN_OPTS = --prefix=/usr \
--sysconfdir=/etc \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
--enable-etags \
--enable-sql \
--enable-debug \
--enable-error-on-warnings
configure: configure.in
./autogen.sh $(AUTOGEN_OPTS)
Makefile.in: Makefile.am
./autogen.sh $(AUTOGEN_OPTS)
Makefile: Makefile.in configure
dh_testdir
$(checkdir)
./autogen.sh $(AUTOGEN_OPTS)
# --enable-efence \
# --enable-profile \
build: build-stamp
build-stamp: Makefile
dh_testdir
$(checkdir)
$(MAKE) check
# touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
-$(MAKE) distclean
-rm `find . -name "*.cache"`
-rm `find . -name "*.log"`
dh_clean
install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
make install prefix=$(id)/usr sysconfdir=$(id)/etc GNC_DOC_INSTALL_DIR=$(id)/usr/share/doc/gnucash infodir=$(id)/usr/share/info mandir=$(id)/usr/share/man
rm -f $(id)/usr/share/doc/gnucash/COPYING.gz
touch install-stamp
binary-indep: build install
binary-arch: build install
# dh_testversion
dh_testdir
dh_testroot
dh_installdocs
dh_installexamples doc/examples/*.xac
dh_installmenu
# dh_installemacsen
# dh_installinit
dh_installcron
dh_installmanpages
# dh_undocumented gnc-prices.1 gnucash.1x gnucash.motif.1x
dh_installchangelogs ChangeLog
# dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
# dh_makeshlibs
dh_md5sums
dh_builddeb
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install

View File

@@ -208,7 +208,7 @@ src/engine/qofid.c
src/engine/qofobject.c
src/engine/qofquery.c
src/engine/qofquerycore.c
src/engine/qofqueryobject.c
src/engine/qofclass.c
src/engine/qofsession.c
src/engine/test/test-commodities.c
src/engine/test/test-date.c

View File

@@ -1,70 +0,0 @@
/********************************************************************\
* AccWindow.h -- window for creating new accounts for GnuCash *
* Copyright (C) 1997 Robin D. Clark *
* Copyright (C) 2000 Dave Peticolas *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, write to the Free Software *
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
* *
* Author: Rob Clark *
* Internet: rclark@cs.hmc.edu *
* Address: 609 8th Street *
* Huntington Beach, CA 92648-4632 *
\********************************************************************/
#ifndef ACC_WINDOW_H
#define ACC_WINDOW_H
#include "config.h"
#include "Account.h"
#include "Group.h"
/** PROTOTYPES ******************************************************/
typedef struct _AccountWindow AccountWindow;
AccountWindow * gnc_ui_new_account_window (AccountGroup *group);
AccountWindow * gnc_ui_new_account_window_with_default(AccountGroup *group,
Account * parent);
AccountWindow * gnc_ui_edit_account_window (Account *account);
/**
* @param unused The AccountGroup to create in; this isn't used.
* @param valid_types A GList of GNCAccountType gints [as pointers] which are
* allowed to be created. Unlike below, this function makes a copy of the
* valid_types list.
**/
AccountWindow * gnc_ui_new_account_with_types( AccountGroup *unused,
GList *valid_types );
Account * gnc_ui_new_accounts_from_name_window (const char *name);
/* Note that the caller owns the valid_types list */
Account * gnc_ui_new_accounts_from_name_window_with_types (const char *name,
GList *valid_types);
/* Notes:
-the caller owns the valid_types list
-the parent parameter has priority over the eventual account path in the name
-all parameters can be NULL
*/
Account * gnc_ui_new_accounts_from_name_with_defaults (const char *name,
GList *valid_types,
gnc_commodity * default_commodity,
Account * parent);
void gnc_ui_set_default_new_account_currency (const char *currency);
#endif /* ACC_WINDOW_H */

View File

@@ -36,7 +36,6 @@ SUBDIRS = $(NONGUI_SUBDIRS) report
endif
noinst_HEADERS = \
AccWindow.h \
RecnWindow.h \
gnc-ui.h

View File

@@ -18,6 +18,7 @@ libgncmod_app_utils_la_SOURCES = \
gfec.c \
global-options.c \
gnc-component-manager.c \
gnc-err-popup.c \
gnc-euro.c \
gnc-exp-parser.c \
gnc-gettext-util.c \
@@ -33,6 +34,7 @@ gncinclude_HEADERS = \
gfec.h \
global-options.h \
gnc-component-manager.h \
gnc-err-popup.h \
gnc-euro.h \
gnc-exp-parser.h \
gnc-gettext-util.h \