Updated to 0.7.4.

Changes:

Enhancements
Beginnings of RELAX NG support
      * An importer that reads DTD files and generate RELAX NG schema.
        (me)
      * A Conglomerate display specification for editing RELAX NG schema
        files. (me)

Beginnings of XHTML support:
      * A Conglomerate display specification for editing XHTML (strict)
        web pages. (me)
      * A simple template for creating new web pages. (me)

Attribute editing:
      * The Property dialog now has a tab page listing any attributes
        found in the DTD for the selected node (me)
      * Utility functions to make it easy to create attribute editors by
        binding GTK and Glade widgets to XML attributes (me)
      * A custom property dialog for DocBook <orderedlist> tags as an
        example of the above. (me)

Improvements to document type infrastructure:
      * Support for template files that can be used in the File->New
        assistant (Jeff Martin)
      * A template for creating new Conglomerate display specification
        files (Jeff Martin)
      * XML doc types can specify a file extension. For example, RELAX
        NG schema files have a ".rng" extension, and HTML files have
        ".html" extension. (me)
      * The display spec file can specify a formal Public ID for the
        DTD, and the code will try to use this, even if the XML file
        doesn't explicitly specify the DTD. (me)
      * The File->Properties dialog allows you to remove DTD
        associations, and can guess at a DTD if one is not present. It
        has a button to add the association to the document header. (me)
      * The display specification file format now supports XML
        namespaces (me)

Improvements to the "Cleanup the XML Source" tool
      * The tool now understands the difference between structural and
        span tags and doesn't force line breaks for span tags. (me)
      * Fixed some bugs and improved look of the resulting source, IMHO.
        (me)

Other Enhancements
      * Stability enhancements (me)
      * Improvements to the DTD for our display specification files (me,
        Jeff Martin)
      * Various test files should now be in the examples subdirectory of
        the tarball (Geert Stappers)
      * You can now merge adjacent paragraphs (as requested by Linux
        Weekly News) - move the cursor to the end of a <para> tag and
        press Delete, or to the start of a tag and press Backspace. (me)
      * Probably some other things I missed :-)

Fixes
      * Fixed lots of cleanup bugs when documents were closed; this
        makes the app much more stable. (me)
      * Fix for bux #118769 - a new dialog to select importers if more
        than one is applicable (me)
      * Empty context submenus are now insensitive (me)
      * Removed an unnecessary dependency on GDK 2.2 which broke the
        build on Red Hat 8

5 files changed, 35 insertions, 47 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 0288555ad29..d4298fdc889 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/08/28 20:05:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/25 15:45:20 xtraeme Exp $
 #
 
-DISTNAME=	conglomerate-0.5.4
-PKGREVISION=	1
+DISTNAME=	conglomerate-0.7.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
diff --git a/editors/conglomerate/PLIST b/editors/conglomerate/PLIST
index d8ef2fa41a3..310445acd1e 100644
--- a/editors/conglomerate/PLIST
+++ b/editors/conglomerate/PLIST
@@ -1,18 +1,45 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/04 11:52:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/25 15:45:20 xtraeme Exp $
 bin/conglomerate
 share/applications/conglomerate.desktop
 share/conglomerate/dispspecs/cnxml.xds
+share/conglomerate/dispspecs/dispspec.xds
 share/conglomerate/dispspecs/docbook.xds
+share/conglomerate/dispspecs/kernel-traffic-newsletter.xds
 share/conglomerate/dispspecs/readme.xds
+share/conglomerate/dispspecs/relax-ng.xds
 share/conglomerate/dispspecs/website-layout.xds
 share/conglomerate/dispspecs/website-webpage.xds
-share/conglomerate/dispspecs/xsl.xds
+share/conglomerate/dispspecs/xhtml1-strict.xds
+share/conglomerate/dtd/xds.dtd
 share/conglomerate/examples/cnxml.xml
+share/conglomerate/examples/error-proposal.xml
+share/conglomerate/examples/file-roller.xml
+share/conglomerate/examples/i18n.xml
 share/conglomerate/examples/readme.xml
 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/docbook-common-properties.glade
+share/conglomerate/glade/docbook-orderedlist-properties.glade
+share/gnome/help/conglomerate/C/conglomerate.xml
+share/gnome/help/conglomerate/C/figures/conglomerate_logo.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/properties-dialog.png
+share/gnome/help/conglomerate/C/figures/quote.png
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/ru/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/omf/conglomerate/conglomerate-C.omf
 share/pixmaps/cong-address-16.png
 share/pixmaps/cong-answer-16.png
 share/pixmaps/cong-author-16.png
@@ -41,6 +68,7 @@ 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
 @dirrm share/conglomerate/glade
 @dirrm share/conglomerate/examples
 @dirrm share/conglomerate/dispspecs
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index c316e3a6e73..760dddd8ca3 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/04 11:52:50 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2003/09/25 15:45:20 xtraeme Exp $
 
-SHA1 (conglomerate-0.5.4.tar.gz) = 3869dd704efe323d8d7ee4a7b79ff6e571722369
-Size (conglomerate-0.5.4.tar.gz) = 427122 bytes
-SHA1 (patch-aa) = 85908e6c8a402d50d86aec6534b030d5d4dbf4cf
-SHA1 (patch-ab) = 362501f60083f7fb560abc7f070c87684f6e2440
+SHA1 (conglomerate-0.7.4.tar.gz) = 181c48069b6b4013909c67bd2bdb9ae3dbc7ac92
+Size (conglomerate-0.7.4.tar.gz) = 846534 bytes
diff --git a/editors/conglomerate/patches/patch-aa b/editors/conglomerate/patches/patch-aa
deleted file mode 100644
index 80e80130fbd..00000000000
--- a/editors/conglomerate/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/04 11:52:50 jmmv Exp $
-
---- src/cong-menus.c.orig	2003-06-24 19:33:54.000000000 +0200
-+++ src/cong-menus.c
-@@ -260,6 +260,8 @@ static GtkWidget *cong_document_properti
- 	CongDialogCategory *header_category;
- 	CongDialogCategory *dtd_category;
- 	gchar *filename, *path;
-+	struct _xmlDtd  *extSubset;	/* the document external subset */
-+	struct _xmlDtd  *intSubset;	/* the document internal subset */
- 
- 	g_return_val_if_fail(doc, NULL);
- 
-@@ -328,9 +330,6 @@ static GtkWidget *cong_document_properti
- 	} else {
- 	}
- 
--	struct _xmlDtd  *extSubset;	/* the document external subset */
--	struct _xmlDtd  *intSubset;	/* the document internal subset */
--
- #if 1
- 	notebook = GTK_NOTEBOOK(gtk_notebook_new());
- 	
diff --git a/editors/conglomerate/patches/patch-ab b/editors/conglomerate/patches/patch-ab
deleted file mode 100644
index 49bf46eaa81..00000000000
--- a/editors/conglomerate/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/04 11:52:50 jmmv Exp $
-
---- pixmaps/Makefile.in.orig	2003-07-04 13:22:31.000000000 +0200
-+++ pixmaps/Makefile.in
-@@ -141,8 +141,7 @@ pixmap_DATA = cong-docbook-set-16.png \
- 	cong-numbered-list-16.png \
- 	cong-list-item-16.png \
- 	cong-definition-list-16.png \
--	cong-code-fragment-16.png \
--	ChangeLog
-+	cong-code-fragment-16.png
- 
- 
- EXTRA_DIST = $(pixmap_DATA)