diff --git a/ChangeLog b/ChangeLog index 6be3b4bc9..f5436c16f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-11-12 Don Allingham + * src/FamilyView.py: Change column sizes on the FamilyView to + fit with the new column + 2003-11-12 Alex Roitman * src/Utils.py (bold_label, unbold label): Add functions. * src/EditPerson.py (bold_label, unbold label): Remove functions; diff --git a/Makefile.in b/Makefile.in index d5ad25cc2..2568c7424 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,6 +62,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/configure b/configure index a6292e2b4..193526d4a 100755 --- a/configure +++ b/configure @@ -273,7 +273,7 @@ PACKAGE_STRING='gramps 0.98.0' PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net' ac_unique_file="src/gramps.py" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot RELEASE VERSIONSTRING MSGFMT MSGCONV LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot RELEASE VERSIONSTRING MSGFMT MSGCONV ICONV LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1724,6 +1724,45 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "iconv", so it can be a program name with args. +set dummy iconv; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ICONV+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ICONV in + [\\/]* | ?:[\\/]*) + ac_cv_path_ICONV="$ICONV" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ICONV="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +ICONV=$ac_cv_path_ICONV + +if test -n "$ICONV"; then + echo "$as_me:$LINENO: result: $ICONV" >&5 +echo "${ECHO_T}$ICONV" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + LANGUAGES="hu zh_CN cs da_DK de es fr it nl pl pt_BR ro ru sv" @@ -4039,6 +4078,7 @@ s,@RELEASE@,$RELEASE,;t t s,@VERSIONSTRING@,$VERSIONSTRING,;t t s,@MSGFMT@,$MSGFMT,;t t s,@MSGCONV@,$MSGCONV,;t t +s,@ICONV@,$ICONV,;t t s,@LANGUAGES@,$LANGUAGES,;t t s,@POFILES@,$POFILES,;t t s,@MOFILES@,$MOFILES,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index b45aca1d0..9d8ef70c3 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -62,6 +62,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/doc/gramps-manual/C/Makefile.in b/doc/gramps-manual/C/Makefile.in index 579c37545..56bd3dcc7 100644 --- a/doc/gramps-manual/C/Makefile.in +++ b/doc/gramps-manual/C/Makefile.in @@ -122,6 +122,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/doc/gramps-manual/Makefile.in b/doc/gramps-manual/Makefile.in index 3d75d99e2..269890c63 100644 --- a/doc/gramps-manual/Makefile.in +++ b/doc/gramps-manual/Makefile.in @@ -62,6 +62,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/example/Makefile.in b/example/Makefile.in index cc35d223f..fedf4ff9d 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -60,6 +60,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/example/gramps/Makefile.in b/example/gramps/Makefile.in index 47fe3e2e5..932385537 100644 --- a/example/gramps/Makefile.in +++ b/example/gramps/Makefile.in @@ -61,6 +61,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/gramps.spec b/gramps.spec index 80e8b4d45..1661a7798 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,5 +1,5 @@ %define ver 0.98.0 -%define rel 0.CVS20031013 +%define rel 0.CVS20031112 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/src/Makefile.in b/src/Makefile.in index d991daf17..e1c6b463f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -62,6 +62,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -158,7 +159,6 @@ pkgpython_PYTHON = \ Date.py\ DbPrompter.py\ DisplayTrace.py\ - DrawDoc.py\ EditPerson.py\ EditPlace.py\ EditSource.py\ @@ -199,7 +199,6 @@ pkgpython_PYTHON = \ PlaceView.py\ Plugins.py\ QuestionDialog.py\ - QuickAdd.py\ ReadXML.py\ Relationship.py\ RelImage.py\ @@ -216,7 +215,6 @@ pkgpython_PYTHON = \ StyleEditor.py\ SubstKeywords.py\ TarFile.py\ - TextDoc.py\ UrlEdit.py\ Utils.py\ VersionControl.py\ @@ -643,6 +641,7 @@ install-data-local: uninstall-local: -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png -rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop + -rm $(DESTDIR)$(pkglibdir)/grampslib.so # 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/src/calendars/Makefile.in b/src/calendars/Makefile.in index 2e917ea66..dac6dda45 100644 --- a/src/calendars/Makefile.in +++ b/src/calendars/Makefile.in @@ -65,6 +65,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/src/data/Makefile.in b/src/data/Makefile.in index 99e35a5d7..6897e4b4c 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -60,6 +60,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/src/data/templates/Makefile.in b/src/data/templates/Makefile.in index 64952f013..41c44cf23 100644 --- a/src/data/templates/Makefile.in +++ b/src/data/templates/Makefile.in @@ -61,6 +61,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/src/docgen/Makefile.in b/src/docgen/Makefile.in index d37a96ffa..a5427b198 100644 --- a/src/docgen/Makefile.in +++ b/src/docgen/Makefile.in @@ -64,6 +64,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in index 7c0d31d89..e792cece7 100644 --- a/src/filters/Makefile.in +++ b/src/filters/Makefile.in @@ -60,6 +60,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 15f24dc2e..f1ffb129c 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -61,6 +61,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/src/po/Makefile.in b/src/po/Makefile.in index ec82859a3..91cb019c3 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -60,6 +60,7 @@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ +ICONV = @ICONV@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -288,12 +289,12 @@ uninstall-local: done .po.mo: - @MSGCONV@ --to-code=UTF-8 $< -o temp.po + $(MSGCONV) --to-code=UTF-8 $< -o temp.po $(MSGFMT) -v temp.po -o $@ rm temp.po zh_CN.mo: $(top_srcdir)/src/po/zh_CN.po - iconv --from-code=GB2312 --to-code=UTF-8 $< -o temp.po + $(ICONV) -f GB2312 -t UTF-8 $< > temp.po $(MSGFMT) -v temp.po -o $@ rm temp.po # Tell versions [3.59,3.63) of GNU make to not export all variables.