Update to 2.6.1.2:

2004-05-16  Anders Carlsson  <andersca@gnome.org>

	* configure.in: Release 2.6.1.2

2004-05-15  Kjartan Maraas  <kmaraas@gnome.org>

	* configure.in: Post release bump.
	* libgnome/gnome-program.c: (gnome_program_instance_init):
	Merge fix for bug #142502 from HEAD.

2004-05-02  Anders Carlsson  <andersca@gnome.org>

	* libgnome/gnome-program.c: (gnome_program_get_property):
	Fix memory leak. (#135773, Christian Persche)

2004-05-02  Anders Carlsson  <andersca@gnome.org>

	* configure.in:
	* doc/reference/Makefile.am:
	* doc/reference/libgnome-docs.sgml:
	* doc/reference/version.xml.in:
	Put version number in reference docs.
	(#125759, Steve Chaplin)

2004-05-02  Anders Carlsson  <andersca@gnome.org>

	* libgnome/gnome-sound.c: Fix crash when reading invalid
	audio files. (#124519, Chris Lahey)

3 files changed, 9 insertions, 34 deletions

diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index e09525406fb..f185e6a9a81 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/07/06 16:28:52 recht Exp $
+# $NetBSD: Makefile,v 1.31 2004/08/31 14:18:32 jmmv Exp $
 #
 
-DISTNAME=	libgnome-2.6.1.1
-PKGREVISION=	1
+DISTNAME=	libgnome-2.6.1.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,7 +26,7 @@ PKGCONFIG_OVERRIDE=	libgnome/libgnome-2.0.pc.in
 
 CONFIGURE_ARGS= 	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 OWN_DIRS=	${PKG_SYSCONFDIR}/sound/events
 
diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST
index 9843190513a..09fda2ced9b 100644
--- a/devel/libgnome/PLIST
+++ b/devel/libgnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/05/04 21:10:13 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/08/31 14:18:32 jmmv Exp $
 bin/gnome-open
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
@@ -25,31 +25,6 @@ lib/libgnome-2.so
 lib/libgnome-2.so.600
 lib/libgnome-2.so.600.1
 lib/pkgconfig/libgnome-2.0.pc
-share/doc/html/libgnome/ch01s02.html
-share/doc/html/libgnome/ch01s03.html
-share/doc/html/libgnome/ch01s04.html
-share/doc/html/libgnome/ch01s05.html
-share/doc/html/libgnome/home.png
-share/doc/html/libgnome/index.html
-share/doc/html/libgnome/index.sgml
-share/doc/html/libgnome/left.png
-share/doc/html/libgnome/libgnome-gnome-config.html
-share/doc/html/libgnome/libgnome-gnome-exec.html
-share/doc/html/libgnome/libgnome-gnome-gconf.html
-share/doc/html/libgnome/libgnome-gnome-help.html
-share/doc/html/libgnome/libgnome-gnome-i18n.html
-share/doc/html/libgnome/libgnome-gnome-init.html
-share/doc/html/libgnome/libgnome-gnome-program.html
-share/doc/html/libgnome/libgnome-gnome-score.html
-share/doc/html/libgnome/libgnome-gnome-sound.html
-share/doc/html/libgnome/libgnome-gnome-triggers.html
-share/doc/html/libgnome/libgnome-gnome-url.html
-share/doc/html/libgnome/libgnome-gnome-util.html
-share/doc/html/libgnome/libgnome-libgnometypebuiltins.html
-share/doc/html/libgnome/libgnome.devhelp
-share/doc/html/libgnome/libgnome.html
-share/doc/html/libgnome/right.png
-share/doc/html/libgnome/up.png
 share/examples/libgnome/sound/events/gnome-2.soundlist
 share/examples/libgnome/sound/events/gtk-events-2.soundlist
 share/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
@@ -135,7 +110,8 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm share/examples/libgnome/sound/events
 @dirrm share/examples/libgnome/sound
 @dirrm share/examples/libgnome
-@dirrm share/doc/html/libgnome
+@exec ${MKDIR} %D/share/doc/libgnome
+@dirrm share/doc/libgnome
 @comment in libbonobo: @dirrm lib/bonobo/servers
 @comment in libbonobo: @dirrm lib/bonobo/monikers
 @dirrm include/libgnome-2.0/libgnome
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index 068a60838ee..183e59b2d26 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2004/05/04 21:10:13 jmmv Exp $
+$NetBSD: distinfo,v 1.15 2004/08/31 14:18:32 jmmv Exp $
 
-SHA1 (libgnome-2.6.1.1.tar.bz2) = 09a7780136ec290434c3b2c106acd2e2e192e98b
-Size (libgnome-2.6.1.1.tar.bz2) = 1093492 bytes
+SHA1 (libgnome-2.6.1.2.tar.bz2) = 7251a07620dbb76fbf31121d9a7a9e309ef0c3e8
+Size (libgnome-2.6.1.2.tar.bz2) = 1050839 bytes
 SHA1 (patch-aa) = 809d964c6233d1a30eb195272a59970e497caea5
 SHA1 (patch-ab) = 67f74ada3cc07c686a4c7540df45064ef886524a
 SHA1 (patch-ac) = 3322e5de39ebe36b2174fceec4adecb6b168a4f1