Update to 0.7.11:

Conglomerate 0.7.11
===================
Enhancements
	* New translations: no (Kjaartan Marass), fr (Alban Browaeys),
	  sq (Laurent Dhima)
	* Updated translations: cs (Miloslav Trmac), es (Francisco Javier
	  F. Serrador), nl (Daniel van Eeden), no (Kjartan Maraas), pt
	  (Duarte Loreto), sr/sr@Latn (Danilo ?egan),
	* The File->New assistant now has a "Random Document" plugin, which
	  is both great fun, and good for testing. If you select this, you
	  reach a page where you can select a document type from those
	  available (based on the dispspec files loaded). You can also specify
	  a "depth" which is used to give an idea of how deep the document's
	  tree should be. If a DTD is available, Conglomerate will try to
	  ensure that the document is valid against that DTD. It also
	  generates random text, to really push the unicode support (it
	  generates random strings using most of the full range of Unicode).
	  (me)
	* If a DTD if found, the DTD tab of the Properties dialog for a node
	  now has a "content model" view, showing the valid child elements
	  that are allowed by the DTD in a tree form. (me)
	* First attempt at a "Find" dialog; improving this and the "Replace"
	  dialog would make great jobs for programmers wanting to get
	  involved. (me)
	* Big rewrite of the plugin code with the aim of eventually moving
	  over to libgnomeoffice's framework. Plugins contain services of
	  various kinds; everything is now a GObject subclass. (me)
	* The "--enable-printing" configuration option no longer requires
	  libfo; this is now enabled separately with a new "--enable-libfo"
	  option (me)
	* Change template code to use a <cong:template> element (Jeff Martin)
	* Toolbar now has a "New Document" button (Daniel van Eeden)
	* Internal improvements to GUI button sensitivity logic (Paul Smith)
Fixes
	* Fix bug #130820 (me)
	* Fixed crash when loading file without a dispspec with no extension
	  in its filename (me)
	* Fixed a bug in the template code (Daniel Larson)
	* Fixes for C99ism build problems on gcc-2.95.4 (Geert Stappers)
	* Fixed whitespace issues in the README files (David Hoover)
	* Various build fixes, including disabling gtk-doc for now (Geert)
	* Added a couple of DocBook tags to the display specification (Daniel
	  Larsson)
	* Added a template file for display specifications to the examples
	  subfolder (Boris Goldowsky)

Conglomerate 0.7.10
===================
Enhancements
      * The Home and End keys now take you to the start/end of text
        within the current structural element; with Ctrl pressed they
        take you to the start/end of text within the document. Shift can
        be used to drag out selections as usual. This fixes bug #109698
        (me)
