* src/gramps.glade: Remove hot keys from toolbar buttons.
Add editing items under Edit menu. * src/gramps_main.py: Enable/disable new menu items. * NEWS, configure, configure.in, gramps.spec, doc/gramps.1, doc/gramps-manual/C/gramps-manual-C.omf, doc/gramps-manual/C/gramps-manual.xml: merge with 0.9.5 branch. * Version 0.9.5: the "Fix me up" release. * src/gramps_main.py (delete_person_response, merge_update): Add remove_from_history and redraw_histmenu() calls before deleting the person. * doc/gramps.1.in, doc/gramps.1, doc/gramps-manual/C/gramps-manual.xml, doc/gramps-manual/C/gramps-manual.omf, gramps.spec: New version. * configure.in: Fix version and release numbers for 0.9.5-1. * NEWS: Update for a 0.9.5 release. svn: r2222
This commit is contained in:
Alex Roitman
65
configure
vendored
65
configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.57 for gramps 0.9.4.
|
||||
# Generated by GNU Autoconf 2.57 for gramps 0.9.5.
|
||||
#
|
||||
# Report bugs to <gramps-bugs@lists.sourceforge.net>.
|
||||
#
|
||||
@@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='gramps'
|
||||
PACKAGE_TARNAME='gramps'
|
||||
PACKAGE_VERSION='0.9.4'
|
||||
PACKAGE_STRING='gramps 0.9.4'
|
||||
PACKAGE_VERSION='0.9.5'
|
||||
PACKAGE_STRING='gramps 0.9.5'
|
||||
PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net'
|
||||
|
||||
ac_unique_file="src/gramps.py"
|
||||
@@ -738,7 +738,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures gramps 0.9.4 to adapt to many kinds of systems.
|
||||
\`configure' configures gramps 0.9.5 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -800,7 +800,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of gramps 0.9.4:";;
|
||||
short | recursive ) echo "Configuration of gramps 0.9.5:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -877,14 +877,14 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
|
||||
else
|
||||
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
||||
fi
|
||||
cd $ac_popdir
|
||||
cd "$ac_popdir"
|
||||
done
|
||||
fi
|
||||
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
gramps configure 0.9.4
|
||||
gramps configure 0.9.5
|
||||
generated by GNU Autoconf 2.57
|
||||
|
||||
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
|
||||
@@ -899,7 +899,7 @@ cat >&5 <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by gramps $as_me 0.9.4, which was
|
||||
It was created by gramps $as_me 0.9.5, which was
|
||||
generated by GNU Autoconf 2.57. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -1076,7 +1076,7 @@ _ASBOX
|
||||
echo "$as_me: caught signal $ac_signal"
|
||||
echo "$as_me: exit $exit_status"
|
||||
} >&5
|
||||
rm -f core core.* *.core &&
|
||||
rm -f core *.core &&
|
||||
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
|
||||
exit $exit_status
|
||||
' 0
|
||||
@@ -1490,7 +1490,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE=gramps
|
||||
VERSION=0.9.4
|
||||
VERSION=0.9.5
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@@ -1616,7 +1616,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
||||
|
||||
|
||||
|
||||
RELEASE=0.CVS$(head -c 10 ChangeLog | tr -d '-')
|
||||
RELEASE=1.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
|
||||
|
||||
VERSIONSTRING=$VERSION
|
||||
if test x"$RELEASE" != "x"
|
||||
@@ -1821,12 +1821,13 @@ else
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
am_display_PYTHON=$am_cv_pathless_PYTHON
|
||||
fi
|
||||
|
||||
|
||||
|
||||
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
|
||||
echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
|
||||
echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6
|
||||
if test "${am_cv_python_version+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
@@ -1844,8 +1845,8 @@ echo "${ECHO_T}$am_cv_python_version" >&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
|
||||
echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
|
||||
echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6
|
||||
if test "${am_cv_python_platform+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
@@ -1859,34 +1860,15 @@ echo "${ECHO_T}$am_cv_python_platform" >&6
|
||||
|
||||
|
||||
|
||||
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
|
||||
pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
|
||||
|
||||
|
||||
|
||||
pkgpythondir=\${pythondir}/$PACKAGE
|
||||
|
||||
|
||||
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
|
||||
|
||||
pyexecdir=${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
|
||||
|
||||
|
||||
|
||||
@@ -2786,8 +2768,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
for ac_declaration in \
|
||||
''\
|
||||
'#include <stdlib.h>' \
|
||||
'' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
@@ -2801,8 +2782,8 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <stdlib.h>
|
||||
$ac_declaration
|
||||
#include <stdlib.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -3694,7 +3675,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by gramps $as_me 0.9.4, which was
|
||||
This file was extended by gramps $as_me 0.9.5, which was
|
||||
generated by GNU Autoconf 2.57. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -3752,7 +3733,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
gramps config.status 0.9.4
|
||||
gramps config.status 0.9.5
|
||||
configured by $0, generated by GNU Autoconf 2.57,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user