2007-10-09 Don Allingham <don@gramps-project.org>

* src/GrampsDb/Makefile.am: update
	* src/gen/db/Makefile.am: update
	* src/gen/lib/primaryobj.py: remove MarkupText dependency
	* src/Makefile.am: remove RelLib
	* po/POTFILES.in: update



svn: r9121
This commit is contained in:
Don Allingham 2007-10-10 03:41:44 +00:00
parent 3bc809c61b
commit 5c5022e2cd
8 changed files with 123 additions and 110 deletions

View File

@ -1,3 +1,10 @@
2007-10-09 Don Allingham <don@gramps-project.org>
* src/GrampsDb/Makefile.am: update
* src/gen/db/Makefile.am: update
* src/gen/lib/primaryobj.py: remove MarkupText dependency
* src/Makefile.am: remove RelLib
* po/POTFILES.in: update
2007-10-09 Alex Roitman <shura@gramps-project.org>
* configure.in: remove obsolete RelLib/Makefile.in

32
config.guess vendored
View File

@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
timestamp='2006-07-02'
timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
i*:MINGW*:*)
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
xtensa:Linux:*:*)
echo xtensa-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
SX-7:SUPER-UX:*:*)
echo sx7-nec-superux${UNAME_RELEASE}
exit ;;
SX-8:SUPER-UX:*:*)
echo sx8-nec-superux${UNAME_RELEASE}
exit ;;
SX-8R:SUPER-UX:*:*)
echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;

16
config.sub vendored
View File

@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
timestamp='2006-09-20'
timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore \
| maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@ -925,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
sh5el)
basic_machine=sh5le-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
@ -1219,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@ -1414,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
mep-*)
os=-elf
;;
mips*-cisco)
os=-elf
;;

View File

