Update to 1.2:

2004-02-16  Damon Chaplin  <damon@gnome.org>

	* Released 1.2.

2004-02-16  Damon Chaplin  <damon@gnome.org>

	* gtk-doc.cat.in: removed public ID for gtk-doc.dtd, since we don't
	use it any more.

Sat Feb 14 02:14:27 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk-doc.m4: Avoid unnecessary checks if gtk-doc is
	disabled.  (#134221, Julio M. Merino Vidal)

Sat Feb 14 02:03:01 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk-doc.make: Don't create unneeded empty
	directories.  (#134319, Julio M. Merino Vidal)

Sat Feb 14 01:37:38 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk-doc.make: Add an empty all-local target to make it work
	with non-GNU make.  (#134343, Julio M. Merino Vidal)

Wed Jan 28 00:52:00 2004  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in (OutputObjectList): Avoid emitting invalid
	docbook markup if there are no objects. Partial fix for #132661.

Sun Jan 25 22:01:15 2004  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in: Accept both the old and the new XInclude
	namespace.  (#131675, Edd Dumbill)

2004-01-23  Thomas Vander Stichele  <thomas at apestaart dot org>

	* gtkdoc-mkhtml.in: exit when tools return non-zero so errors can
          be caught.

Thu Jan 15 23:06:10 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk-doc.xsl: Set the chunk.fast parameter, to gain some
	speed.

Thu Jan 15 23:05:23 2004  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-fixxref.in: Make it work again without explicit
	--module.

Sat Dec 27 01:36:08 2003  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-scangobj.in:
	* gtkdoc-mktmpl.in:
	* gtkdoc-scan.in:
	* gtkdoc-fixxref.in: Add --help.  (#126915)

Sat Dec 27 00:43:42 2003  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in (ParseEnumDeclaration):
	* gtkdoc-mktmpl.in (ParseEnumDeclaration): Support a trailing ,
	in enum declarations. These are a GNU C extension, but also
	blessed by C99.  (#129949, Thomas Vander Stichele)

Sun Nov 16 00:29:03 2003  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-scangobj.in: Don't use g_strdown(). (#127028,
	David Schleef)

Sun Nov 16 00:26:05 2003  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-scangobj.in: If compiled against GLib >= 2.3.0, look
	for properties on interfaces.  (#127068, James M. Cape)

2003-11-03  Dan Winship  <danw@ximian.com>

	* gtkdoc-scangobj.in: Clean up $MODULE-scan.o even when using
	libtool

	* gtkdoc-scanobj.in: Likewise

	* gtk-doc.make (CLEANFILES): Remove $(MODULE)-scan.o from here
	(clean-local): rm -rf .libs

Wed Oct  8 01:21:54 2003  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-scan.in (ScanHeader): Make gtkdoc-scan grok
	typedef struct { } foo; in addition to the more baroque
	typedef struct _foo foo; struct _foo { };
	(#116807, Malcolm Tredinnick)

Wed Oct  8 01:21:35 2003  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in (OutputParamDescriptions): Remove a pointless
	warning.

2003-10-01  Matthias Clasen  <maclas@gmx.de>

	Make signals and properties end up in the right template
	file (#116569, Owen Taylor):

	* gtkdoc-mktmpl.in (OutputSignalTemplates):
	(OutputArgTemplates): Return a string rather than directly
	writing to OUTPUT.
	(OutputTemplateFile): Don't interpret $title as the name of
	the object to print signal and property templates for.
	(UpdateTemplates): Collect signal and property templates for all
	objects contained in the section.

2003-08-10  James Henstridge  <james@daa.com.au>

	* acinclude.m4 (JH_PATH_XML_CATALOG): allow caller to specify
	actions if found or not found.
	(JH_CHECK_XML_CATALOG): when requiring JH_PATH_XML_CATALOG, don't
	error out if it is not found.

2003-08-03  Matthias Clasen  <maclas@gmx.de>

	* doc/gnome.txt: Add some hints regarding markup of examples.

2003-07-22  Matthias Clasen  <maclas@gmx.de>

	* configure.in:
	* gtk-doc.cat: Fix a problem with the previous commit.

2003-07-21  Matthias Clasen  <maclas@gmx.de>

	Applied patches from Sebastian Rittau to add maintainer mode and an
	SGML catalog.  (#117955, #117956)

	* gtk-doc.cat.in: New catalog file.
	* configure.in: Added gtk-doc.catalog to output files.
	* Makefile.am: Install gtk-doc.catalog.

	* configure.in: Added AM_MAINTAINER_MODE.
	* autogen.sh: Added --enable-maintainer-mode to configure options.

2003-07-09  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mktmpl.in (ParseStructDeclaration):
	* gtkdoc-mkdb.in (ParseStructDeclaration): Accept volatile struct
	members, which have just made their appearance in glib.

2003-06-29  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in (ExpandAbbreviations): When expanding @param, catch
	the common @param->field and @param.field, to reduce the need for
	littering the C sources with <literal>foo->bar</literal>.

2003-06-25  Matthias Clasen  <maclas@gmx.de>

	Changes for #115528:

	* gtkdoc-mkdb.in (OutputSGML): Collect hierarchy, interfaces,
	implementations, prerequisites and derived interfaces separately.
	(OutputSGMLFile): Take two more arguments: implementations and derived
	interfaces.
	(GetHierarchy): Also put immediate children in the local tree.
	(GetInterfaces): Split into GetInterfaces and GetImplementations.
	(GetImplementations): New function to get the implementations of an
	interface.
	(GetDerived): New function to get the known derived interfaces of an
	interface.

	* gtkdoc-mkdb.in (MakeXRef): Accept a second, optional parameter for the
	text of the link.
	(ExpandAbbreviations): Add semantic markup inside the links, so that
	non-crossreferenced symbols come out properly formatted after link
	removal.  (#61345)

2003-06-15  Matthias Clasen  <maclas@gmx.de>

	Support for a flat index of all symbols.  (#92861)
	To use, put an empty <index/> element in your driver document.

	* gtkdoc-mkdb.in (MakeIndexterms): New function, emits an indexterm.
	(OutputMacro, OutputTypedef, OutputStruct, OutputEnum,
	OutputUnion, OutputVariable, OutputFunction): Use MakeIndexterms.
	to emit indexterms for symbols.

	* gtkdoc-mkdb.in (GetSignals):
	(GetArgs): Emit Since: information for signals and properties.

Thu Jun 12 15:55:57 2003  Owen Taylor  <otaylor@redhat.com>

	* gtkdoc-mkhtml.in (declaration): Replace head -1 with -n 1.
	(Merge change by Elliot Lee from Red Hat package)

2003-06-11  Matthias Clasen  <maclas@gmx.de>

	* doc/gnome.txt: Updates to the documentation of inline comments.

2003-06-03  Matthias Clasen  <maclas@gmx.de>

	* gtk-doc.spec.in: Add a missing Provides: and include the .pc file.
	(#106568, Joe Pranevich)

2003-05-27  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in (GetSignals):
	(GetArgs): Add signals and properties to the statistics.
	(OutputMissingDocumentation): Emit undocumented signals and
	properties.  (#113645)

2003-04-21  Matthias Clasen  <maclas@gmx.de>

	* tools/docpercentages.pl: Fix autolinkification for undocumented
	symbols.

	* doc/style-guide.txt: Typo fix.

3 files changed, 14 insertions, 8 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 1107a48c2fc..bbb05afc2a1 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/19 16:49:52 jmmv Exp $
 #
 
-DISTNAME=	gtk-doc-1.1
+DISTNAME=	gtk-doc-1.2
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.1/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.2/}
 
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://www.gtk.org/rdp/
@@ -18,8 +18,10 @@ USE_BUILDLINK2=		YES
 PKGCONFIG_OVERRIDE=	gtk-doc.pc.in
 CONFIGURE_ARGS+=	--with-xml-catalog=${XML_DEFAULT_CATALOG}
 
+SGML_CATALOGS=		${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
+
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../textproc/jade/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
-.include "../../textproc/xmlcatmgr/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gtk-doc/PLIST b/textproc/gtk-doc/PLIST
index f043ed35b4c..850b0a117ef 100644
--- a/textproc/gtk-doc/PLIST
+++ b/textproc/gtk-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/12 13:49:15 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/19 16:49:52 jmmv Exp $
 bin/gtkdoc-fixxref
 bin/gtkdoc-mkdb
 bin/gtkdoc-mkhtml
@@ -20,4 +20,8 @@ share/gtk-doc/data/home.png
 share/gtk-doc/data/left.png
 share/gtk-doc/data/right.png
 share/gtk-doc/data/up.png
+share/sgml/gtk-doc/gtk-doc.cat
+@dirrm share/sgml/gtk-doc
+@comment in xmlcatmgr: @dirrm share/sgml
 @dirrm share/gtk-doc/data
+@dirrm share/gtk-doc
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index 7ed98fa6a79..002d9a74a4c 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/02/12 13:49:15 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/02/19 16:49:52 jmmv Exp $
 
-SHA1 (gtk-doc-1.1.tar.gz) = b140fb44b5eb761dcd82d51a3076c00c6aa3aedf
-Size (gtk-doc-1.1.tar.gz) = 159055 bytes
+SHA1 (gtk-doc-1.2.tar.gz) = 4999725a2f02ffa0cdfe3800329d566cde4221b6
+Size (gtk-doc-1.2.tar.gz) = 162671 bytes