From 76517fef93e14904c03635e48d79a82159bbe839 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@novell.com>
Date: Mon, 30 Jan 2006 18:34:27 +0000
Subject: [PATCH] updated for 2.13.90.

2006-01-30  Rodrigo Moya <rodrigo@novell.com>

	* configure.in:
	* NEWS: updated for 2.13.90.
---
 ChangeLog    |  5 ++++
 NEWS         | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in | 13 ++++++++-
 3 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4f27f5061..1cd3d201d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-30  Rodrigo Moya <rodrigo@novell.com>
+
+	* configure.in:
+	* NEWS: updated for 2.13.90.
+
 2006-01-30  Rodrigo Moya <rodrigo@novell.com>
 
 	* schemas/apps_gnome_settings_daemon_keybindings.schemas.in:
diff --git a/NEWS b/NEWS
index a74f2ac6e..3a753182c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,85 @@
+gnome-control-center 2.13.90
+
+about-me:
+- Preserve tab navigation on the dialog (Diego González) (317468)
+- Fixed crash (Diego González) (317315)
+
+background:
+- Added apply button (Rodney Dawes) (327335)
+- Fixed glib CRITICAL warnings (Rodney Dawes) (327327)
+
+default applications:
+- Fixed Thunderbird command line parameters (Luca Cavalli) (326808)
+- Update custom command entries also when predefined app is selected
+  (Luca Cavalli) (327749)
+- Don't set entries' sensitivity, just disable input on them (Rodrigo
+  Moya)
+- Use better description and arguments for Epiphany (chpe) (327220)
+
+fontilus:
+- Added button for document font (Christian Persch) (160454)
+- Changed "monospace" to "fixed width" (Christian Persch)
+- Fixed font thumbnailing endianness (Ed Catmur) (329043)
+
+keybindings:
+- Refuse to bind letter keys without a modifier (Bastien Nocera) (86956)
+- Readded the keysim/keycode binding code (Rodrigo Moya)
+
+keyboard:
+- Fixed user-visible strings (Rodrigo Moya) (328748)
+
+mouse:
+- Fixed a11y problem with gnopernicus screen reader (Anilkumar Bacheli)
+  (154769)
+
+network:
+- Fixed mnemonic (Crispin Flowerday) (328884)
+
+sound:
+- Use correct stock icon for PLAY button (Dennis Cranston)
+- Reduced size of the dialog (Rodrigo Moya)
+- Fixed compilation warnings (Damien Carbery, Jens Granseuer) (328255)
+
+settings daemon:
+- Use verbs for slow/sticky keys dialogs, rather than OK/Cancel (chpe)
+  (325686)
+
+help:
+- Updated scrollkeeper description (Alessandro Ferrucci) (327784)
+
+other:
+- Don't use "capplet" in user-visible strings (Rodrigo Moya) (168790)
+- Fixed glib CRITICAL warnings (Thomas Wood)
+- Added GTK category to .desktop files (Luca Cavalli) (328028)
+- Use "mouse pointer" instead of "cursor" in user-visible strings
+  (Scott Bronson) (318056)
+
+updated translations:
+- bg (Alexander Shopov)
+- ca (Josep Puigdemont i Casamajó)
+- da (Lasse Bang Mikkelsen)
+- el (Kostas Papadimas)
+- en_CA (Adam Weinberger)
+- es (Francisco Javier F. Serrador)
+- fi (Ilkka Tuohela)
+- gl (Ignacio Casal Quinteiro)
+- gu (Ankit Patel)
+- hu (Gabor Kelemen)
+- it (Luca Ferretti)
+- ja (Takeshi AIHANA)
+- lt (Zygimantas Berucka)
+- nb (Kjartan Maraas)
+- nl (Vincent van Adrighem)
+- no (Kjartan Maraas)
+- pt_BR (Evandro Fernandes Giovanini)
+- ru (Nickolay V. Shmyrev)
+- sr (Slobodan D. Sredojevic)
+- sr@Latn (Slobodan D. Sredojevic)
+- th (Theppitak Karoonboonyanan)
+- vi (Clytie Siddall)
+- zh_CN (Funda Wang)
+
+------------------------------------------------------------------------------
 gnome-control-center 2.13.5.1
 
 default applications:
diff --git a/configure.in b/configure.in
index be9e4f681..d99988028 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([control-center], [2.13.5.1],
+AC_INIT([control-center], [2.13.90],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -353,6 +353,17 @@ fi
 AM_CONDITIONAL(BUILD_ABOUTME, test -n "$LIBEBOOK_REQUIREMENT")
 AM_CONDITIONAL(HAVE_LIBEBOOK, test -n "$LIBEBOOK_REQUIREMENT")
 
+dnl ==============================================
+dnl HAL stuff
+dnl ==============================================
+AC_ARG_ENABLE(hal, AC_HELP_STRING([--disable-hal],[build without hal support]))
+if test "x$enable_hal" != "xno"; then
+	PKG_CHECK_MODULES(HAL, [hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32],
+		[ AC_DEFINE(USE_HAL, 1, [defined if using libhal]) ],)
+	AC_SUBST(HAL_CFLAGS)
+	AC_SUBST(HAL_LIBS)
+fi
+
 dnl ==============================================
 dnl End: Check that we meet the  dependencies
 dnl ==============================================