diff --git a/ChangeLog b/ChangeLog index b95de6a98..0db0695df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2006-03-21 Alex Roitman + * various: rename doc to data; move most of src/data to data. + 2006-03-20 Don Allingham * src/const.py.in: fix path combination * src/Config/__init__.py: actually pay attention to no_gconf diff --git a/Makefile.am b/Makefile.am index cc199fa17..b6c78e281 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # This is the top level Makefile for Gramps # $Id$ -SUBDIRS = m4 po src doc example help +SUBDIRS = m4 po src data example help EXTRA_DIST = \ config.rpath autogen.sh gramps.spec.in gramps.spec \ diff --git a/configure.in b/configure.in index 60387b9a2..74ca8136c 100644 --- a/configure.in +++ b/configure.in @@ -210,9 +210,9 @@ src/data/Makefile src/glade/Makefile src/images/Makefile src/data/templates/Makefile -doc/Makefile -doc/man/Makefile -doc/man/fr/Makefile +data/Makefile +data/man/Makefile +data/man/fr/Makefile example/Makefile example/gramps/Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 000000000..e83a39f83 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,98 @@ +# This is the data level Makefile for gramps +# $Id$ + +SUBDIRS = man + +# Rules for files with translatable strings +# These are taken care of by the intltool +desktopdir = $(datadir)/applications +desktop_in_files = gramps.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + +keys_in_files = gramps.keys.in +keys_files = $(keys_in_files:.keys.in=.keys) +@INTLTOOL_KEYS_RULE@ + +# Rules for files with translatable strings +# These are taken care of by the intltool +xml_in_files = gramps.xml.in +xml_files = $(xml_in_files:.xml.in=.xml) +@INTLTOOL_XML_RULE@ + +schemasdir = $(GCONF_SCHEMA_FILE_DIR) +schemas_in_files = gramps.schemas.in +schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) +@INTLTOOL_SCHEMAS_RULE@ + +applicationsdir = $(datadir)/application-registry +applications_DATA = gramps.applications + +mimedir = $(datadir)/mime-info +mime_DATA = $(keys_files) gramps.mime + +xmldir = $(SHARED_MIME_DIR)/packages +xml_DATA = $(xml_files) + +pngdir = $(datadir)/icons/gnome/48x48/mimetypes +png_DATA = \ + gnome-mime-application-x-gramps.png \ + gnome-mime-application-x-gedcom.png \ + gnome-mime-application-x-gramps-package.png \ + gnome-mime-application-x-gramps-xml.png \ + gnome-mime-application-x-geneweb.png + +EXTRA_DIST = \ + $(png_DATA) \ + $(applications_DATA) \ + $(keys_in_files) \ + $(desktop_in_files) \ + $(schemas_in_files) \ + $(mime_DATA) \ + $(xml_DATA) \ + $(desktop_DATA) \ + $(schemas_DATA) \ + $(xml_in_files) + +CLEANFILES = \ + $(desktop_DATA) \ + $(keys_files) \ + $(xml_files) \ + $(schemas_DATA) + +# 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 = + +if !PACKAGER_MODE +if GCONF_SCHEMAS_INSTALL +GCONF_SCHEMAS_INSTALLATION += \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\ + pkill gconfd ; echo Restarting gconfd + +GCONF_SCHEMAS_UNINSTALLATION += \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas +endif +if SHARED_MIME_INSTALL +SHARED_MIME_INSTALLATION += \ + update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) +SHARED_MIME_UNINSTALLATION += \ + update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) +endif +endif + + +install-data-hook: + $(SHARED_MIME_INSTALLATION) + $(GCONF_SCHEMAS_INSTALLATION) + +uninstall-local: + $(GCONF_SCHEMAS_UNINSTALLATION) + +uninstall-hook: + $(SHARED_MIME_UNINSTALLATION) diff --git a/src/data/gnome-mime-application-x-gedcom.png b/data/gnome-mime-application-x-gedcom.png similarity index 100% rename from src/data/gnome-mime-application-x-gedcom.png rename to data/gnome-mime-application-x-gedcom.png diff --git a/src/data/gnome-mime-application-x-geneweb.png b/data/gnome-mime-application-x-geneweb.png similarity index 100% rename from src/data/gnome-mime-application-x-geneweb.png rename to data/gnome-mime-application-x-geneweb.png diff --git a/src/data/gnome-mime-application-x-gramps-package.png b/data/gnome-mime-application-x-gramps-package.png similarity index 100% rename from src/data/gnome-mime-application-x-gramps-package.png rename to data/gnome-mime-application-x-gramps-package.png diff --git a/src/data/gnome-mime-application-x-gramps-xml.png b/data/gnome-mime-application-x-gramps-xml.png similarity index 100% rename from src/data/gnome-mime-application-x-gramps-xml.png rename to data/gnome-mime-application-x-gramps-xml.png diff --git a/src/data/gnome-mime-application-x-gramps.png b/data/gnome-mime-application-x-gramps.png similarity index 100% rename from src/data/gnome-mime-application-x-gramps.png rename to data/gnome-mime-application-x-gramps.png diff --git a/src/data/gramps.applications b/data/gramps.applications similarity index 100% rename from src/data/gramps.applications rename to data/gramps.applications diff --git a/src/data/gramps.desktop.in b/data/gramps.desktop.in similarity index 100% rename from src/data/gramps.desktop.in rename to data/gramps.desktop.in diff --git a/src/data/gramps.keys.in b/data/gramps.keys.in similarity index 100% rename from src/data/gramps.keys.in rename to data/gramps.keys.in diff --git a/src/data/gramps.mime b/data/gramps.mime similarity index 100% rename from src/data/gramps.mime rename to data/gramps.mime diff --git a/src/data/gramps.schemas.in b/data/gramps.schemas.in similarity index 100% rename from src/data/gramps.schemas.in rename to data/gramps.schemas.in diff --git a/src/data/gramps.xml.in b/data/gramps.xml.in similarity index 100% rename from src/data/gramps.xml.in rename to data/gramps.xml.in diff --git a/doc/grampsxml.dtd b/data/grampsxml.dtd similarity index 100% rename from doc/grampsxml.dtd rename to data/grampsxml.dtd diff --git a/doc/grampsxml.rng b/data/grampsxml.rng similarity index 100% rename from doc/grampsxml.rng rename to data/grampsxml.rng diff --git a/doc/man/Makefile.am b/data/man/Makefile.am similarity index 77% rename from doc/man/Makefile.am rename to data/man/Makefile.am index 8421ecb25..db9d739ed 100644 --- a/doc/man/Makefile.am +++ b/data/man/Makefile.am @@ -8,6 +8,6 @@ man_MANS = $(man_IN_FILES:.1.in=.1) EXTRA_DIST = $(man_MANS) $(man_IN_FILES) gramps.1: $(top_builddir)/config.status gramps.1.in - cd $(top_builddir) && CONFIG_FILES=doc/man/$@ $(SHELL) ./config.status + cd $(top_builddir) && CONFIG_FILES=data/man/$@ $(SHELL) ./config.status CLEANFILES=$(man_MANS) diff --git a/doc/man/fr/Makefile.am b/data/man/fr/Makefile.am similarity index 77% rename from doc/man/fr/Makefile.am rename to data/man/fr/Makefile.am index 5a8eb859f..87f88d91f 100644 --- a/doc/man/fr/Makefile.am +++ b/data/man/fr/Makefile.am @@ -8,6 +8,6 @@ mandir = @mandir@/fr EXTRA_DIST = $(man_MANS) $(man_IN_FILES) gramps.1: $(top_builddir)/config.status gramps.1.in - cd $(top_builddir) && CONFIG_FILES=doc/man/fr/$@ $(SHELL) ./config.status + cd $(top_builddir) && CONFIG_FILES=data/man/fr/$@ $(SHELL) ./config.status CLEANFILES=$(man_MANS) diff --git a/doc/man/fr/gramps.1.in b/data/man/fr/gramps.1.in similarity index 100% rename from doc/man/fr/gramps.1.in rename to data/man/fr/gramps.1.in diff --git a/doc/man/gramps.1.in b/data/man/gramps.1.in similarity index 100% rename from doc/man/gramps.1.in rename to data/man/gramps.1.in diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 0e4242f7e..000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -# Process this file with automake to produce Makefile.in - -SUBDIRS = man diff --git a/doc/gramps.xsd b/doc/gramps.xsd deleted file mode 100644 index f66037f50..000000000 --- a/doc/gramps.xsd +++ /dev/null @@ -1,387 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 399835cc5..b9cae8fc3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -305,8 +305,8 @@ src/plugins/writeftree.glade # # Files to extract from and then merge into # -src/data/gramps.desktop.in -src/data/gramps.keys.in -src/data/gramps.xml.in -src/data/gramps.schemas.in +data/gramps.desktop.in +data/gramps.keys.in +data/gramps.xml.in +data/gramps.schemas.in src/data/tips.xml.in diff --git a/src/ImgManip.py b/src/ImgManip.py index 7cd472a35..cdd6a51cd 100644 --- a/src/ImgManip.py +++ b/src/ImgManip.py @@ -156,7 +156,7 @@ def get_thumbnail_image(path,mtype=None): return Mime.find_mime_type_pixbuf(mtype) else: return gtk.gdk.pixbuf_new_from_file(os.path.join( - const.data_dir,"document.png")) + const.image_dir,"document.png")) def get_thumbnail_path(path,mtype=None): filename = _build_thumb_path(path) diff --git a/src/data/Makefile.am b/src/data/Makefile.am index fa559107e..b1aa964cc 100644 --- a/src/data/Makefile.am +++ b/src/data/Makefile.am @@ -1,4 +1,4 @@ -# This is the src/data level Makefile +# This is the src/data level Makefile for gramps # $Id$ # SUBDIRS = templates @@ -6,7 +6,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/data dist_pkgdata_DATA = \ gedcom.xml \ - somerights20.gif \ papersize.xml \ system_filters.xml \ tips.xml\ @@ -15,97 +14,13 @@ dist_pkgdata_DATA = \ main3.css\ main4.css\ main5.css\ - main6.css\ - document.png - -# 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 = - -if !PACKAGER_MODE -if GCONF_SCHEMAS_INSTALL -GCONF_SCHEMAS_INSTALLATION += \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\ - pkill gconfd ; echo Restarting gconfd - -GCONF_SCHEMAS_UNINSTALLATION += \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas -endif -if SHARED_MIME_INSTALL -SHARED_MIME_INSTALLATION += \ - update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) -SHARED_MIME_UNINSTALLATION += \ - update-mime-database $(DESTDIR)$(SHARED_MIME_DIR) -endif -endif + main6.css # Rules for files with translatable strings # These are taken care of by the intltool -desktopdir = $(datadir)/applications -desktop_in_files = gramps.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -keys_in_files = gramps.keys.in -keys_files = $(keys_in_files:.keys.in=.keys) -@INTLTOOL_KEYS_RULE@ - -xml_in_files = gramps.xml.in tips.xml.in +xml_in_files = tips.xml.in xml_files = $(xml_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ -schemasdir = $(GCONF_SCHEMA_FILE_DIR) -schemas_in_files = gramps.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ - -applicationsdir = $(datadir)/application-registry -applications_DATA = gramps.applications - -mimedir = $(datadir)/mime-info -mime_DATA = $(keys_files) gramps.mime - -xmldir = $(SHARED_MIME_DIR)/packages -xml_DATA = $(xml_files) - -pngdir = $(datadir)/icons/gnome/48x48/mimetypes -png_DATA = \ - gnome-mime-application-x-gramps.png \ - gnome-mime-application-x-gedcom.png \ - gnome-mime-application-x-gramps-package.png \ - gnome-mime-application-x-gramps-xml.png \ - gnome-mime-application-x-geneweb.png - -EXTRA_DIST = \ - $(png_DATA) \ - gramps.svg \ - $(applications_DATA) \ - $(keys_in_files) \ - $(desktop_in_files) \ - $(schemas_in_files) \ - $(mime_DATA) \ - $(xml_DATA) \ - $(desktop_DATA) \ - $(schemas_DATA) \ - $(xml_in_files) - -CLEANFILES = \ - $(desktop_DATA) \ - $(keys_files) \ - $(xml_files) \ - $(schemas_DATA) - -install-data-hook: - $(SHARED_MIME_INSTALLATION) - $(GCONF_SCHEMAS_INSTALLATION) - -uninstall-local: - $(GCONF_SCHEMAS_UNINSTALLATION) - -uninstall-hook: - $(SHARED_MIME_UNINSTALLATION) +EXTRA_DIST = $(xml_in_files) +CLEANFILES = $(xml_files) diff --git a/src/data/gramps.png b/src/data/gramps.png deleted file mode 100644 index 09b81f69a..000000000 Binary files a/src/data/gramps.png and /dev/null differ diff --git a/src/images/Makefile.am b/src/images/Makefile.am index 3e00d16ff..97d49699e 100644 --- a/src/images/Makefile.am +++ b/src/images/Makefile.am @@ -1,6 +1,6 @@ +# This is the src/images level Makefile for Gramps # $Id: Makefile.am 6057 2006-03-03 12:49:39Z loshawlos $ -# This is the src level Makefile for Gramps SUBDIRS = pkgdatadir = $(datadir)/@PACKAGE@/images @@ -30,7 +30,8 @@ dist_pkgdata_DATA = \ stock_link.png\ stock_lock-open.png\ stock_lock.png\ - tools.png - - + tools.png\ + somerights20.gif \ + document.png +EXTRA_DIST = gramps.svg diff --git a/src/data/document.png b/src/images/document.png similarity index 100% rename from src/data/document.png rename to src/images/document.png diff --git a/src/data/gramps.svg b/src/images/gramps.svg similarity index 100% rename from src/data/gramps.svg rename to src/images/gramps.svg diff --git a/src/data/somerights20.gif b/src/images/somerights20.gif similarity index 100% rename from src/data/somerights20.gif rename to src/images/somerights20.gif