Fixes
      * Big rewrite of File->Properties dialog - it now uses Glade, it
        updates in response to changes of DTD, file URL and modification
        status (bugs #122029, 130728) (me)
      * Overview tree's root element now changes when the file's URL
        changes (bug #130728) (me)
      * Fix for bug #130724 (crash on loading examples/test-docbook.c)
        (me)
      * Added a wrapper function to generate generic property dialog
        descriptions to reduce translator workload (fixes bug #124780)
        (me)
      * Various documentation and Debian packaging fixes, including bug
        #123131 (Geert Stappers)
      * Disabled plugin support for Norman Walsh's website format as
        it's currently too broken to be worth supporting (see Bugzilla
        #113001 for some of the problems) (me)

Conglomerate 0.7.9
==================
Enhancements
      * Support for middle mouse button paste of PRIMARY (me)
      * Update PRIMARY whenever selection changes, fixing bugs #130248
        and #126039 (me)
      * Rewrite of clipboard and selection code. Selections are now
        offered and received as both XML and as text, in a sane format,
        fixing bug #129731 (me)
      * Updated translations - cs (Miloslav Trmac), sr, sr@Latn (Danilo
        ??egan), pt (Duarte Loreto), es (Francisco Javier F. Serrador)
      * Installs GConf schema file (Geert Stappers)
Fixes
      * Fixed various compilation warnings (me)
      * Fix for bug #125918 (Elements appearing in incorrect order) (me)
      * Fixed various bugs in the calculation of selection highlighting
        (including bug #124130); added an early reject to throw away
        unnecessary updates when dragging out a selection with the mouse
        (me)
      * Added ordering function for comparing nodes; fixed long-standing
        bug in CongRange reordering function which was causing glitches
        in the selection code (me)
      * Fixed bug when moving cursor to next word near end of a node's
        content which would generate an invalid cursor location
        off-by-one beyond the valid range (me)
      * Fix for bug #124508 (crash on inserting sibling) (me)
      * Fix for bug #125720 (crash on deleting nothing) (me)
      * Fixed crash when testing text nodes as being irrelevant
        whitespace in the case where they haven't yet been added to the
        tree (me)
      * Implemented various missing node types in
        cong_document_get_node_name, fixing a problem in the test data
        for bug #120976 (me)
      * Fix for bug #124208 (entity modification is not saved) (me)
      * Fix for bug #129752 (nested entity edit) (me)
      * Fix for bug #129907 (Elements appear in reverse order under
        certain circumstances) (me)
      * Fix for bug #130227 (Pasting simple text using the middle mouse
        button often causes assertion failures) (me)
      * Fix for bug #123490 (Carriage return should add a carriage
        return if whitespace is being preserved) (me)
      * Fix for bug #129776 (missing @PKGDATADIR@ definition) (me and
        Geert Stappers)
      * Improvements to dispspec debugging (Geert)
      * Fixed intltool problems (me)

Conglomerate 0.7.8
==================
Enhancements
      * Big reorganisation of the implementation of the editor widget,
        simplifying the code (me)
      * New GObject class representing an XPath expression, which will
        help towards some future bugfixes (me)
Fixes
      * Fixed C99ism build problem on gcc-2.95.4 (Pav Lucistnik)
      * Fixed missing files in POTFILES.in (Marcel Telka, Geert
        Stappers)
      * Fixed lots of warnings (me)
      * Increased self-tests on cursor validity (me)

Conglomerate 0.7.7
==================
Enhancements
      * Experimental GUI code to use the new GTK File Choser dialog
        (currently needs manually enabling) (Me)
      * Big rewrite of display specifications for document types.
        Support for localising XML element names and descriptions, using
        the xml:lang attribute and intltool; numerous other improvements
        (Me)
      * Ignore unnecessary whitespace text nodes in main editor view -
        Fix for bug #123367 by Anders Petersson giving a big visual
        enhancement ; fixed cursor movement to skip over them (me)
      * Updated translations - ca (Jordi Mallach), de (Christian
        Neumair), es (Francisco Javier F. Serrador), nl (Jeroen van der
        Vegt), pt (Duarte Loreto)
