diff --git a/Makefile.in b/Makefile.in index eefe93302..fea5f7cff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -425,8 +425,6 @@ info: info-recursive info-am: install-data-am: - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-exec-am: install-binSCRIPTS @@ -445,7 +443,7 @@ mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-local +uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-info: uninstall-info-recursive @@ -463,7 +461,7 @@ uninstall-info: uninstall-info-recursive maintainer-clean-recursive mostlyclean mostlyclean-generic \ mostlyclean-recursive tags tags-recursive uninstall \ uninstall-am uninstall-binSCRIPTS uninstall-info-am \ - uninstall-info-recursive uninstall-local uninstall-recursive + uninstall-info-recursive uninstall-recursive gramps: gramps.sh @@ -471,16 +469,6 @@ gramps: gramps.sh dist-hook: gramps.spec cp gramps.spec $(distdir) - -# Build/rebuild the catalog -install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log - -# Remove generated files -uninstall-local: - -rm -rf $(DESTDIR)$(gramps_localstate_dir) - -rm -f $(DESTDIR)$(localstatedir)/log/gramps.log - -rm -f $(DESTDIR)$(localstatedir)/log/gramps.log.1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/NEWS b/NEWS index a43b73b7b..032d645ea 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,8 @@ Version 0.9.2 and Show uncollected objects. * Option to fix missing media files during Check and Repair. * Long-awaited Export to CD. +* Added support for AbiWord 1.9 or greater, AbiWord 1.9+ supports tables, + allowing a greater range of reports to be supported. * Save confirmation on Help->Open Example and File->New. * Command-line options (-i -o -f -a) support is added in its experimental stage. Please try hard to break it and report to gramps-devel. diff --git a/configure b/configure index a48397eb4..b90c1b1e9 100755 --- a/configure +++ b/configure @@ -1642,7 +1642,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -RELEASE=rc1 +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" @@ -1811,13 +1811,12 @@ else echo "${ECHO_T}no" >&6 fi - am_display_PYTHON=$am_cv_pathless_PYTHON fi - echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON version" >&5 +echo $ECHO_N "checking for $am_cv_pathless_PYTHON version... $ECHO_C" >&6 if test "${am_cv_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1835,8 +1834,8 @@ echo "${ECHO_T}$am_cv_python_version" >&6 - echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_cv_pathless_PYTHON platform... $ECHO_C" >&6 if test "${am_cv_python_platform+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1850,15 +1849,34 @@ echo "${ECHO_T}$am_cv_python_platform" >&6 - pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages + echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 +if test "${am_cv_python_pythondir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +fi +echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +echo "${ECHO_T}$am_cv_python_pythondir" >&6 + pythondir=$am_cv_python_pythondir pkgpythondir=\${pythondir}/$PACKAGE - - pyexecdir=${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages + echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 +if test "${am_cv_python_pyexecdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || + echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` +fi +echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 + pyexecdir=$am_cv_python_pyexecdir @@ -4170,7 +4188,7 @@ SCROLLKEEPER_BUILD_REQUIRED=0.3.5 - ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile example/Makefile example/gramps/Makefile gramps.spec gramps.sh" + ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile example/Makefile example/gramps/Makefile gramps.spec gramps.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/doc/gramps.1 b/doc/gramps.1 index add8798b5..068495d8b 100644 --- a/doc/gramps.1 +++ b/doc/gramps.1 @@ -1,49 +1,122 @@ -.TH gramps 1 "0.9.1" "man page by Brandon L. Griffith" "" -.SH "NAME" -.LP -gramps \- Genealogical Research and Analysis Management Programming System -.SH "SYNTAX" -.LP -gramps [\fIDatabase\fP] +.TH gramps 1 "0.9.1" "May 2003" "0.9.1" +.SH NAME +gramps \- Genealogical Research and Analysis Management Programming System. + +.SH SYNOPSIS +.B gramps +.RB [ \-\^\-help ] +.RB [ \-\^\-version ] +.RB [ \-i +.IR FILENAME +.RB [ \-f +.IR FORMAT ]] +.RB [ \-i +.IR ... ] +.RB [ \-o +.IR FILENAME +.RB [ \-f +.IR FORMAT ]] +.RB [ \-a +.IR ACTION ] + +.SH DESCRIPTION +.PP +\fIGramps\fP is an open source genealogy program. It is written in Python, +using the GTK/GNOME interface. .br -Currently \fBgramps\fR does not require any command line arguments. -However, if provided, it is the path to either a gramps database or a GEDCOM -file to be imported. -.SH "DESCRIPTION" -.LP -Gramps is an open source genealogy program. It is written in Python, using the GTK/GNOME interface. +Gramps should seem familiar to anyone who has used other geneology programs +before such as \fIFamily Tree Maker for Windows(TM)\fR or the GNU Geneweb. .br -Gramps should seem familiar to anyone who has used other geneology programs before such as \fIFamily Tree Maker for Windows(TM)\fR or the GNU Geneweb. -.br -It supports importing of the ever popular GEDCOM format which is used world wide by almost all other geneology software. -.SH "Concepts" -Supports a python\-based plugin system, allowing import and export writers, report generators, tools, and display filters to be added without modification of the main program. +It supports importing of the ever popular GEDCOM format which is used world +wide by almost all other geneology software. + +.SH OPTIONS +.TP +.BI \-f " FORMAT" +Explicitly specify format of the filename. If this option is not given, the +format of each file is guessed according to its extension. Formats available +for import are \fBgramps\fR, \fBgedcom\fR, and \fBgramps\-pkg\fR. Formats +available for export are \fBgramps\fR, \fBgedcom\fR, \fBgramps\-pkg\fR, +and \fBiso\fR. + +.TP +.BI \-i " FILENAME" +Import data from \fIFILENAME\fR. For \fBgramps\fR format, the \fIFILENAME\fR +is actually the name of directory under which the gramps database resides. +For \fBgedcom\fR and \fBgramps\-pkg\fR, the \fIFILENAME\fR is the name of +the corresponding file. +.br +When more than one file is given, each has to be preceded by \fB\-i\fR flag. +The files are imported in the specified order, +i.e. \fB\-i\fR \fIFILE1\fR \fB\-i\fR \fIFILE2\fR +and \fB\-i\fR \fIFILE2\fR \fB\-i\fR \fIFILE1\fR might produce different +gramps IDs in the resulting database. + +.TP +.BI \-o " FILENAME" +Export data into \fIFILENAME\fR. For \fBgramps\fR and \fBiso\fR formats, the +\fIFILENAME\fR is actually the name of directory the gramps database will be +written into. For \fBgedcom\fR and \fBgramps\-pkg\fR, the \fIFILENAME\fR +is the name of the resulting file. + +.TP +.BI \-a " ACTION" +Perform \fIACTION\fR on the imported data. This is done after all imports +are succesfully completed. Available actions are \fBsummary\fR (same as +Reports->View->Summary menu item) and \fBcheck\fR (same +as Tools->Database Processing->Check and repair). + +.LP +If no \fB\-o\fR or \fB\-a\fR options are given, gramps will launch its main +window and start the usual interactive session with the database resulted +from all imports. This database resides under \fB~/.gramps/import\fR directory. + +.LP +The error encountered during import, export, or action, will be either +dumped to \fIstdout\fR (if these are exceptions handled by gramps) or or +to \fIstderr\fR (if these are not handled). Use usual shell redirections +of \fIstdout\fR and \fIstderr\fR to save messages and errors in files. + +.SH CONCEPTS +Supports a python\-based plugin system, allowing import and export writers, +report generators, tools, and display filters to be added without modification +of the main program. .LP Data is stored in an gzip'ed XML format .LP -Instead of generating direct printer output, report generators target other systems, such as \fIOpen Office\fR, \fIAbiWord\fR, HTML or LaTeX to allow the user to modify the format to suit his or her needs. -.SH "FILES" +Instead of generating direct printer output, report generators target other +systems, such as \fIOpen Office\fR, \fIAbiWord\fR, HTML or LaTeX to allow the +user to modify the format to suit his or her needs. + +.SH FILES .LP \fI${PREFIX}/bin/gramps\fP .br \fI${PREFIX}/share/gramps\fP .br \fI${HOME}/.gramps\fP -.SH "Authors" -Donald Allingham \fI\fR + +.SH AUTHORS +Donald Allingham \fI\fR .br \fIhttp://gramps.sourceforge.net\fR .LP -This manpage was written by: +This manpage was originally written by: .br Brandon L. Griffith \fI\fR +.br +for inclusion in the Debian GNU/Linux system. +.LP +This manpage is currently maintained by: .br -Any ammendants or errors should be reported to him. +Alex Roitman \fI\fR .br -It was originally written for inclusion in the Debian GNU/Linux system. -.SH "DOCUMENTATION" -See also the file \fBgramps.sgml\fR -.br -On a Debian system this can be found in \fI/usr/doc/gramps\fR -.br -Or in the doc directory of the official source distribution. + +.SH DOCUMENTATION +The user documentation is available through standard GNOME Help browser +in the form of Gramps Manual. This manual is also available in XML format +as \fBgramps-manual.xml\fR under \fIdoc/gramps-manual/$LANG\fR in the official +source distribution. +.LP +The developer documentation can be found in the \fBDocs\fR section +of \fIhttp://sourceforge.net/project/gramps\fR site. diff --git a/gramps.spec b/gramps.spec index 2bbfc7dd6..7cd6c550c 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,5 +1,5 @@ %define ver 0.9.1 -%define rel rc1 +%define rel 1 %define prefix /usr Summary: Genealogical Research and Analysis Management Programming System. diff --git a/src/Makefile.in b/src/Makefile.in index 48822b80d..d7515593f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -115,7 +115,7 @@ SUBDIRS = docgen filters plugins data po calendars GVFSINC = @GPREF@ CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@ LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@ -CLEANFILES = ${INTLLIBS} +CLEANFILES = ${INTLLIBS} grampslib.so MOSTLYCLEANFILES = diff --git a/src/docgen/AbiWordDoc.py b/src/docgen/AbiWordDoc.py index a8b6353bd..15382c1c0 100644 --- a/src/docgen/AbiWordDoc.py +++ b/src/docgen/AbiWordDoc.py @@ -336,4 +336,4 @@ class AbiWordDoc(TextDoc.TextDoc): self.cdata = self.cdata + "" self.cdatalist.append(self.cdata) -Plugins.register_text_doc(_("AbiWord"),AbiWordDoc,1,1,1,".abw") +Plugins.register_text_doc(_("AbiWord (version 1.0.x)"),AbiWordDoc,1,1,1,".abw") diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py index 2f570dadc..dd288590c 100644 --- a/src/docgen/OpenOfficeDoc.py +++ b/src/docgen/OpenOfficeDoc.py @@ -336,15 +336,15 @@ class OpenOfficeDoc(TextDoc.TextDoc): def _write_styles_file(self): self.styles_xml = tempfile.mktemp() - + try: self.f = open(self.styles_xml,"wb") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.styles_xml, msg) raise Errors.ReportError(errmsg) except: - raise Errors.ReportError((_("Could not create %s") % self.styles_xml) - + raise Errors.ReportError(_("Could not create %s") % self.styles_xml) + self.f.write('\n') self.f.write('