svn: r2628
This commit is contained in:
Don Allingham 2004-01-12 03:36:24 +00:00
parent 0e490d6bde
commit 612d22e8e8
13 changed files with 12 additions and 55 deletions

View File

@ -1,3 +1,10 @@
2004-01-11 Don Allingham <dallingham@users.sourceforge.net>
* src/Makefile.am: export papersize.xml
* src/RelLib.py: Don't call setAncestor if default person is None
* src/gramps_main.py: remove children out of alternate families
when deleting a person, set default person to None if deleting the
default person.
2004-01-10 Don Allingham <dallingham@users.sourceforge.net> 2004-01-10 Don Allingham <dallingham@users.sourceforge.net>
* configure.in: fix gnome-python-vfs error message * configure.in: fix gnome-python-vfs error message
* src/docgen/OpenOfficeDoc.py: proper handling of center_text * src/docgen/OpenOfficeDoc.py: proper handling of center_text

View File

@ -97,7 +97,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

47
configure vendored
View File

@ -273,7 +273,7 @@ PACKAGE_STRING='gramps 1.0.0'
PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net' PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net'
ac_unique_file="src/gramps.py" 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 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_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 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='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1996,46 +1996,6 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
# Extract the first word of "swig", so it can be a program name with args.
set dummy swig; 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_SWIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $SWIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_SWIG="$SWIG" # 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_SWIG="$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
SWIG=$ac_cv_path_SWIG
if test -n "$SWIG"; then
echo "$as_me:$LINENO: result: $SWIG" >&5
echo "${ECHO_T}$SWIG" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
# Extract the first word of "zip", so it can be a program name with args. # Extract the first word of "zip", so it can be a program name with args.
set dummy zip; ac_word=$2 set dummy zip; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5 echo "$as_me:$LINENO: checking for $ac_word" >&5
@ -3293,9 +3253,9 @@ rm -f conftest.out conftest.py
if test YES != "$has_vfs" if test YES != "$has_vfs"
then then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
**** The python bindings for GNOME canvas (gnome-python2-canvas) could not be found." >&5 **** The python bindings for GNOME canvas (gnome-python2-vfs) could not be found." >&5
echo "$as_me: error: echo "$as_me: error:
**** The python bindings for GNOME canvas (gnome-python2-canvas) could not be found." >&2;} **** The python bindings for GNOME canvas (gnome-python2-vfs) could not be found." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
echo "$as_me:$LINENO: result: ok" >&5 echo "$as_me:$LINENO: result: ok" >&5
@ -4125,7 +4085,6 @@ s,@pkgpythondir@,$pkgpythondir,;t t
s,@pyexecdir@,$pyexecdir,;t t s,@pyexecdir@,$pyexecdir,;t t
s,@pkgpyexecdir@,$pkgpyexecdir,;t t s,@pkgpyexecdir@,$pkgpyexecdir,;t t
s,@BINSH@,$BINSH,;t t s,@BINSH@,$BINSH,;t t
s,@SWIG@,$SWIG,;t t
s,@ZIP@,$ZIP,;t t s,@ZIP@,$ZIP,;t t
s,@CC@,$CC,;t t s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t s,@CFLAGS@,$CFLAGS,;t t

View File

@ -97,7 +97,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -157,7 +157,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -97,7 +97,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -157,7 +157,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -157,7 +157,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -157,7 +157,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -95,7 +95,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -96,7 +96,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SK_CONFIG = @SK_CONFIG@ SK_CONFIG = @SK_CONFIG@
STRIP = @STRIP@ STRIP = @STRIP@
SWIG = @SWIG@
VERSION = @VERSION@ VERSION = @VERSION@
VERSIONSTRING = @VERSIONSTRING@ VERSIONSTRING = @VERSIONSTRING@
ZIP = @ZIP@ ZIP = @ZIP@

View File

@ -1,5 +1,5 @@
%define ver 1.0.0 %define ver 1.0.0
%define rel 0.CVS20040101 %define rel 0.CVS20040110
%define prefix /usr %define prefix /usr
%define localstatedir /var/lib %define localstatedir /var/lib
# Ensure that internal RPM macros for configure & makeinstall # Ensure that internal RPM macros for configure & makeinstall

View File

@ -264,7 +264,7 @@ GRAPHICS = \
# Other stuff that we need to install # Other stuff that we need to install
dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop papersize.xml
EXTRA_DIST = grampslib.i grampslib_wrap.c EXTRA_DIST = grampslib.i grampslib_wrap.c
subdir = src subdir = src