diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 1f5732a59..d796e9979 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,15 @@ +2005-05-06 Alex Roitman + * acinclude.m4: Copy macro for GCONF configuration from gconf2-dev; + add --disable-mime-install and --enable-packager-mode arguments. + * configure.in: Call new macros; Remove obsolete French and Russian + manuals for the time being. + * doc/gramps-manual/Makefile.am: Remove obsolete manuals. + * src/data/Makefile.am: Conditional installation of gconf keys and + mime types. + * src/po/da.po: Typos preventing make. + * NEWS: Update. + * README: Update. + 2005-05-06 Larry Allingham * doc/gramps-manual/C/authors.xml, doc/gramps-manual/C/faq.xml, doc/gramps-manual/C/mainwin.xml, doc/gramps-manual/C/usage.xml: diff --git a/gramps2/NEWS b/gramps2/NEWS index e66e1128b..b76b0d74f 100644 --- a/gramps2/NEWS +++ b/gramps2/NEWS @@ -1,3 +1,8 @@ +Version 2.0.0 -- the "The Bright Side of Life" release +* Bug fixes +* Translation updates. +* Manual update (English only). + Version 1.1.99 -- the "What... is your favourite colour?" release * Bug fixes * GEDCOM import fixes with parent/child relationships diff --git a/gramps2/README b/gramps2/README index 350120fbf..91203cd3e 100644 --- a/gramps2/README +++ b/gramps2/README @@ -5,28 +5,18 @@ If building from source, also read the INSTALL file (at least through the Requirements -------------------------------- The following packages *MUST* be installed in order for Gramps to work: - Python 2.2 or greater - Gnome 2.0 or greater - PyGTK2 1.99.14 or greater - Gnome-python 1.99.14 or greater - -Many distributions already provide PyXML, but if your -installation does not have it, you can get it from -http://sourceforge.net/project/showfiles.php?group_id=6473 + Python 2.3 or greater + Gnome 2.8 or greater + PyGTK2 2.4 or greater + Gnome-python 2.6 or greater The following packages are *STRONGLY RECOMMENDED* to be installed: Reportlab Enable creation of PDF documents http://www.reportlab.com - Python Imaging Library (PIL) - Enable generation of thumbnails for images - http://www.pythonware.com/products/pil + GraphViz Enable creation of graphs using GraphViz engine + http://www.graphviz.org -If, for some reason, you can't/don't want to install PIL, at least make sure -that ImageMagick is available on your system: http://www.imagemagick.org - -WITHOUT eithr PIL or ImageMagick *YOU WILL NOT BE ABLE TO USE THUMBNAILS* -for any of your images. Documentation --------------------------------- @@ -35,7 +25,7 @@ installed in the GNOME help path(*). Gnome help browser (Yelp) uses these (properly installed) XML files to display the documentation. Of course, current HTML documentation can also be found on the gramps website, -http://gramps.sourceforge.net/help.html +http://gramps-project.org/index.php?module=pagemaster&PAGE_user_op=view_page&PAGE_id=7 (*) More precisely, they are installed in ${prefix}/share/gramps/gnome/help/gramps, diff --git a/gramps2/acinclude.m4 b/gramps2/acinclude.m4 index 8c202ca2d..9f201a6df 100644 --- a/gramps2/acinclude.m4 +++ b/gramps2/acinclude.m4 @@ -1,3 +1,46 @@ +dnl AM_GCONF2_REPLACEMENT +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +dnl (i.e. pass to gconftool-2 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +dnl you should install foo.schemas files +dnl +dnl This macro was copied from AM_GCONF_SOURCE_2 from the gconf2-dev package. +dnl By copying it here we remove the requirement for having it on the system. + +AC_DEFUN([AM_GCONF2_REPLACEMENT], +[ + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` + else + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi + + AC_ARG_WITH(gconf-source, + [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi + + AC_ARG_WITH(gconf-schema-file-dir, + [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) + + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + + AC_ARG_ENABLE(schemas-install, + [ --disable-schemas-install Disable the schemas installation], + [case "${enableval}" in + yes) schemas_install=true ;; + no) schemas_install=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-schemas-install) ;; + esac],[schemas_install=true]) + AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue) +]) + dnl AM_SHARED_MIME dnl Defines SHARED_MIME_DIR which is where mime type definitions should go. dnl @@ -9,8 +52,46 @@ AC_DEFUN([AM_SHARED_MIME], fi AC_ARG_WITH(mime-dir, - [ --with-mime-dir=dir Shared mime directory.],SHARED_MIME_DIR="$withval",) + [ --with-mime-dir=dir Shared mime directory.],SHARED_MIME_DIR="$withval",) AC_SUBST(SHARED_MIME_DIR) AC_MSG_RESULT([Using directory $SHARED_MIME_DIR for installation of mime type definitions]) + + AC_ARG_ENABLE(mime-install, + [ --disable-mime-install Disable the mime types installation], + [case "${enableval}" in + yes) mime_install=true ;; + no) mime_install=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-mime-install) ;; + esac],[mime_install=true]) + AM_CONDITIONAL(SHARED_MIME_INSTALL, test x$mime_install = xtrue) + +]) + + +dnl AM_PACKAGER +dnl Defines conditional PACKAGER_MODE to define packager mode +dnl + +AC_DEFUN([AM_PACKAGER], +[ + AC_ARG_ENABLE(packager_mode, + [ --enable-packager-mode Enable packager mode], + [case "${enableval}" in + yes) packager_mode=true ;; + no) packager_mode=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-packager-mode) ;; + esac],[packager_mode=false]) + AM_CONDITIONAL(PACKAGER_MODE, test x$packager_mode = xtrue) + if test "x$packager_mode" = "xtrue"; then + AC_MSG_RESULT([WARNING: + Packager mode enabled. + GConf schemas and shared mime types WILL NOT BE INSTALLED. + You will need to place the contents of the + GCONF_SCHEMAS_INSTALLATION and SHARED_MIME_INSTALLATION + commands MANUALLY into the postinstall script of your package, + see src/data/Makefile.am file for details. + Otherwise you will end up with the unusable package. + YOU HAVE BEEN WARNED!]) + fi ]) diff --git a/gramps2/configure.in b/gramps2/configure.in index 7975e1db0..04b3d6d0e 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -16,8 +16,9 @@ then VERSIONSTRING="$VERSION-$RELEASE" fi -AM_GCONF_SOURCE_2 +AM_GCONF2_REPLACEMENT AM_SHARED_MIME +AM_PACKAGER AC_SUBST(RELEASE) AC_SUBST(VERSIONSTRING) @@ -253,8 +254,6 @@ src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile -doc/gramps-manual/fr/Makefile -doc/gramps-manual/ru/Makefile example/Makefile example/gramps/Makefile gramps.spec diff --git a/gramps2/doc/gramps-manual/Makefile.am b/gramps2/doc/gramps-manual/Makefile.am index 7020ab13f..7b9ec984b 100644 --- a/gramps2/doc/gramps-manual/Makefile.am +++ b/gramps2/doc/gramps-manual/Makefile.am @@ -1,3 +1,3 @@ # Process this file with automake to produce Makefile.in -SUBDIRS = C fr ru +SUBDIRS = C diff --git a/gramps2/src/data/Makefile.am b/gramps2/src/data/Makefile.am index 367b4bf30..1022aedc1 100644 --- a/gramps2/src/data/Makefile.am +++ b/gramps2/src/data/Makefile.am @@ -21,26 +21,50 @@ EXTRA_DIST = \ gramps.mime \ gramps.schemas -install-schemas: - $(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) - $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.schemas $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) - -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(top_srcdir)/src/data/gramps.schemas - -pkill gconfd +# Conditionally enable/disable gconf schemas or mime types, +# or disable both in a packager mode +GCONF_SCHEMAS_INSTALLATION = +GCONF_SCHEMAS_UNINSTALLATION = +SHARED_MIME_INSTALLATION = +SHARED_MIME_UNINSTALLATION = -install-data-local: install-schemas +if !PACKAGER_MODE +if GCONF_SCHEMAS_INSTALL +GCONF_SCHEMAS_INSTALLATION += \ + $(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) ;\ + $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.schemas $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) ;\ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + gconftool-2 --makefile-install-rule $(top_srcdir)/src/data/gramps.schemas ;\ + pkill gconfd ; echo Restarting gconfd + +GCONF_SCHEMAS_UNINSTALLATION += \ + rm $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + gconftool-2 --makefile-uninstall-rule $(top_srcdir)/src/data/gramps.schemas +endif +if SHARED_MIME_INSTALL +SHARED_MIME_INSTALLATION += \ + $(INSTALL) -d $(DESTDIR)$(SHARED_MIME_DIR)/packages ;\ + $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.xml $(DESTDIR)$(SHARED_MIME_DIR)/packages ;\ + update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) +SHARED_MIME_UNINSTALLATION += \ + rm $(DESTDIR)$(SHARED_MIME_DIR)/packages/gramps.xml ;\ + update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) +endif +endif + +install-data-local: $(INSTALL) -d $(DESTDIR)$(prefix)/share/applications $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.desktop $(DESTDIR)$(prefix)/share/applications $(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ $(INSTALL_DATA) $(top_srcdir)/src/data/gnome-mime-application-x-*.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ $(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.applications $(DESTDIR)$(prefix)/share/application-registry - $(INSTALL) -d $(DESTDIR)$(SHARED_MIME_DIR)/packages - $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.xml $(DESTDIR)$(SHARED_MIME_DIR)/packages $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime-info $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.keys $(DESTDIR)$(prefix)/share/mime-info $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.mime $(DESTDIR)$(prefix)/share/mime-info - update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) + $(SHARED_MIME_INSTALLATION) + $(GCONF_SCHEMAS_INSTALLATION) uninstall-local: -rm $(DESTDIR)$(prefix)/share/applications/gramps.desktop @@ -48,8 +72,5 @@ uninstall-local: -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.keys -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime -rm $(DESTDIR)$(prefix)/share/application-registry/gramps.applications - -rm $(DESTDIR)$(SHARED_MIME_DIR)/packages/gramps.xml - -rm $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas - update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) - -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-uninstall-rule $(top_srcdir)/src/data/gramps.schemas + $(SHARED_MIME_UNINSTALLATION) + $(GCONF_SCHEMAS_UNINSTALLATION) diff --git a/gramps2/src/po/da.po b/gramps2/src/po/da.po index 99db3c6ad..e82497473 100644 --- a/gramps2/src/po/da.po +++ b/gramps2/src/po/da.po @@ -724,7 +724,7 @@ msgid "Final save confirmation" msgstr "Endelig bekræftelse af gem" #: Exporter.py:194 -FIXME: 8 spaces to \t +#FIXME: 8 spaces to \t msgid "" "The data will be saved as follows:\n" "\n" @@ -3352,7 +3352,10 @@ msgid "" "\n" "Possibly the installation of GRAMPS was incomplete. Make sure the GConf " "schema of GRAMPS is properly installed." -msgstr "Installationen af GRAMPS var muligvis ufuldstændig. Kontroller at GRAMPS' GConf-skema er korrekt installeret." +msgstr "" +"\n" +"\n" +"Installationen af GRAMPS var muligvis ufuldstændig. Kontroller at GRAMPS' GConf-skema er korrekt installeret." #: StartupDialog.py:77 msgid "Getting Started" @@ -5811,7 +5814,7 @@ msgid "" msgstr "" "Standard (locale baseret)\n" "Fornavn Efternavn\n" -"Efternavn Fornavn" +"Efternavn Fornavn\n" #: gramps.glade:29753 msgid "_Comment:"