[gnome-desktop] 2.90.0

[Bastien Nocera <hadess src gnome org>]

commit c814890ad764e412949cdd745367e959f417ba7a
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jun 11 13:04:01 2010 +0100

    2.90.0
    
    Fix linking of the gtk-doc scanner.

 NEWS                                               |    9 +++++++++
 configure.in                                       |    4 ++--
 docs/reference/gnome-desktop/Makefile.am           |    2 +-
 .../gnome-desktop/tmpl/gnome-desktop-item.sgml     |    4 ----
 .../gnome-desktop/tmpl/gnome-desktop-unused.sgml   |    4 ++++
 5 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/NEWS b/NEWS
index a9b7e7e..06823f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,13 @@
 ==============
+Version 2.90.0
+==============
+
+  libgnome-desktop
+
+	* Port to GTK+ 3.0, should be parallel installable with
+	  the GTK 2.x version, bar gnome-about
+
+==============
 Version 2.31.2
 ==============
 
diff --git a/configure.in b/configure.in
index 3433977..d3fe208 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 m4_define(gnome_platform, 2)
-m4_define(gnome_minor, 31)
-m4_define(gnome_micro, 3)
+m4_define(gnome_minor, 90)
+m4_define(gnome_micro, 0)
 dnl gnome_sub is an optional sub-version which will not be advertised to the user
 dnl It allows to release a 2.30.1.1 which is just a better 2.30.1
 dnl Leave empty if not needed
diff --git a/docs/reference/gnome-desktop/Makefile.am b/docs/reference/gnome-desktop/Makefile.am
index 0be2b77..16a1561 100644
--- a/docs/reference/gnome-desktop/Makefile.am
+++ b/docs/reference/gnome-desktop/Makefile.am
@@ -68,7 +68,7 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=$(GNOME_DESKTOP_CFLAGS) -I$(top_srcdir)/libgnome-desktop -DGNOME_DESKTOP_USE_UNSTABLE_API
-GTKDOC_LIBS=$(GNOME_DESKTOP_LIBS) $(top_builddir)/libgnome-desktop/libgnome-desktop-2.la
+GTKDOC_LIBS=$(GNOME_DESKTOP_LIBS) $(top_builddir)/libgnome-desktop/libgnome-desktop-3.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml b/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml
index 1b3afcc..e9b7a6b 100644
--- a/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml
+++ b/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml
@@ -17,9 +17,6 @@ GnomeDesktopItem
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### ENUM GnomeDesktopItemType ##### -->
 <para>
 
@@ -326,7 +323,6 @@ GnomeDesktopItem
 
 </para>
 
- void: 
 @Returns: 
 
 
diff --git a/docs/reference/gnome-desktop/tmpl/gnome-desktop-unused.sgml b/docs/reference/gnome-desktop/tmpl/gnome-desktop-unused.sgml
index e69de29..ea4b7f8 100644
--- a/docs/reference/gnome-desktop/tmpl/gnome-desktop-unused.sgml
+++ b/docs/reference/gnome-desktop/tmpl/gnome-desktop-unused.sgml
@@ -0,0 +1,4 @@
+<!-- ##### SECTION Image ##### -->
+
+
+