update
svn: r2329
This commit is contained in:
		@@ -1,3 +1,7 @@
 | 
			
		||||
2003-11-12  Don Allingham  <dallingham@users.sourceforge.net>
 | 
			
		||||
	* src/FamilyView.py: Change column sizes on the FamilyView to
 | 
			
		||||
	fit with the new column
 | 
			
		||||
 | 
			
		||||
2003-11-12  Alex Roitman  <shura@alex.neuro.umn.edu>
 | 
			
		||||
	* src/Utils.py (bold_label, unbold label): Add functions.
 | 
			
		||||
	* src/EditPerson.py (bold_label, unbold label): Remove functions; 
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										42
									
								
								gramps2/configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										42
									
								
								gramps2/configure
									
									
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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 
 | 
			
		||||
 
 | 
			
		||||
@@ -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:
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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@
 | 
			
		||||
 
 | 
			
		||||
@@ -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.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user