Fixes
      * Fix for bug 123065 (open using empty window instead of whole new
        window) (Robert Varga)
      * Portability improvements (Duraid Madina, Pav Lucistnik)
      * Get strings from immodule as UTF8, notify immodule of focus
        in/out (bug 125993) (Yukihiro Nakai)
      * Fixed unref of NULL uri (bug #126231) (Paul Smith)
      * Various GUI sensitivity fixes (Paul Smith)
      * Rewrie of intenals of text normalisation to supoprt Pango
        attributes in preparation for proper support of "pre-edit"
        strings from GTK input methods (me)
      * Fixed loading from GnomeVFS with a relative path (Robert Varga)
      * Fix for bug #127026 (crash when using cut from popup menu) (me)
      * Changed CTRL+SHIFT+S to Save As instead of Save a Copy (Michael
        Terry)
      * Force span tag to be wide enough to accommodate its title.
        Center contents. (Boris Goldowsky)

3 files changed, 95 insertions, 38 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 22c378831fc..e311ab7756a 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/02/07 15:24:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/09 12:38:58 jmmv Exp $
 #
 
-DISTNAME=	conglomerate-0.7.6
-PKGREVISION=	6
+DISTNAME=	conglomerate-0.7.11
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
@@ -12,8 +11,8 @@ COMMENT=	XML editor for GNOME2
 
 BUILD_USES_MSGFMT=	yes
 DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
-DEPENDS+=		docbook-xsl>=1.61.2:../../textproc/docbook-xsl
-DEPENDS+=		docbook-xml>=4.2nb4:../../textproc/docbook-xml
+DEPENDS+=		docbook-xsl>=1.64.1:../../textproc/docbook-xsl
+DEPENDS+=		docbook-xml>=4.2nb6:../../textproc/docbook-xml
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
@@ -28,10 +27,18 @@ CONFIGURE_ARGS+=	--enable-printing
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
+GCONF2_SCHEMAS=		conglomerate.schemas
+
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libbonobo/buildlink2.mk"
+.include "../../devel/libbonoboui/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../print/libgnomeprint/buildlink2.mk"
+.include "../../print/libgnomeprintui/buildlink2.mk"
+.include "../../textproc/intltool/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/editors/conglomerate/PLIST b/editors/conglomerate/PLIST
index 3732118f2c3..fa1d9c769d0 100644
--- a/editors/conglomerate/PLIST
+++ b/editors/conglomerate/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/03 23:03:39 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/09 12:38:58 jmmv Exp $
 bin/conglomerate
+share/application-registry/conglomerate.applications
 share/applications/conglomerate.desktop
 share/conglomerate/dispspecs/cnxml.xds
+share/conglomerate/dispspecs/dispspec-template.xds
 share/conglomerate/dispspecs/dispspec.xds
 share/conglomerate/dispspecs/docbook.xds
 share/conglomerate/dispspecs/forrest-document.xds
@@ -22,9 +24,12 @@ share/conglomerate/examples/test-docbook.xml
 share/conglomerate/examples/test-entities.xml
 share/conglomerate/examples/test-table.xml
 share/conglomerate/glade/cong-file-import.glade
+share/conglomerate/glade/cong-file-properties.glade
+share/conglomerate/glade/cong-find-replace.glade
 share/conglomerate/glade/docbook-common-properties.glade
 share/conglomerate/glade/docbook-orderedlist-properties.glade
 share/conglomerate/glade/docbook-ulink-properties.glade
+share/conglomerate/glade/plugin-random.glade
 share/conglomerate/glade/string_selection_dialog.glade
 share/conglomerate/pixmaps/cong-address-16.png
 share/conglomerate/pixmaps/cong-answer-16.png
@@ -60,60 +65,105 @@ share/conglomerate/pixmaps/cong-title-16.png
 share/conglomerate/pixmaps/cong-warning-48.png
 share/conglomerate/pixmaps/cong-wrapper-16.png
 share/conglomerate/pixmaps/conglomerate-icon-32.png
+share/conglomerate/stylesheets/selection-to-text.xsl
 share/conglomerate/templates/dispspec.xml
 share/conglomerate/templates/html.xml
+share/gconf/schemas/conglomerate.schemas
+share/gnome/help/conglomerate/C/cong_element_map_ref.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
+share/gnome/help/conglomerate/C/conventions.xml
+share/gnome/help/conglomerate/C/doc_type_support.xml
+share/gnome/help/conglomerate/C/faq.xml
+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
+share/gnome/help/conglomerate/C/figures/cong_editor_window.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_area.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_edit.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_edit_collapse.png
+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_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
+share/gnome/help/conglomerate/C/figures/cong_input_focus.png
+share/gnome/help/conglomerate/C/figures/cong_open_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_add.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_add.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_adv.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_adv_add.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_reder.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_lang.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_rev.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_scope.png
+share/gnome/help/conglomerate/C/figures/cong_save_as_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_save_copy_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_start_window.png
+share/gnome/help/conglomerate/C/figures/cong_validate_tool_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_view_source_menu.png
+share/gnome/help/conglomerate/C/figures/cong_view_source_window.png
 share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
+share/gnome/help/conglomerate/C/figures/important.png
 share/gnome/help/conglomerate/C/figures/intro.png
 share/gnome/help/conglomerate/C/figures/menu-properties.png
 share/gnome/help/conglomerate/C/figures/new-doc-wizard.png
 share/gnome/help/conglomerate/C/figures/new.png
+share/gnome/help/conglomerate/C/figures/note.png
 share/gnome/help/conglomerate/C/figures/properties-dialog.png
 share/gnome/help/conglomerate/C/figures/quote.png
+share/gnome/help/conglomerate/C/figures/tip.png
+share/gnome/help/conglomerate/C/figures/warning.png
+share/gnome/help/conglomerate/C/global.ent
+share/gnome/help/conglomerate/C/glossary.xml
+share/gnome/help/conglomerate/C/notice_fdl.xml
+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
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/conglomerate.mo
+share/mime-info/conglomerate.keys
+share/mime-info/conglomerate.mime
 share/omf/conglomerate/conglomerate-C.omf
-share/pixmaps/cong-address-16.png
-share/pixmaps/cong-answer-16.png
-share/pixmaps/cong-author-16.png
-share/pixmaps/cong-bibliography-16.png
-share/pixmaps/cong-bulleted-list-16.png
-share/pixmaps/cong-code-fragment-16.png
-share/pixmaps/cong-definition-list-16.png
-share/pixmaps/cong-docbook-article-16.png
-share/pixmaps/cong-docbook-book-16.png
-share/pixmaps/cong-docbook-set-16.png
-share/pixmaps/cong-editor-16.png
-share/pixmaps/cong-entry-16.png
-share/pixmaps/cong-faq-16.png
-share/pixmaps/cong-footnote-16.png
-share/pixmaps/cong-history-16.png
-share/pixmaps/cong-indexterm-16.png
-share/pixmaps/cong-list-16.png
-share/pixmaps/cong-list-item-16.png
-share/pixmaps/cong-metadata-16.png
-share/pixmaps/cong-name-16.png
-share/pixmaps/cong-numbered-list-16.png
-share/pixmaps/cong-paragraph-16.png
-share/pixmaps/cong-publisher-16.png
-share/pixmaps/cong-question-16.png
-share/pixmaps/cong-subsection-16.png
-share/pixmaps/cong-summary-16.png
-share/pixmaps/cong-title-16.png
-share/pixmaps/cong-wrapper-16.png
-@dirrm share/conglomerate/dtd
+share/pixmaps/conglomerate-icon-16.png
+@dirrm share/omf/conglomerate
+@comment in scrollkeeper: @dirrm share/omf
+@comment in gnome2-dirs: @dirrm share/mime-info
+@dirrm share/gnome/help/conglomerate/C/figures
+@dirrm share/gnome/help/conglomerate/C
+@dirrm share/gnome/help/conglomerate
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/conglomerate/templates
+@dirrm share/conglomerate/stylesheets
+@dirrm share/conglomerate/pixmaps
 @dirrm share/conglomerate/glade
 @dirrm share/conglomerate/examples
+@dirrm share/conglomerate/dtd
 @dirrm share/conglomerate/dispspecs
 @dirrm share/conglomerate
 @comment in gnome2-dirs: @dirrm share/applications
+@comment in gnome2-dirs: @dirrm share/application-registry
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 2820ce303e6..802bf8ef2ed 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/12/03 23:03:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/02/09 12:38:58 jmmv Exp $
 
-SHA1 (conglomerate-0.7.6.tar.gz) = 5c8739dea4035a7502334b5f6ad254e1d3cd3ba5
-Size (conglomerate-0.7.6.tar.gz) = 1115602 bytes
+SHA1 (conglomerate-0.7.11.tar.gz) = 85106884f40a5afef89770ee2423d561aa7d4b27
+Size (conglomerate-0.7.11.tar.gz) = 1932492 bytes