Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

2 files changed, 221 insertions, 228 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 88f8a09b641d..e352b946e091 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	conglomerate
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,8 +28,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 LIB_DEPENDS+=	enchant.1:${PORTSDIR}/textproc/enchant
 .endif
 
-post-install:
-	${MKDIR} ${PREFIX}/share/gnome/${PORTNAME}/help
-	${LN} -sf ${PREFIX}/share/gnome/help/${PORTNAME} ${PREFIX}/share/gnome/${PORTNAME}/help/${PORTNAME}
-
 .include <bsd.port.post.mk>
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index bb4b1e9235a4..c4f45fe6909d 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,172 +1,171 @@
 bin/conglomerate
 etc/gconf/schemas/conglomerate.schemas
-share/doc/conglomerate/class-hierarchy.html
-share/doc/conglomerate/class-overview.html
-share/doc/conglomerate/CongAttributeEditorCDATA.html
-share/doc/conglomerate/CongAttributeEditorENUMERATION.html
-share/doc/conglomerate/CongAttributeEditorLang.html
-share/doc/conglomerate/CongAttributeEditor.html
-share/doc/conglomerate/CongAttributeWrapperCheckButton.html
-share/doc/conglomerate/CongAttributeWrapperRadioButton.html
-share/doc/conglomerate/CongAttributeWrapper.html
-share/doc/conglomerate/CongCommandHistory.html
-share/doc/conglomerate/CongCommand.html
-share/doc/conglomerate/CongDocumentTraversal.html
-share/doc/conglomerate/CongDocument.html
-share/doc/conglomerate/CongEditorAreaBin.html
-share/doc/conglomerate/CongEditorAreaBorder.html
-share/doc/conglomerate/CongEditorAreaComposer.html
-share/doc/conglomerate/CongEditorAreaContainer.html
-share/doc/conglomerate/CongEditorAreaEntityDecl.html
-share/doc/conglomerate/CongEditorAreaEntityRef.html
-share/doc/conglomerate/CongEditorAreaExpander.html
-share/doc/conglomerate/CongEditorAreaLabelled.html
-share/doc/conglomerate/CongEditorAreaLine.html
-share/doc/conglomerate/CongEditorAreaListitem.html
-share/doc/conglomerate/CongEditorAreaParagraph.html
-share/doc/conglomerate/CongEditorAreaPixbuf.html
-share/doc/conglomerate/CongEditorAreaSpacer.html
-share/doc/conglomerate/CongEditorAreaSpanTag.html
-share/doc/conglomerate/CongEditorAreaStructuralTag.html
-share/doc/conglomerate/CongEditorAreaStructural.html
-share/doc/conglomerate/CongEditorAreaTextComment.html
-share/doc/conglomerate/CongEditorAreaTextFragment.html
-share/doc/conglomerate/CongEditorAreaText.html
-share/doc/conglomerate/CongEditorAreaUnderline.html
-share/doc/conglomerate/CongEditorAreaUnknownTag.html
-share/doc/conglomerate/CongEditorArea.html
-share/doc/conglomerate/CongEditorNodeElementListitem.html
-share/doc/conglomerate/CongEditorNodeElementParagraph.html
-share/doc/conglomerate/CongEditorNodeElement.html
-share/doc/conglomerate/CongEditorNode.html
-share/doc/conglomerate/CongEditorWidget3.html
-share/doc/conglomerate/conglomerate-CongApp.html
-share/doc/conglomerate/conglomerate-CongDispspecElement.html
-share/doc/conglomerate/conglomerate-CongDispspecRegistry.html
-share/doc/conglomerate/conglomerate-CongDispspec.html
-share/doc/conglomerate/conglomerate-CongEditorNodeComment.html
-share/doc/conglomerate/conglomerate-CongEditorNodeDocument.html
-share/doc/conglomerate/conglomerate-CongEditorNodeDtd.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementAdmonition.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementSpan.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementStructural.html
-share/doc/conglomerate/conglomerate-CongEditorNodeElementUnknown.html
-share/doc/conglomerate/conglomerate-CongEditorNodeEntityDecl.html
-share/doc/conglomerate/conglomerate-CongEditorNodeEntityRef.html
-share/doc/conglomerate/conglomerate-CongEditorNodeText.html
-share/doc/conglomerate/conglomerate-CongEditorNodeUnimplemented.html
-share/doc/conglomerate/conglomerate-CongLocation.html
-share/doc/conglomerate/conglomerate-CongObject.html
-share/doc/conglomerate/conglomerate-CongPluginManager.html
-share/doc/conglomerate/conglomerate-CongRange.html
-share/doc/conglomerate/conglomerate-CongSelection.html
-share/doc/conglomerate/conglomerate-CongServicePrintMethod.html
-share/doc/conglomerate/conglomerate-cong-dialog.html
-share/doc/conglomerate/conglomerate-cong-edit-find-and-replace.html
-share/doc/conglomerate/conglomerate-cong-eel.html
-share/doc/conglomerate/conglomerate-cong-eel-graphic-effects.html
-share/doc/conglomerate/conglomerate-cong-enum-mapping.html
-share/doc/conglomerate/conglomerate-cong-error-dialog.html
-share/doc/conglomerate/conglomerate-cong-fake-plugin-hooks.html
-share/doc/conglomerate/conglomerate-cong-file-selection.html
-share/doc/conglomerate/conglomerate-cong-font.html
-share/doc/conglomerate/conglomerate-cong-glade.html
-share/doc/conglomerate/conglomerate-cong-graph.html
-share/doc/conglomerate/conglomerate-cong-marshal.html
-share/doc/conglomerate/conglomerate-cong-overview-view.html
-share/doc/conglomerate/conglomerate-cong-parser-error.html
-share/doc/conglomerate/conglomerate-cong-primary-window.html
-share/doc/conglomerate/conglomerate-cong-progress-checklist.html
-share/doc/conglomerate/conglomerate-cong-text-cache.html
-share/doc/conglomerate/conglomerate-cong-tree-view.html
-share/doc/conglomerate/conglomerate-cong-ui-hooks.html
-share/doc/conglomerate/conglomerate-cong-vfs.html
-share/doc/conglomerate/conglomerate-cong-view.html
-share/doc/conglomerate/conglomerate-DTD-Handling.html
-share/doc/conglomerate/conglomerate-global.html
-share/doc/conglomerate/conglomerate-Utility-functions.html
-share/doc/conglomerate/conglomerate-XML-Nodes.html
-share/doc/conglomerate/CongModificationCursorChange.html
-share/doc/conglomerate/CongModificationSelectionChange.html
-share/doc/conglomerate/CongModificationSetDtdPtr.html
-share/doc/conglomerate/CongModification.html
-share/doc/conglomerate/CongNodeModificationAddAfter.html
-share/doc/conglomerate/CongNodeModificationAddBefore.html
-share/doc/conglomerate/CongNodeModificationMakeOrphan.html
-share/doc/conglomerate/CongNodeModificationRemoveAttribute.html
-share/doc/conglomerate/CongNodeModificationSetAttribute.html
-share/doc/conglomerate/CongNodeModificationSetParent.html
-share/doc/conglomerate/CongNodeModificationSetText.html
-share/doc/conglomerate/CongNodeModification.html
-share/doc/conglomerate/CongPlugin.html
-share/doc/conglomerate/CongServiceDocTool.html
-share/doc/conglomerate/CongServiceDocumentFactory.html
-share/doc/conglomerate/CongServiceEditorNodeFactory.html
-share/doc/conglomerate/CongServiceExporter.html
-share/doc/conglomerate/CongServiceImporter.html
-share/doc/conglomerate/CongServiceNodePropertyDialog.html
-share/doc/conglomerate/CongServiceNodeTool.html
-share/doc/conglomerate/CongServiceTool.html
-share/doc/conglomerate/CongService.html
-share/doc/conglomerate/CongTraversalNode.html
-share/doc/conglomerate/CongXPathExpression.html
-share/doc/conglomerate/ch01.html
-share/doc/conglomerate/ch02.html
-share/doc/conglomerate/editor.html
-share/doc/conglomerate/helper.html
-share/doc/conglomerate/index.html
-share/doc/conglomerate/index.sgml
-share/doc/conglomerate/ix01.html
-share/doc/conglomerate/misc.html
-share/doc/conglomerate/plugins.html
-share/doc/conglomerate/state.html
-share/doc/conglomerate/views.html
-share/doc/conglomerate/xml.html
-share/gnome/application-registry/conglomerate.applications
-share/gnome/applications/conglomerate.desktop
-share/gnome/conglomerate/css/docbook.css
-share/gnome/conglomerate/dispspecs/cnxml.xds
-share/gnome/conglomerate/dispspecs/dispspec.xds
-share/gnome/conglomerate/dispspecs/docbook.xds
-share/gnome/conglomerate/dispspecs/forrest-document.xds
-share/gnome/conglomerate/dispspecs/kernel-traffic-newsletter.xds
-share/gnome/conglomerate/dispspecs/opml.xds
-share/gnome/conglomerate/dispspecs/readme.xds
-share/gnome/conglomerate/dispspecs/relax-ng.xds
-share/gnome/conglomerate/dispspecs/release.xds
-share/gnome/conglomerate/dispspecs/teixlite.xds
-share/gnome/conglomerate/dispspecs/website-layout.xds
-share/gnome/conglomerate/dispspecs/website-webpage.xds
-share/gnome/conglomerate/dispspecs/xhtml1-strict.xds
-share/gnome/conglomerate/dispspecs/xsl.xds
-share/gnome/conglomerate/dtd/release.dtd
-share/gnome/conglomerate/dtd/xds.dtd
-share/gnome/conglomerate/examples/cnxml.xml
-share/gnome/conglomerate/examples/error-proposal.xml
-share/gnome/conglomerate/examples/file-roller.xml
-share/gnome/conglomerate/examples/i18n.xml
-share/gnome/conglomerate/examples/nmtoken.xml
-share/gnome/conglomerate/examples/readme.xml
-share/gnome/conglomerate/examples/test-docbook.xml
-share/gnome/conglomerate/examples/test-entities.xml
-share/gnome/conglomerate/examples/test-table.xml
-share/gnome/conglomerate/examples/test-table3.xml
-share/gnome/conglomerate/glade/cong-file-import.glade
-share/gnome/conglomerate/glade/cong-file-properties.glade
-share/gnome/conglomerate/glade/cong-find-replace.glade
-share/gnome/conglomerate/glade/cong-preferences.glade
-share/gnome/conglomerate/glade/custom-element.glade
-share/gnome/conglomerate/glade/docbook-common-properties.glade
-share/gnome/conglomerate/glade/docbook-orderedlist-properties.glade
-share/gnome/conglomerate/glade/docbook-ulink-properties.glade
-share/gnome/conglomerate/glade/plugin-arbitrary.glade
-share/gnome/conglomerate/glade/plugin-random.glade
-share/gnome/conglomerate/glade/string_selection_dialog.glade
-share/gnome/conglomerate/help/conglomerate
-share/gnome/conglomerate/stylesheets/selection-to-text.xsl
-share/gnome/conglomerate/templates/dispspec.xml
-share/gnome/conglomerate/templates/dispspec-template.xds
-share/gnome/conglomerate/templates/html.xml
+share/application-registry/conglomerate.applications
+share/applications/conglomerate.desktop
+%%DATADIR%%/css/docbook.css
+%%DATADIR%%/dispspecs/cnxml.xds
+%%DATADIR%%/dispspecs/dispspec.xds
+%%DATADIR%%/dispspecs/docbook.xds
+%%DATADIR%%/dispspecs/forrest-document.xds
+%%DATADIR%%/dispspecs/kernel-traffic-newsletter.xds
+%%DATADIR%%/dispspecs/opml.xds
+%%DATADIR%%/dispspecs/readme.xds
+%%DATADIR%%/dispspecs/relax-ng.xds
+%%DATADIR%%/dispspecs/release.xds
+%%DATADIR%%/dispspecs/teixlite.xds
+%%DATADIR%%/dispspecs/website-layout.xds
+%%DATADIR%%/dispspecs/website-webpage.xds
+%%DATADIR%%/dispspecs/xhtml1-strict.xds
+%%DATADIR%%/dispspecs/xsl.xds
+%%DATADIR%%/dtd/release.dtd
+%%DATADIR%%/dtd/xds.dtd
+%%DATADIR%%/examples/cnxml.xml
+%%DATADIR%%/examples/error-proposal.xml
+%%DATADIR%%/examples/file-roller.xml
+%%DATADIR%%/examples/i18n.xml
+%%DATADIR%%/examples/nmtoken.xml
+%%DATADIR%%/examples/readme.xml
+%%DATADIR%%/examples/test-docbook.xml
+%%DATADIR%%/examples/test-entities.xml
+%%DATADIR%%/examples/test-table.xml
+%%DATADIR%%/examples/test-table3.xml
+%%DATADIR%%/glade/cong-file-import.glade
+%%DATADIR%%/glade/cong-file-properties.glade
+%%DATADIR%%/glade/cong-find-replace.glade
+%%DATADIR%%/glade/cong-preferences.glade
+%%DATADIR%%/glade/custom-element.glade
+%%DATADIR%%/glade/docbook-common-properties.glade
+%%DATADIR%%/glade/docbook-orderedlist-properties.glade
+%%DATADIR%%/glade/docbook-ulink-properties.glade
+%%DATADIR%%/glade/plugin-arbitrary.glade
+%%DATADIR%%/glade/plugin-random.glade
+%%DATADIR%%/glade/string_selection_dialog.glade
+%%DATADIR%%/stylesheets/selection-to-text.xsl
+%%DATADIR%%/templates/dispspec-template.xds
+%%DATADIR%%/templates/dispspec.xml
+%%DATADIR%%/templates/html.xml
+%%DOCSDIR%%/CongAttributeEditor.html
+%%DOCSDIR%%/CongAttributeEditorCDATA.html
+%%DOCSDIR%%/CongAttributeEditorENUMERATION.html
+%%DOCSDIR%%/CongAttributeEditorLang.html
+%%DOCSDIR%%/CongAttributeWrapper.html
+%%DOCSDIR%%/CongAttributeWrapperCheckButton.html
+%%DOCSDIR%%/CongAttributeWrapperRadioButton.html
+%%DOCSDIR%%/CongCommand.html
+%%DOCSDIR%%/CongCommandHistory.html
+%%DOCSDIR%%/CongDocument.html
+%%DOCSDIR%%/CongDocumentTraversal.html
+%%DOCSDIR%%/CongEditorArea.html
+%%DOCSDIR%%/CongEditorAreaBin.html
+%%DOCSDIR%%/CongEditorAreaBorder.html
+%%DOCSDIR%%/CongEditorAreaComposer.html
+%%DOCSDIR%%/CongEditorAreaContainer.html
+%%DOCSDIR%%/CongEditorAreaEntityDecl.html
+%%DOCSDIR%%/CongEditorAreaEntityRef.html
+%%DOCSDIR%%/CongEditorAreaExpander.html
+%%DOCSDIR%%/CongEditorAreaLabelled.html
+%%DOCSDIR%%/CongEditorAreaLine.html
+%%DOCSDIR%%/CongEditorAreaListitem.html
+%%DOCSDIR%%/CongEditorAreaParagraph.html
+%%DOCSDIR%%/CongEditorAreaPixbuf.html
+%%DOCSDIR%%/CongEditorAreaSpacer.html
+%%DOCSDIR%%/CongEditorAreaSpanTag.html
+%%DOCSDIR%%/CongEditorAreaStructural.html
+%%DOCSDIR%%/CongEditorAreaStructuralTag.html
+%%DOCSDIR%%/CongEditorAreaText.html
+%%DOCSDIR%%/CongEditorAreaTextComment.html
+%%DOCSDIR%%/CongEditorAreaTextFragment.html
+%%DOCSDIR%%/CongEditorAreaUnderline.html
+%%DOCSDIR%%/CongEditorAreaUnknownTag.html
+%%DOCSDIR%%/CongEditorNode.html
+%%DOCSDIR%%/CongEditorNodeElement.html
+%%DOCSDIR%%/CongEditorNodeElementListitem.html
+%%DOCSDIR%%/CongEditorNodeElementParagraph.html
+%%DOCSDIR%%/CongEditorWidget3.html
+%%DOCSDIR%%/CongModification.html
+%%DOCSDIR%%/CongModificationCursorChange.html
+%%DOCSDIR%%/CongModificationSelectionChange.html
+%%DOCSDIR%%/CongModificationSetDtdPtr.html
+%%DOCSDIR%%/CongNodeModification.html
+%%DOCSDIR%%/CongNodeModificationAddAfter.html
+%%DOCSDIR%%/CongNodeModificationAddBefore.html
+%%DOCSDIR%%/CongNodeModificationMakeOrphan.html
+%%DOCSDIR%%/CongNodeModificationRemoveAttribute.html
+%%DOCSDIR%%/CongNodeModificationSetAttribute.html
+%%DOCSDIR%%/CongNodeModificationSetParent.html
+%%DOCSDIR%%/CongNodeModificationSetText.html
+%%DOCSDIR%%/CongPlugin.html
+%%DOCSDIR%%/CongService.html
+%%DOCSDIR%%/CongServiceDocTool.html
+%%DOCSDIR%%/CongServiceDocumentFactory.html
+%%DOCSDIR%%/CongServiceEditorNodeFactory.html
+%%DOCSDIR%%/CongServiceExporter.html
+%%DOCSDIR%%/CongServiceImporter.html
+%%DOCSDIR%%/CongServiceNodePropertyDialog.html
+%%DOCSDIR%%/CongServiceNodeTool.html
+%%DOCSDIR%%/CongServiceTool.html
+%%DOCSDIR%%/CongTraversalNode.html
+%%DOCSDIR%%/CongXPathExpression.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/class-hierarchy.html
+%%DOCSDIR%%/class-overview.html
+%%DOCSDIR%%/conglomerate-CongApp.html
+%%DOCSDIR%%/conglomerate-CongDispspec.html
+%%DOCSDIR%%/conglomerate-CongDispspecElement.html
+%%DOCSDIR%%/conglomerate-CongDispspecRegistry.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeComment.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeDocument.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeDtd.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementAdmonition.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementSpan.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementStructural.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeElementUnknown.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeEntityDecl.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeEntityRef.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeText.html
+%%DOCSDIR%%/conglomerate-CongEditorNodeUnimplemented.html
+%%DOCSDIR%%/conglomerate-CongLocation.html
+%%DOCSDIR%%/conglomerate-CongObject.html
+%%DOCSDIR%%/conglomerate-CongPluginManager.html
+%%DOCSDIR%%/conglomerate-CongRange.html
+%%DOCSDIR%%/conglomerate-CongSelection.html
+%%DOCSDIR%%/conglomerate-CongServicePrintMethod.html
+%%DOCSDIR%%/conglomerate-DTD-Handling.html
+%%DOCSDIR%%/conglomerate-Utility-functions.html
+%%DOCSDIR%%/conglomerate-XML-Nodes.html
+%%DOCSDIR%%/conglomerate-cong-dialog.html
+%%DOCSDIR%%/conglomerate-cong-edit-find-and-replace.html
+%%DOCSDIR%%/conglomerate-cong-eel-graphic-effects.html
+%%DOCSDIR%%/conglomerate-cong-eel.html
+%%DOCSDIR%%/conglomerate-cong-enum-mapping.html
+%%DOCSDIR%%/conglomerate-cong-error-dialog.html
+%%DOCSDIR%%/conglomerate-cong-fake-plugin-hooks.html
+%%DOCSDIR%%/conglomerate-cong-file-selection.html
+%%DOCSDIR%%/conglomerate-cong-font.html
+%%DOCSDIR%%/conglomerate-cong-glade.html
+%%DOCSDIR%%/conglomerate-cong-graph.html
+%%DOCSDIR%%/conglomerate-cong-marshal.html
+%%DOCSDIR%%/conglomerate-cong-overview-view.html
+%%DOCSDIR%%/conglomerate-cong-parser-error.html
+%%DOCSDIR%%/conglomerate-cong-primary-window.html
+%%DOCSDIR%%/conglomerate-cong-progress-checklist.html
+%%DOCSDIR%%/conglomerate-cong-text-cache.html
+%%DOCSDIR%%/conglomerate-cong-tree-view.html
+%%DOCSDIR%%/conglomerate-cong-ui-hooks.html
+%%DOCSDIR%%/conglomerate-cong-vfs.html
+%%DOCSDIR%%/conglomerate-cong-view.html
+%%DOCSDIR%%/conglomerate-global.html
+%%DOCSDIR%%/editor.html
+%%DOCSDIR%%/helper.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/misc.html
+%%DOCSDIR%%/plugins.html
+%%DOCSDIR%%/state.html
+%%DOCSDIR%%/views.html
+%%DOCSDIR%%/xml.html
 share/gnome/help/conglomerate/C/cong_element_map_ref.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
 share/gnome/help/conglomerate/C/conventions.xml
