Remove leftovers from GConf era and clean up related code

svn: r10730

INSTALL

@@ -24,9 +24,8 @@ missing.
 
 Regular vs local installation
 -----------------------------
-This version of gramps requires, among others, the following to be done:
+This version of gramps REQUIRES, among other things, the mime types for 
-
+gramps be properly installed.
-mime types for gramps MUST be properly installed.
 
 The usual ./configure, make, and make install as a root should do the trick.
 
@@ -41,16 +40,15 @@ Most likely, such local install will also need some prefix with write
 permissions for you:
    --prefix=$HOME/my_gramps_path
 
-Whether you're doing local install or regular install,
+Whether you're doing local install or regular install, YOU MUST INSTALL 
-YOU MUST INSTALL MIME TYPES.
+MIME TYPES. YOU HAVE BEEN WARNED!
-YOU HAVE BEEN WARNED!
 
 
 Installing under non-default prefix
 -----------------------------------
 As hinted above, mime types for gramps MUST be properly installed. 
-The "proper install" means installing
+The "proper install" means installing them where the shared mime system 
-them where the shared mime system will find them.
+will find them.
 
 By default, the shared mime systems will look in these places:
    1. /usr/share/mime
@@ -71,8 +69,10 @@ something like --prefix=/usr/local/my_gramps, /var/gramps123/blah, etc.
 
 Packager's issues
 ------------------
-The above mime types must be installed.
+The above mime types must be installed. However, the 
-However, the update-mime-database to process the newly installed types and schemas must be done in POST-INSTALLATION.
+update-mime-database call to process the newly installed types and 
+schemas must be done in POST-INSTALLATION.
+
 In packager's world, the install happens on packager's machine
 into something like /tmp/gramps-tmp. However, the postinstall
 should happen on the user's machine.
@@ -85,5 +85,5 @@ This argument should disable postinstall calls made during
 make install, and print a nasty warning during configure.
 IT IS PACKAGER'S RESPONSIBILITY to follow the advice given
 by the configure output and to copy the appropriate code
-from the src/data/Makefile.am into the post-install (and post-uninstall)
+from the data/Makefile.am into the post-install (and post-uninstall)
 of the particular packaging system.

acinclude.m4

@@ -1,46 +1,3 @@
-dnl AM_GCONF2_REPLACEMENT
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to $GCONFTOOL
-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 --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
@@ -86,11 +43,11 @@ AC_DEFUN([AM_PACKAGER],
   if test "x$packager_mode" = "xtrue"; then
      AC_MSG_RESULT([WARNING: 
      	Packager mode enabled.
-        GConf schemas and shared mime types WILL NOT BE INSTALLED.
+        Shared mime types WILL NOT BE INSTALLED.
 	You will need to place the contents of the
-		GCONF_SCHEMAS_INSTALLATION and SHARED_MIME_INSTALLATION
+		SHARED_MIME_INSTALLATION
 	commands MANUALLY into the postinstall script of your package,
-	see src/data/Makefile.am file for details.
+	see data/Makefile.am file for details.
 	Otherwise you will end up with the unusable package.
 	YOU HAVE BEEN WARNED!])
   fi

data/Makefile.am

@@ -14,10 +14,6 @@ keys_in_files = gramps.keys.in
 keys_files = $(keys_in_files:.keys.in=.keys)
 @INTLTOOL_KEYS_RULE@
 
-schemas_in_files = gramps.schemas.in
-schemas_files = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-
 # Rules for files with translatable strings
 # These are taken care of by the intltool
 xml_in_files = gramps.xml.in
@@ -33,9 +29,6 @@ mime_DATA = $(keys_files) gramps.mime
 xmldir = $(SHARED_MIME_DIR)/packages
 xml_DATA = $(xml_files)
 
-schemasdir = $(SHARED_MIME_DIR)/packages
-schemas_DATA = $(schemas_files)
-
 pngdir = $(datadir)/icons/gnome/48x48/mimetypes
 png_DATA = \
 	gnome-mime-application-x-gramps.png \
@@ -61,18 +54,15 @@ EXTRA_DIST = \
 	$(mime_DATA) \
 	$(xml_DATA) \
 	$(desktop_DATA) \
-	$(xml_in_files) \
+	$(xml_in_files)
-	$(schemas_DATA) \
-	$(schemas_in_files)
 
 CLEANFILES = \
 	$(desktop_DATA) \
 	$(keys_files) \
-	$(xml_files) \
+	$(xml_files)
-	$(schemas_files)
 
-# Conditionally enable/disable gconf schemas or mime types,
+# Conditionally enable/disable mime types,
-# or disable both in a packager mode
+# or disable unconditionally if in a packager mode
 SHARED_MIME_INSTALLATION =
 SHARED_MIME_UNINSTALLATION =
 

po/POTFILES.in

@@ -705,5 +705,4 @@ src/plugins/writeftree.glade
 data/gramps.desktop.in
 data/gramps.keys.in
 data/gramps.xml.in
-data/gramps.schemas.in
 src/data/tips.xml.in

po/POTFILES.skip

@@ -1,3 +1,5 @@
+src/gen/lib/styledtext.py
+src/gen/lib/styledtexttagtype.py
 src/LdsUtils.py
 src/Mime/_WinMime.py
 src/ReportBase/_DocReportDialog.py