Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/ReadXML.py (start_event): Correctly set event type.

Browse Source 
* acinclude.m4, configure.in, gramps.spe.in, src/data/Makefile.am:
Properly test for gconftool-2 binary.


svn: r5079
This commit is contained in:
Alex Roitman 2005-08-15 00:31:11 +00:00
parent 7c1ce4296b
commit cb2c215cf7
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps2/ChangeLog
View File

@ -1,3 +1,10 @@
2005-08-14 Eero Tamminen <eerot@sf>
* src/ReadXML.py (start_event): Correctly set event type.
2005-08-14 Alex Roitman <shura@gramps-project.org>
* acinclude.m4, configure.in, gramps.spe.in, src/data/Makefile.am:
Properly test for gconftool-2 binary.
2005-08-14 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-08-14 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/plugins/ExportVCalendar.py: Fix typo * src/plugins/ExportVCalendar.py: Fix typo

4
gramps2/acinclude.m4
View File

@ -1,6 +1,6 @@
dnl AM_GCONF2_REPLACEMENT dnl AM_GCONF2_REPLACEMENT
dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
dnl (i.e. pass to gconftool-2 dnl (i.e. pass to $GCONFTOOL
dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
dnl you should install foo.schemas files dnl you should install foo.schemas files
dnl dnl
@ -10,7 +10,7 @@ dnl By copying it here we remove the requirement for having it on the system.
AC_DEFUN([AM_GCONF2_REPLACEMENT], AC_DEFUN([AM_GCONF2_REPLACEMENT],
[ [
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` GCONF_SCHEMA_CONFIG_SOURCE=`$GCONFTOOL --get-default-source`
else else
GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
fi fi

6
gramps2/configure.in
View File

@ -16,6 +16,12 @@ then
VERSIONSTRING="$VERSION-$RELEASE" VERSIONSTRING="$VERSION-$RELEASE"
fi fi
dnl Checking for gconftool-2
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
if test "x$GCONFTOOL" = xno; then
AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
fi
AM_GCONF2_REPLACEMENT AM_GCONF2_REPLACEMENT
AM_SHARED_MIME AM_SHARED_MIME
AM_PACKAGER AM_PACKAGER

4
gramps2/gramps.spec.in
View File

@ -86,8 +86,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/mime/packages/gramps.xml %{_datadir}/mime/packages/gramps.xml
%post %post
GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ GCONF_CONFIG_SOURCE=`@GCONFTOOL@ --get-default-source` \
gconftool-2 --makefile-install-rule \ @GCONFTOOL@ --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/gramps.schemas > /dev/null %{_sysconfdir}/gconf/schemas/gramps.schemas > /dev/null
/usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null

5
gramps2/src/ReadXML.py
View File

@ -596,10 +596,7 @@ class GrampsParser:
def start_event(self,attrs): def start_event(self,attrs):
self.event = RelLib.Event() self.event = RelLib.Event()
self.db.add_event(self.event,self.trans) self.db.add_event(self.event,self.trans)
if self.family: self.event_type = const.save_event(attrs["type"])
self.event_type = const.display_pevent(attrs["type"])
else:
self.event_type = const.display_fevent(attrs["type"])
if attrs.has_key("conf"): if attrs.has_key("conf"):
self.event.conf = int(attrs["conf"]) self.event.conf = int(attrs["conf"])
else: else:

4
gramps2/src/data/Makefile.am
View File

@ -40,12 +40,12 @@ if !PACKAGER_MODE
if GCONF_SCHEMAS_INSTALL if GCONF_SCHEMAS_INSTALL
GCONF_SCHEMAS_INSTALLATION += \ GCONF_SCHEMAS_INSTALLATION += \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
gconftool-2 --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\ $(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\
pkill gconfd ; echo Restarting gconfd pkill gconfd ; echo Restarting gconfd
GCONF_SCHEMAS_UNINSTALLATION += \ GCONF_SCHEMAS_UNINSTALLATION += \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
gconftool-2 --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas $(GCONFTOOL) --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas
endif endif
if SHARED_MIME_INSTALL if SHARED_MIME_INSTALL
SHARED_MIME_INSTALLATION += \ SHARED_MIME_INSTALLATION += \