@@ -176,6 +175,7 @@ share/gnome/help/conglomerate/C/figures/caution.png
 share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz1.png
 share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz2.png
 share/gnome/help/conglomerate/C/figures/cong_dump_xds_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_edit_xds_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_overview.png
 share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_popup_menu.png
 share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_raw.png
@@ -187,7 +187,6 @@ share/gnome/help/conglomerate/C/figures/cong_editor_window_menubar.png
 share/gnome/help/conglomerate/C/figures/cong_editor_window_statusbar.png
 share/gnome/help/conglomerate/C/figures/cong_editor_window_titlebar.png
 share/gnome/help/conglomerate/C/figures/cong_editor_window_toolbar.png
-share/gnome/help/conglomerate/C/figures/cong_edit_xds_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_export_file_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_import_file_dialog.png
 share/gnome/help/conglomerate/C/figures/cong_inline_menu.png
@@ -226,47 +225,6 @@ share/gnome/help/conglomerate/C/notice_gpl.xml
 share/gnome/help/conglomerate/C/row_xml_lang_attrib.xml
 share/gnome/help/conglomerate/C/tbl_element_attrib.xml
 share/gnome/help/conglomerate/C/xds_dtd_def.xml
-share/gnome/mime-info/conglomerate.keys
-share/gnome/mime-info/conglomerate.mime
-share/gnome/omf/conglomerate/conglomerate-C.omf
-share/gnome/pixmaps/conglomerate-icon-16.png
-share/gnome/pixmaps/conglomerate/conglomerate-icon-32.png
-share/gnome/pixmaps/conglomerate/conglomerate-logo.png
-share/gnome/pixmaps/conglomerate/cong-address-16.png
-share/gnome/pixmaps/conglomerate/cong-answer-16.png
-share/gnome/pixmaps/conglomerate/cong-author-16.png
-share/gnome/pixmaps/conglomerate/cong-bibliography-16.png
-share/gnome/pixmaps/conglomerate/cong-bulleted-list-16.png
-share/gnome/pixmaps/conglomerate/cong-caution-48.png
-share/gnome/pixmaps/conglomerate/cong-comment-16.png
-share/gnome/pixmaps/conglomerate/cong-code-fragment-16.png
-share/gnome/pixmaps/conglomerate/cong-definition-list-16.png
-share/gnome/pixmaps/conglomerate/cong-docbook-article-16.png
-share/gnome/pixmaps/conglomerate/cong-docbook-book-16.png
-share/gnome/pixmaps/conglomerate/cong-docbook-set-16.png
-share/gnome/pixmaps/conglomerate/cong-editor-16.png
-share/gnome/pixmaps/conglomerate/cong-entry-16.png
-share/gnome/pixmaps/conglomerate/cong-faq-16.png
-share/gnome/pixmaps/conglomerate/cong-footnote-16.png
-share/gnome/pixmaps/conglomerate/cong-history-16.png
-share/gnome/pixmaps/conglomerate/cong-important-48.png
-share/gnome/pixmaps/conglomerate/cong-indexterm-16.png
-share/gnome/pixmaps/conglomerate/cong-list-item-16.png
-share/gnome/pixmaps/conglomerate/cong-list-16.png
-share/gnome/pixmaps/conglomerate/cong-metadata-16.png
-share/gnome/pixmaps/conglomerate/cong-name-16.png
-share/gnome/pixmaps/conglomerate/cong-note-48.png
-share/gnome/pixmaps/conglomerate/cong-numbered-list-16.png
-share/gnome/pixmaps/conglomerate/cong-paragraph-16.png
-share/gnome/pixmaps/conglomerate/cong-publisher-16.png
-share/gnome/pixmaps/conglomerate/cong-question-16.png
-share/gnome/pixmaps/conglomerate/cong-subsection-16.png
-share/gnome/pixmaps/conglomerate/cong-summary-16.png
-share/gnome/pixmaps/conglomerate/cong-tip-48.png
-share/gnome/pixmaps/conglomerate/cong-title-16.png
-share/gnome/pixmaps/conglomerate/cong-uncomment-16.png
-share/gnome/pixmaps/conglomerate/cong-warning-48.png
-share/gnome/pixmaps/conglomerate/cong-wrapper-16.png
 share/locale/az/LC_MESSAGES/conglomerate.mo
 share/locale/ca/LC_MESSAGES/conglomerate.mo
 share/locale/cs/LC_MESSAGES/conglomerate.mo
@@ -293,20 +251,59 @@ share/locale/sr@Latn/LC_MESSAGES/conglomerate.mo
 share/locale/sv/LC_MESSAGES/conglomerate.mo
 share/locale/uk/LC_MESSAGES/conglomerate.mo
 share/locale/zh_CN/LC_MESSAGES/conglomerate.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrm share/gnome/pixmaps/conglomerate
-@dirrm share/gnome/omf/conglomerate
+share/mime-info/conglomerate.keys
+share/mime-info/conglomerate.mime
+share/omf/conglomerate/conglomerate-C.omf
+share/pixmaps/conglomerate-icon-16.png
+share/pixmaps/conglomerate/cong-address-16.png
+share/pixmaps/conglomerate/cong-answer-16.png
+share/pixmaps/conglomerate/cong-author-16.png
+share/pixmaps/conglomerate/cong-bibliography-16.png
+share/pixmaps/conglomerate/cong-bulleted-list-16.png
+share/pixmaps/conglomerate/cong-caution-48.png
+share/pixmaps/conglomerate/cong-code-fragment-16.png
+share/pixmaps/conglomerate/cong-comment-16.png
+share/pixmaps/conglomerate/cong-definition-list-16.png
+share/pixmaps/conglomerate/cong-docbook-article-16.png
+share/pixmaps/conglomerate/cong-docbook-book-16.png
+share/pixmaps/conglomerate/cong-docbook-set-16.png
+share/pixmaps/conglomerate/cong-editor-16.png
+share/pixmaps/conglomerate/cong-entry-16.png
+share/pixmaps/conglomerate/cong-faq-16.png
+share/pixmaps/conglomerate/cong-footnote-16.png
+share/pixmaps/conglomerate/cong-history-16.png
+share/pixmaps/conglomerate/cong-important-48.png
+share/pixmaps/conglomerate/cong-indexterm-16.png
+share/pixmaps/conglomerate/cong-list-16.png
+share/pixmaps/conglomerate/cong-list-item-16.png
+share/pixmaps/conglomerate/cong-metadata-16.png
+share/pixmaps/conglomerate/cong-name-16.png
+share/pixmaps/conglomerate/cong-note-48.png
+share/pixmaps/conglomerate/cong-numbered-list-16.png
+share/pixmaps/conglomerate/cong-paragraph-16.png
+share/pixmaps/conglomerate/cong-publisher-16.png
+share/pixmaps/conglomerate/cong-question-16.png
+share/pixmaps/conglomerate/cong-subsection-16.png
+share/pixmaps/conglomerate/cong-summary-16.png
+share/pixmaps/conglomerate/cong-tip-48.png
+share/pixmaps/conglomerate/cong-title-16.png
+share/pixmaps/conglomerate/cong-uncomment-16.png
+share/pixmaps/conglomerate/cong-warning-48.png
+share/pixmaps/conglomerate/cong-wrapper-16.png
+share/pixmaps/conglomerate/conglomerate-icon-32.png
+share/pixmaps/conglomerate/conglomerate-logo.png
+@dirrm share/omf/conglomerate
+@dirrm share/pixmaps/conglomerate
 @dirrm share/gnome/help/conglomerate/C/figures
 @dirrm share/gnome/help/conglomerate/C
 @dirrm share/gnome/help/conglomerate
-@dirrm share/gnome/conglomerate/css
-@dirrm share/gnome/conglomerate/dispspecs
-@dirrm share/gnome/conglomerate/dtd
-@dirrm share/gnome/conglomerate/examples
-@dirrm share/gnome/conglomerate/glade
-@dirrm share/gnome/conglomerate/help
-@dirrm share/gnome/conglomerate/stylesheets
-@dirrm share/gnome/conglomerate/templates
-@dirrm share/gnome/conglomerate
-@dirrm share/doc/conglomerate
+@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/stylesheets
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/dtd
+@dirrm %%DATADIR%%/dispspecs
+@dirrm %%DATADIR%%/css
+@dirrm %%DATADIR%%
+@dirrmtry share/applications