@ -191,18 +191,12 @@ src/Editors/_EditUrl.py
src/Editors/__init__.py
# GrampsDb package
src/GrampsDb/_DbUtils.py
src/GrampsDb/_GrampsBSDDB.py
src/GrampsDb/_GrampsDbBase.py
src/GrampsDb/_GrampsDBCallback.py
src/GrampsDb/_GrampsDBDir.py
src/GrampsDb/_GrampsDbExceptions.py
src/GrampsDb/_GrampsDbFactories.py
src/GrampsDb/_GrampsDbWriteXML.py
src/GrampsDb/_GrampsGEDDB.py
src/GrampsDb/_GrampsInMemDB.py
src/GrampsDb/_GrampsXMLDB.py
src/GrampsDb/_ProgressMonitor.py
src/GrampsDb/__init__.py
# GrampsDbUtils package
@ -243,36 +237,6 @@ src/Mime/_GnomeMime.py
src/Mime/__init__.py
src/Mime/_PythonMime.py
# Models package
# src/Models/_FastFilterModel.py
# src/Models/_FastModel.py
# src/Models/__init__.py
# src/Models/_ListCursor.py
# src/Models/_PathCursor.py
# src/Models/_PersonFilterModel.py
# src/Models/_PersonListModel.py
# src/Models/_PersonTreeModel.py
# ObjectSelector package
# src/ObjectSelector/_Constants.py
# src/ObjectSelector/_Factories.py
# src/ObjectSelector/_FamilyFilterFrame.py
# src/ObjectSelector/_FamilyFrame.py
# src/ObjectSelector/_FamilyPreviewFrame.py
# src/ObjectSelector/_FamilyTreeFrame.py
# src/ObjectSelector/_FilterFrameBase.py
# src/ObjectSelector/_FilterSpecBase.py
# src/ObjectSelector/__init__.py
# src/ObjectSelector/_ObjectFrameBase.py
# src/ObjectSelector/_ObjectSelectorWindow.py
# src/ObjectSelector/_PersonFilterFrame.py
# src/ObjectSelector/_PersonFilterSpec.py
# src/ObjectSelector/_PersonFrame.py
# src/ObjectSelector/_PersonPreviewFrame.py
# src/ObjectSelector/_PersonTreeFrame.py
# src/ObjectSelector/_PreviewFrameBase.py
# src/ObjectSelector/_TreeFrameBase.py
# Selectors package
src/Selectors/_BaseSelector.py
src/Selectors/_SelectEvent.py
@ -393,61 +357,81 @@ src/ReportBase/_TemplateParser.py
src/ReportBase/_TextFormatComboBox.py
src/ReportBase/_TextReportDialog.py
# RelLib package
src/RelLib/_AddressBase.py
src/RelLib/_Address.py
src/RelLib/_AttributeBase.py
src/RelLib/_Attribute.py
src/RelLib/_AttributeType.py
src/RelLib/_BaseObject.py
src/RelLib/_CalSdn.py
src/RelLib/_ChildRefType.py
src/RelLib/_DateBase.py
src/RelLib/_Date.py
src/RelLib/_Event.py
src/RelLib/_EventRef.py
src/RelLib/_EventRoleType.py
src/RelLib/_EventType.py
src/RelLib/_Family.py
src/RelLib/_FamilyRelType.py
src/RelLib/_GenderStats.py
src/RelLib/_GrampsType.py
src/RelLib/__init__.py
src/RelLib/_LdsOrd.py
src/RelLib/_LdsOrdBase.py
src/RelLib/_LocationBase.py
src/RelLib/_Location.py
src/RelLib/_MarkerType.py
src/RelLib/_MediaBase.py
src/RelLib/_MediaObject.py
src/RelLib/_MediaRef.py
src/RelLib/_Name.py
src/RelLib/_NameType.py
src/RelLib/_NoteBase.py
src/RelLib/_Note.py
src/RelLib/_NoteType.py
src/RelLib/_Person.py
src/RelLib/_PlaceBase.py
src/RelLib/_Place.py
src/RelLib/_PrimaryObject.py
src/RelLib/_PrivacyBase.py
src/RelLib/_PrivateSourceNote.py
src/RelLib/_RepoRef.py
src/RelLib/_Repository.py
src/RelLib/_RepositoryType.py
src/RelLib/_Researcher.py
src/RelLib/_SourceNote.py
src/RelLib/_Source.py
src/RelLib/_SourceMediaType.py
src/RelLib/_SourceRef.py
src/RelLib/_UrlBase.py
src/RelLib/_Url.py
src/RelLib/_UrlType.py
src/RelLib/_Witness.py
# TreeViews package
# src/TreeViews/__init__.py
# src/TreeViews/_PersonTreeView.py
# gen
src/gen/proxy/living.py
src/gen/proxy/private.py
src/gen/proxy/proxybase.py
src/gen/proxy/dbbase.py
src/gen/proxy/filter.py
src/gen/proxy/__init__.py
src/gen/db/base.py
src/gen/db/dbdir.py
src/gen/db/cursor.py
src/gen/db/exceptions.py
src/gen/db/dbconst.py
src/gen/db/__init__.py
src/gen/db/iterator.py
src/gen/lib/witness.py
src/gen/lib/__init__.py
src/gen/lib/reporef.py
src/gen/lib/url.py
src/gen/lib/personref.py
src/gen/lib/urltype.py
src/gen/lib/note.py
src/gen/lib/repo.py
src/gen/lib/notetype.py
src/gen/lib/repotype.py
src/gen/lib/location.py
src/gen/lib/datebase.py
src/gen/lib/privacybase.py
src/gen/lib/calendar.py
src/gen/lib/mediaref.py
src/gen/lib/attrtype.py
src/gen/lib/srcnote.py
src/gen/lib/primaryobj.py
src/gen/lib/childref.py
src/gen/lib/ldsordbase.py
src/gen/lib/childreftype.py
src/gen/lib/markertype.py
src/gen/lib/genderstats.py
src/gen/lib/place.py
src/gen/lib/srcref.py
src/gen/lib/address.py
src/gen/lib/src.py
src/gen/lib/srcmediatype.py
src/gen/lib/grampstype.py
src/gen/lib/urlbase.py
src/gen/lib/notebase.py
src/gen/lib/locationbase.py
src/gen/lib/attribute.py
src/gen/lib/attrbase.py
src/gen/lib/baseobj.py
src/gen/lib/eventroletype.py
src/gen/lib/person.py
src/gen/lib/refbase.py
src/gen/lib/mediaobj.py
src/gen/lib/mediabase.py
src/gen/lib/date.py
src/gen/lib/eventref.py
src/gen/lib/privsrcnote.py
src/gen/lib/placebase.py
src/gen/lib/name.py
src/gen/lib/addressbase.py
src/gen/lib/family.py
src/gen/lib/event.py
src/gen/lib/nametype.py
src/gen/lib/secondaryobj.py
src/gen/lib/srcbase.py
src/gen/lib/eventtype.py
src/gen/lib/researcher.py
src/gen/lib/familyreltype.py
src/gen/lib/ldsord.py
src/gen/__init__.py
src/gen/utils/__init__.py
src/gen/utils/dbutils.py
src/gen/utils/callback.py
src/gen/utils/longop.py
src/gen/utils/progressmon.py
# Filters package
src/Filters/_FilterComboBox.py

View File

@ -6,7 +6,6 @@
pkgdatadir = $(datadir)/@PACKAGE@/GrampsDb
pkgdata_PYTHON = \
_GrampsDBDir.py \
_GrampsDbFactories.py\
_GrampsDbWriteXML.py \
_GrampsGEDDB.py\

View File

@ -20,7 +20,6 @@ SUBDIRS = \
Mime \
Selectors \
Simple \
RelLib \
data \
PluginUtils \
ReportBase \

View File

@ -12,8 +12,7 @@ pkgdata_PYTHON = \
dbconst.py \
dbdir.py \
exceptions.py \
iterator.py \
longop.py
iterator.py
pkgpyexecdir = @pkgpyexecdir@/db
pkgpythondir = @pkgpythondir@/db

View File

@ -32,7 +32,7 @@ __revision__ = "$Revision$"
#
#-------------------------------------------------------------------------
import time
import GrampsLocale
import locale
#-------------------------------------------------------------------------
#
@ -50,7 +50,10 @@ from mediabase import MediaBase
# Localized constants
#
#-------------------------------------------------------------------------
CODESET = GrampsLocale.codeset
try:
CODESET = locale.nl_langinfo(locale.CODESET)
except:
CODESET = locale.getpreferredencoding()
#-------------------------------------------------------------------------
#