diff --git a/ChangeLog b/ChangeLog index a230f10e7..4ec427764 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-26 Don Allingham + * Makefiles: updated for installation + * src/data/gnome-mime-application-x-gramps.png: new icon + * src/data/gramps.svg: new icon + * src/data/gramps.xml: mime information + 2004-05-25 Alex Roitman * src/RelLib.py (try_to_find_person_from_id): Remove transaction; (try_to_find_source_from_id, try_to_find_object_from_id, diff --git a/gramps-mdk.spec b/gramps-mdk.spec index 892e6fbd6..acdcd037a 100644 --- a/gramps-mdk.spec +++ b/gramps-mdk.spec @@ -1,5 +1,5 @@ %define ver 1.1.0 -%define rel 0.CVS20040519 +%define rel 0.CVS20040525 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/gramps.sh.in b/gramps.sh.in index 4a8386321..b42bbee73 100644 --- a/gramps.sh.in +++ b/gramps.sh.in @@ -25,8 +25,7 @@ exec_prefix=@exec_prefix@ PACKAGE=@PACKAGE@ export GRAMPSDIR=@datadir@/@PACKAGE@ -export GRAMPSPYDIR=@pkgpythondir@ -export GRAMPSPLUGINSDIR=$GRAMPSPYDIR/plugins:$GRAMPSPYDIR/docgen:$GRAMPSPYDIR/filters +export GRAMPSPLUGINSDIR=$GRAMPDIR/plugins:$GRAMPSDIR/docgen export GRAMPSLIBDIR=@libdir@/@PACKAGE@ export GRAMPSI18N=@prefix@/share/locale @@ -37,4 +36,4 @@ else export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR:$GRAMPSPLUGINSDIR:$PYTHONPATH fi -exec @PYTHON@ $GRAMPSPYDIR/gramps.py $* +exec @PYTHON@ $GRAMPSDIR/gramps.py $* diff --git a/gramps.spec b/gramps.spec index 3d19c6c12..583c68b13 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,5 +1,5 @@ %define ver 1.1.0 -%define rel 0.CVS20040519 +%define rel 0.CVS20040525 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/src/Makefile.am b/src/Makefile.am index 43d0f6c8c..98cb2603c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,9 @@ MOSTLYCLEANFILES = # In principle, this is handled by PYCFILES and PYOFILES, but # they don't seem to work so we edited the py-compile script instead -pkgpython_PYTHON = \ +gdirdir=$(DESTDIR)$(prefix)/share/gramps + +gdir_PYTHON = \ AddMedia.py\ AddrEdit.py\ AddSpouse.py\ @@ -20,11 +22,13 @@ pkgpython_PYTHON = \ BaseDoc.py\ Bookmarks.py\ Calendar.py\ + ColumnOrder.py\ ChooseParents.py\ const.py\ DateEdit.py\ Date.py\ DbPrompter.py\ + DisplayModels.py\ DisplayTrace.py\ EditPerson.py\ EditPlace.py\ @@ -38,6 +42,7 @@ pkgpython_PYTHON = \ GedcomInfo.py\ GenericFilter.py\ GrampsCfg.py\ + GrampsMime.py\ gramps_main.py\ gramps.py\ GraphLayout.py\ @@ -78,6 +83,7 @@ pkgpython_PYTHON = \ StyleEditor.py\ SubstKeywords.py\ TarFile.py\ + TipOfDay.py\ TransTable.py\ UrlEdit.py\ Utils.py\ @@ -101,6 +107,7 @@ GRAPHICS = \ edit.png\ family48.png\ good.png\ + home.png\ gramps.png\ logo.png\ media.png\ @@ -111,7 +118,7 @@ GRAPHICS = \ tools.png # Other stuff that we need to install -dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop +dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) # In principle the following rule slightly violates the automake/autoconf # spirit of keeping each subdirectory as a separate entity unto itself. @@ -126,14 +133,5 @@ pycheck: for d in $(SUBDIRS) ; do \ (cd $$d; make pycheck); \ done; - pychecker $(pkgpython_PYTHON) + pychecker $(gdir_PYTHON) -install-data-local: - $(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps - $(INSTALL_DATA) $(srcdir)/gramps.png $(DESTDIR)$(prefix)/share/pixmaps - $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications - $(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications - -uninstall-local: - -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png - -rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop diff --git a/src/Makefile.in b/src/Makefile.in index c1d17d48e..ef8b30662 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -35,7 +35,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = src -DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) \ +DIST_COMMON = README $(dist_pkgdata_DATA) $(gdir_PYTHON) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/const.py.in AUTHORS ChangeLog NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -52,8 +52,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -am__installdirs = "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)" -pkgpythonPYTHON_INSTALL = $(INSTALL_DATA) +am__installdirs = "$(DESTDIR)$(gdirdir)" "$(DESTDIR)$(pkgdatadir)" +gdirPYTHON_INSTALL = $(INSTALL_DATA) py_compile = $(top_srcdir)/py-compile dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_pkgdata_DATA) @@ -150,7 +150,8 @@ MOSTLYCLEANFILES = # We only want optimized byte-compiled (.pyo) versions, no .pyc # In principle, this is handled by PYCFILES and PYOFILES, but # they don't seem to work so we edited the py-compile script instead -pkgpython_PYTHON = \ +gdirdir = $(DESTDIR)$(prefix)/share/gramps +gdir_PYTHON = \ AddMedia.py\ AddrEdit.py\ AddSpouse.py\ @@ -160,11 +161,13 @@ pkgpython_PYTHON = \ BaseDoc.py\ Bookmarks.py\ Calendar.py\ + ColumnOrder.py\ ChooseParents.py\ const.py\ DateEdit.py\ Date.py\ DbPrompter.py\ + DisplayModels.py\ DisplayTrace.py\ EditPerson.py\ EditPlace.py\ @@ -178,6 +181,7 @@ pkgpython_PYTHON = \ GedcomInfo.py\ GenericFilter.py\ GrampsCfg.py\ + GrampsMime.py\ gramps_main.py\ gramps.py\ GraphLayout.py\ @@ -218,6 +222,7 @@ pkgpython_PYTHON = \ StyleEditor.py\ SubstKeywords.py\ TarFile.py\ + TipOfDay.py\ TransTable.py\ UrlEdit.py\ Utils.py\ @@ -242,6 +247,7 @@ GRAPHICS = \ edit.png\ family48.png\ good.png\ + home.png\ gramps.png\ logo.png\ media.png\ @@ -253,7 +259,7 @@ GRAPHICS = \ # Other stuff that we need to install -dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop +dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) all: all-recursive .SUFFIXES: @@ -289,28 +295,28 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) const.py: $(top_builddir)/config.status $(srcdir)/const.py.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uninstall-info-am: -install-pkgpythonPYTHON: $(pkgpython_PYTHON) +install-gdirPYTHON: $(gdir_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)" - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + test -z "$(gdirdir)" || $(mkdir_p) "$(DESTDIR)$(gdirdir)" + @list='$(gdir_PYTHON)'; dlist=''; for p in $$list; do\ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ d=`echo $$p | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \ - $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \ + echo " $(gdirPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(gdirdir)/$$d'"; \ + $(gdirPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(gdirdir)/$$d"; \ else :; fi; \ done; \ test -z "$$dlist" || \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist + PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gdirdir)" $$dlist -uninstall-pkgpythonPYTHON: +uninstall-gdirPYTHON: @$(NORMAL_UNINSTALL) - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + @list='$(gdir_PYTHON)'; dlist=''; for p in $$list; do\ d=`echo $$p | sed -e 's,^.*/,,'`; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \ + rm -f "$(DESTDIR)$(gdirdir)/$$d"; \ + rm -f "$(DESTDIR)$(gdirdir)/$${d}c"; \ + rm -f "$(DESTDIR)$(gdirdir)/$${d}o"; \ done install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) @@ -495,7 +501,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(gdirdir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -541,8 +547,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dist_pkgdataDATA \ - install-pkgpythonPYTHON +install-data-am: install-dist_pkgdataDATA install-gdirPYTHON install-exec-am: @@ -568,8 +573,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \ - uninstall-local uninstall-pkgpythonPYTHON +uninstall-am: uninstall-dist_pkgdataDATA uninstall-gdirPYTHON \ + uninstall-info-am uninstall-info: uninstall-info-recursive @@ -577,16 +582,15 @@ uninstall-info: uninstall-info-recursive clean clean-generic clean-recursive ctags ctags-recursive \ distclean distclean-generic distclean-recursive distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-local \ + install-am install-data install-data-am \ install-dist_pkgdataDATA install-exec install-exec-am \ - install-info install-info-am install-man \ - install-pkgpythonPYTHON install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_pkgdataDATA uninstall-info-am uninstall-local \ - uninstall-pkgpythonPYTHON + install-gdirPYTHON install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-dist_pkgdataDATA \ + uninstall-gdirPYTHON uninstall-info-am # In principle the following rule slightly violates the automake/autoconf @@ -602,17 +606,7 @@ pycheck: for d in $(SUBDIRS) ; do \ (cd $$d; make pycheck); \ done; - pychecker $(pkgpython_PYTHON) - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps - $(INSTALL_DATA) $(srcdir)/gramps.png $(DESTDIR)$(prefix)/share/pixmaps - $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications - $(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications - -uninstall-local: - -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png - -rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop + pychecker $(gdir_PYTHON) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/calendars/Makefile.am b/src/calendars/Makefile.am index 97052dbf7..9e11ed935 100644 --- a/src/calendars/Makefile.am +++ b/src/calendars/Makefile.am @@ -2,14 +2,12 @@ # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON = \ +calendardir = $(datadir)/@PACKAGE@/calendars + +calendar_PYTHON = \ Islamic.py \ Persian.py -pkgpyexecdir = @pkgpyexecdir@/plugins -pkgpythondir = @pkgpythondir@/plugins - -pkgdatadir = $(datadir)/@PACKAGE@/calendars GRAMPS_PY_MODPATH = "../" diff --git a/src/calendars/Makefile.in b/src/calendars/Makefile.in index ab60622ee..b47b0287e 100644 --- a/src/calendars/Makefile.in +++ b/src/calendars/Makefile.in @@ -20,6 +20,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. @@ -37,7 +38,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = src/calendars -DIST_COMMON = $(pkgpython_PYTHON) $(srcdir)/Makefile.am \ +DIST_COMMON = $(calendar_PYTHON) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -47,11 +48,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(pkgpythondir)" -pkgpythonPYTHON_INSTALL = $(INSTALL_DATA) +am__installdirs = "$(DESTDIR)$(calendardir)" +calendarPYTHON_INSTALL = $(INSTALL_DATA) py_compile = $(top_srcdir)/py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgdatadir = $(datadir)/@PACKAGE@/calendars ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ @@ -119,8 +119,8 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pkgpyexecdir = @pkgpyexecdir@/plugins -pkgpythondir = @pkgpythondir@/plugins +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ pyexecdir = @pyexecdir@ @@ -129,7 +129,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -pkgpython_PYTHON = \ +calendardir = $(datadir)/@PACKAGE@/calendars +calendar_PYTHON = \ Islamic.py \ Persian.py @@ -167,28 +168,28 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-pkgpythonPYTHON: $(pkgpython_PYTHON) +install-calendarPYTHON: $(calendar_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)" - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + test -z "$(calendardir)" || $(mkdir_p) "$(DESTDIR)$(calendardir)" + @list='$(calendar_PYTHON)'; dlist=''; for p in $$list; do\ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ d=`echo $$p | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \ - $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \ + echo " $(calendarPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(calendardir)/$$d'"; \ + $(calendarPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(calendardir)/$$d"; \ else :; fi; \ done; \ test -z "$$dlist" || \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist + PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(calendardir)" $$dlist -uninstall-pkgpythonPYTHON: +uninstall-calendarPYTHON: @$(NORMAL_UNINSTALL) - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + @list='$(calendar_PYTHON)'; dlist=''; for p in $$list; do\ d=`echo $$p | sed -e 's,^.*/,,'`; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \ + rm -f "$(DESTDIR)$(calendardir)/$$d"; \ + rm -f "$(DESTDIR)$(calendardir)/$${d}c"; \ + rm -f "$(DESTDIR)$(calendardir)/$${d}o"; \ done tags: TAGS TAGS: @@ -228,7 +229,7 @@ check-am: all-am check: check-am all-am: Makefile installdirs: - for dir in "$(DESTDIR)$(pkgpythondir)"; do \ + for dir in "$(DESTDIR)$(calendardir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -273,7 +274,7 @@ info: info-am info-am: -install-data-am: install-pkgpythonPYTHON +install-data-am: install-calendarPYTHON install-exec-am: @@ -299,17 +300,17 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON +uninstall-am: uninstall-calendarPYTHON uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-pkgpythonPYTHON install-strip installcheck \ + install install-am install-calendarPYTHON install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-pkgpythonPYTHON + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-calendarPYTHON uninstall-info-am pycheck: diff --git a/src/data/Makefile.am b/src/data/Makefile.am index 4d9f70aa3..c773bee60 100644 --- a/src/data/Makefile.am +++ b/src/data/Makefile.am @@ -2,7 +2,27 @@ SUBDIRS = templates pkgdatadir = $(datadir)/@PACKAGE@/data -pkgdata_DATA = gedcom.xml papersize.xml +pkgdata_DATA = gedcom.xml \ + papersize.xml \ + tips.xml \ + gnome-mime-application-x-gramps.png \ + gramps.svg EXTRA_DIST = $(pkgdata_DATA) +install-data-local: + $(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps + $(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps + $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications + $(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications + $(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ + $(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ + $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages + $(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages + update-mime-database $(DESTDIR)$(prefix)/share/mime + +uninstall-local: + -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png + -rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop + -rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gramps.png + diff --git a/src/data/Makefile.in b/src/data/Makefile.in index 48ebbb278..5db644715 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -137,7 +137,12 @@ target_alias = @target_alias@ # This is the src/data level Makefile SUBDIRS = templates -pkgdata_DATA = gedcom.xml papersize.xml +pkgdata_DATA = gedcom.xml \ + papersize.xml \ + tips.xml \ + gnome-mime-application-x-gramps.png \ + gramps.svg + EXTRA_DIST = $(pkgdata_DATA) all: all-recursive @@ -400,7 +405,7 @@ info: info-recursive info-am: -install-data-am: install-pkgdataDATA +install-data-am: install-data-local install-pkgdataDATA install-exec-am: @@ -426,7 +431,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-pkgdataDATA +uninstall-am: uninstall-info-am uninstall-local uninstall-pkgdataDATA uninstall-info: uninstall-info-recursive @@ -434,15 +439,31 @@ uninstall-info: uninstall-info-recursive clean clean-generic clean-recursive ctags ctags-recursive \ distclean distclean-generic distclean-recursive distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-pkgdataDATA install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + install-am install-data install-data-am install-data-local \ + install-exec install-exec-am install-info install-info-am \ + install-man install-pkgdataDATA install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-pkgdataDATA + uninstall-info-am uninstall-local uninstall-pkgdataDATA + +install-data-local: + $(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps + $(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps + $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications + $(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications + $(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ + $(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ + $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages + $(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages + update-mime-database $(DESTDIR)$(prefix)/share/mime + +uninstall-local: + -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png + -rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop + -rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gramps.png # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/data/gnome-mime-application-x-gramps.png b/src/data/gnome-mime-application-x-gramps.png new file mode 100644 index 000000000..3ec55752b Binary files /dev/null and b/src/data/gnome-mime-application-x-gramps.png differ diff --git a/src/gramps.desktop b/src/data/gramps.desktop similarity index 94% rename from src/gramps.desktop rename to src/data/gramps.desktop index 049b1af47..817ee3346 100644 --- a/src/gramps.desktop +++ b/src/data/gramps.desktop @@ -21,3 +21,5 @@ Type=Application StartupNotify=true Categories=Application;Genealogy; X-GNOME-DocPath=gramps/gramps-manual.xml +MimeType=application/x-gramps +Exec=gramps %F diff --git a/src/data/gramps.png b/src/data/gramps.png new file mode 100644 index 000000000..09b81f69a Binary files /dev/null and b/src/data/gramps.png differ diff --git a/src/data/gramps.svg b/src/data/gramps.svg new file mode 100644 index 000000000..6c5cc53fc --- /dev/null +++ b/src/data/gramps.svg @@ -0,0 +1,376 @@ + + + + diff --git a/src/data/gramps.xml b/src/data/gramps.xml new file mode 100644 index 000000000..e785b501a --- /dev/null +++ b/src/data/gramps.xml @@ -0,0 +1,11 @@ + + + + GRAMPS database + + + + GEDCOM + + + diff --git a/src/docgen/Makefile.am b/src/docgen/Makefile.am index 81bf26a5b..5255b2ddb 100644 --- a/src/docgen/Makefile.am +++ b/src/docgen/Makefile.am @@ -2,7 +2,9 @@ # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON = \ +docgendir=$(DESTDIR)$(prefix)/share/gramps/docgen + +docgen_PYTHON = \ AbiWord2Doc.py\ AsciiDoc.py\ HtmlDoc.py\ @@ -16,9 +18,6 @@ pkgpython_PYTHON = \ SvgDrawDoc.py\ LPRDoc.py -pkgpyexecdir = @pkgpyexecdir@/docgen -pkgpythondir = @pkgpythondir@/docgen - GRAMPS_PY_MODPATH = "../" pycheck: diff --git a/src/docgen/Makefile.in b/src/docgen/Makefile.in index c8968814f..5bfc3fc5b 100644 --- a/src/docgen/Makefile.in +++ b/src/docgen/Makefile.in @@ -38,7 +38,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = src/docgen -DIST_COMMON = $(pkgpython_PYTHON) $(srcdir)/Makefile.am \ +DIST_COMMON = $(docgen_PYTHON) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -48,8 +48,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(pkgpythondir)" -pkgpythonPYTHON_INSTALL = $(INSTALL_DATA) +am__installdirs = "$(DESTDIR)$(docgendir)" +docgenPYTHON_INSTALL = $(INSTALL_DATA) py_compile = $(top_srcdir)/py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -119,8 +119,8 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pkgpyexecdir = @pkgpyexecdir@/docgen -pkgpythondir = @pkgpythondir@/docgen +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ pyexecdir = @pyexecdir@ @@ -129,7 +129,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -pkgpython_PYTHON = \ +docgendir = $(DESTDIR)$(prefix)/share/gramps/docgen +docgen_PYTHON = \ AbiWord2Doc.py\ AsciiDoc.py\ HtmlDoc.py\ @@ -177,28 +178,28 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-pkgpythonPYTHON: $(pkgpython_PYTHON) +install-docgenPYTHON: $(docgen_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)" - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + test -z "$(docgendir)" || $(mkdir_p) "$(DESTDIR)$(docgendir)" + @list='$(docgen_PYTHON)'; dlist=''; for p in $$list; do\ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ d=`echo $$p | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \ - $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \ + echo " $(docgenPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(docgendir)/$$d'"; \ + $(docgenPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(docgendir)/$$d"; \ else :; fi; \ done; \ test -z "$$dlist" || \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist + PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(docgendir)" $$dlist -uninstall-pkgpythonPYTHON: +uninstall-docgenPYTHON: @$(NORMAL_UNINSTALL) - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + @list='$(docgen_PYTHON)'; dlist=''; for p in $$list; do\ d=`echo $$p | sed -e 's,^.*/,,'`; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \ + rm -f "$(DESTDIR)$(docgendir)/$$d"; \ + rm -f "$(DESTDIR)$(docgendir)/$${d}c"; \ + rm -f "$(DESTDIR)$(docgendir)/$${d}o"; \ done tags: TAGS TAGS: @@ -238,7 +239,7 @@ check-am: all-am check: check-am all-am: Makefile installdirs: - for dir in "$(DESTDIR)$(pkgpythondir)"; do \ + for dir in "$(DESTDIR)$(docgendir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -283,7 +284,7 @@ info: info-am info-am: -install-data-am: install-pkgpythonPYTHON +install-data-am: install-docgenPYTHON install-exec-am: @@ -309,17 +310,17 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON +uninstall-am: uninstall-docgenPYTHON uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-pkgpythonPYTHON install-strip installcheck \ + install install-am install-data install-data-am \ + install-docgenPYTHON install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-pkgpythonPYTHON + pdf-am ps ps-am uninstall uninstall-am uninstall-docgenPYTHON \ + uninstall-info-am pycheck: diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 60101594b..cb021b806 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -2,7 +2,10 @@ # We could use GNU make's ':=' syntax for nice wildcard use, # but that is not necessarily portable. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON = \ + +pkgdatadir = $(datadir)/@PACKAGE@/plugins + +pkgdata_PYTHON = \ AncestorChart.py\ AncestorChart2.py\ AncestorReport.py\ @@ -73,8 +76,6 @@ GLADEFILES = \ book.glade\ writeftree.glade -pkgdatadir = $(datadir)/@PACKAGE@/plugins - dist_pkgdata_DATA = $(GLADEFILES) GRAMPS_PY_MODPATH = "../:../docgen" diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index e8e70307a..96071b92a 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -14,6 +14,11 @@ @SET_MAKE@ +# This is the src/plugins level Makefile for Gramps +# We could use GNU make's ':=' syntax for nice wildcard use, +# but that is not necessarily portable. +# If not using GNU make, then list all .py files individually + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -34,7 +39,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = src/plugins -DIST_COMMON = $(dist_pkgdata_DATA) $(pkgpython_PYTHON) \ +DIST_COMMON = $(dist_pkgdata_DATA) $(pkgdata_PYTHON) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -44,8 +49,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)" -pkgpythonPYTHON_INSTALL = $(INSTALL_DATA) +am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" +pkgdataPYTHON_INSTALL = $(INSTALL_DATA) py_compile = $(top_srcdir)/py-compile dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_pkgdata_DATA) @@ -128,12 +133,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -# This is the src/plugins level Makefile for Gramps -# We could use GNU make's ':=' syntax for nice wildcard use, -# but that is not necessarily portable. -# If not using GNU make, then list all .py files individually -pkgpython_PYTHON = \ +pkgdata_PYTHON = \ AncestorChart.py\ AncestorChart2.py\ AncestorReport.py\ @@ -236,28 +236,28 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-pkgpythonPYTHON: $(pkgpython_PYTHON) +install-pkgdataPYTHON: $(pkgdata_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)" - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + @list='$(pkgdata_PYTHON)'; dlist=''; for p in $$list; do\ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ d=`echo $$p | sed -e 's,^.*/,,'`; \ dlist="$$dlist $$d"; \ - echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \ - $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \ + echo " $(pkgdataPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgdatadir)/$$d'"; \ + $(pkgdataPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgdatadir)/$$d"; \ else :; fi; \ done; \ test -z "$$dlist" || \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist + PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgdatadir)" $$dlist -uninstall-pkgpythonPYTHON: +uninstall-pkgdataPYTHON: @$(NORMAL_UNINSTALL) - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + @list='$(pkgdata_PYTHON)'; dlist=''; for p in $$list; do\ d=`echo $$p | sed -e 's,^.*/,,'`; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$$d"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$${d}c"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$${d}o"; \ done install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) @@ -314,7 +314,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -359,7 +359,7 @@ info: info-am info-am: -install-data-am: install-dist_pkgdataDATA install-pkgpythonPYTHON +install-data-am: install-dist_pkgdataDATA install-pkgdataPYTHON install-exec-am: @@ -386,19 +386,18 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \ - uninstall-pkgpythonPYTHON + uninstall-pkgdataPYTHON .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ install-dist_pkgdataDATA install-exec install-exec-am \ - install-info install-info-am install-man \ - install-pkgpythonPYTHON install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ + install-info install-info-am install-man install-pkgdataPYTHON \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-dist_pkgdataDATA uninstall-info-am \ - uninstall-pkgpythonPYTHON + uninstall-pkgdataPYTHON pycheck: