svn: r2109
This commit is contained in:
Don Allingham 2003-09-09 01:48:50 +00:00
parent 718a68ea33
commit 4ba080738c
5 changed files with 18 additions and 14 deletions

View File

@ -1,3 +1,7 @@
2003-09-08 Don Allingham <dallingham@users.sourceforge.net>
* src/GenericFilter.py: handle the possibility of missing
"inclusive" settings, assuming that it is 1 if not present.
2003-09-08 Tim Waugh <twaugh@redhat.com> 2003-09-08 Tim Waugh <twaugh@redhat.com>
* src/Makefile.am: Ship SelectObject.py. * src/Makefile.am: Ship SelectObject.py.

22
gramps2/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for gramps 0.9.3. # Generated by GNU Autoconf 2.57 for gramps 0.9.4.
# #
# Report bugs to <gramps-bugs@lists.sourceforge.net>. # Report bugs to <gramps-bugs@lists.sourceforge.net>.
# #
@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='gramps' PACKAGE_NAME='gramps'
PACKAGE_TARNAME='gramps' PACKAGE_TARNAME='gramps'
PACKAGE_VERSION='0.9.3' PACKAGE_VERSION='0.9.4'
PACKAGE_STRING='gramps 0.9.3' PACKAGE_STRING='gramps 0.9.4'
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"
@ -738,7 +738,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures gramps 0.9.3 to adapt to many kinds of systems. \`configure' configures gramps 0.9.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -800,7 +800,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of gramps 0.9.3:";; short | recursive ) echo "Configuration of gramps 0.9.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -884,7 +884,7 @@ fi
test -n "$ac_init_help" && exit 0 test -n "$ac_init_help" && exit 0
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
gramps configure 0.9.3 gramps configure 0.9.4
generated by GNU Autoconf 2.57 generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 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 This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by gramps $as_me 0.9.3, which was It was created by gramps $as_me 0.9.4, which was
generated by GNU Autoconf 2.57. Invocation command line was generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@ $ $0 $@
@ -1490,7 +1490,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=gramps PACKAGE=gramps
VERSION=0.9.3 VERSION=0.9.4
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -1616,7 +1616,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
RELEASE=0.CVS$(date +%G%m%d) RELEASE=0.CVS$(head -c 10 ChangeLog | tr -d '-')
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"
@ -3694,7 +3694,7 @@ _ASBOX
} >&5 } >&5
cat >&5 <<_CSEOF cat >&5 <<_CSEOF
This file was extended by gramps $as_me 0.9.3, which was This file was extended by gramps $as_me 0.9.4, which was
generated by GNU Autoconf 2.57. Invocation command line was generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -3752,7 +3752,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
gramps config.status 0.9.3 gramps config.status 0.9.4
configured by $0, generated by GNU Autoconf 2.57, configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -1,5 +1,5 @@
%define ver 0.9.3 %define ver 0.9.4
%define rel 0.CVS20030902 %define rel 0.CVS20030907
%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

@ -124,6 +124,7 @@ pkgpython_PYTHON = \
ansel_utf8.py\ ansel_utf8.py\
AttrEdit.py\ AttrEdit.py\
AutoComp.py\ AutoComp.py\
BaseDoc.py\
Bookmarks.py\ Bookmarks.py\
Calendar.py\ Calendar.py\
ChooseParents.py\ ChooseParents.py\

View File

@ -292,7 +292,6 @@ class PdfDoc(BaseDoc.BaseDoc):
act_width = x_cm/ratio act_width = x_cm/ratio
self.story.append(Spacer(1,0.5*cm)) self.story.append(Spacer(1,0.5*cm))
print Image
self.story.append(Image(name,act_width*cm,act_height*cm)) self.story.append(Image(name,act_width*cm,act_height*cm))
self.story.append(Spacer(1,0.5*cm)) self.story.append(Spacer(1,0.5*cm))
self.image = 1 self.image = 1