[rhythmbox] Rhythmbox 2.96

[Jonathan Matthew <jmatthew src gnome org>]

commit 0b2e595399a3d3d3ccd99a5edf28d516b07f5374
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Mar 6 08:35:42 2012 +1000

    Rhythmbox 2.96

 NEWS                |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 README              |    2 +-
 configure.ac        |    4 ++--
 macros/gsettings.m4 |   37 ++++++++++++++++++++++++++-----------
 4 files changed, 78 insertions(+), 14 deletions(-)
---
diff --git a/NEWS b/NEWS
index de25488..87ca18f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,52 @@
+Overview of changes in Rhythmbox 2.96  "Spanish Air"
+====================================================
+
+* Revived Magnatune plugin
+* Better handling of non-media files
+* dbus media server plugin improved again
+
+Bugs fixed:
+
+454247 - rhythmbox audio CD related crash
+622874 - Migrate from dbus-glib to GDBus
+644045 - Clean extra white space on title/artist in TerraParser.py
+654637 - Jamendo and Magnatune plugins are broken
+661957 - Magnatune plugin crashes Rhythmbox on Fedora 16
+663353 - Add Radio Paradise
+667971 - new splash screen for Magnatune
+668864 - fails to save edited lyrics
+670666 - rhythmbox-metadata crash in connection_closed_cb
+670772 - crashes when trying to sync ipod
+671379 - crashes copying files to media player
+
+Translation updates:
+- ar, courtesy of Ibrahim Saed 
+- be, courtesy of Olya Matsuk 
+- bg, courtesy of Alexander Shopov 
+- ca, courtesy of Gil Forcada 
+- cs, courtesy of Marek Äernockà 
+- de, courtesy of Mario BlÃttermann 
+- eo, courtesy of Kristjan SCHMIDT 
+- es, courtesy of Daniel Mustieles 
+- fr, courtesy of Claude Paroz 
+- gl, courtesy of Fran Dieguez 
+- hu, courtesy of Gabor Kelemen 
+- it, courtesy of Luca Ferretti 
+- lt, courtesy of Aurimas Äernius 
+- lv, courtesy of Peteris Krisjanis 
+- nb, courtesy of Kjartan Maraas 
+- pl, courtesy of Piotr DrÄg 
+- pt_BR, courtesy of Djavan Fagundes 
+- sl, courtesy of Matej UrbanÄiÄ 
+- sr, courtesy of ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ 
+- sr latin, courtesy of Miroslav NikoliÄ 
+- sv, courtesy of Daniel Nylander 
+- te, courtesy of Praveen Illa 
+- uk, courtesy of Korostil Daniel 
+- zh_HK, courtesy of Cheng-Chia Tseng 
+- zh_TW, courtesy of Cheng-Chia Tseng 
+
+
 Overview of changes in Rhythmbox 2.95  "In Mind"
 ================================================
 
diff --git a/README b/README
index 9d55a95..868003a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is Rhythmbox version 2.95. Rhythmbox is your one-stop multimedia
+This is Rhythmbox version 2.96. Rhythmbox is your one-stop multimedia
 application, supporting a music library, multiple playlists,
 internet radio, and more.
 
diff --git a/configure.ac b/configure.ac
index cbc6284..2676efc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 AC_PREREQ(2.53)
 AC_INIT([rhythmbox],
-	[2.95],
+	[2.96],
 	[https://bugzilla.gnome.org/enter_bug.cgi?product=rhythmbox])
 AC_CONFIG_SRCDIR(rhythmbox.pc.in)
 AC_CONFIG_MACRO_DIR(macros)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip])
 
 AC_SUBST(ACLOCAL_AMFLAGS, "-I macros")
 
diff --git a/macros/gsettings.m4 b/macros/gsettings.m4
index 76b808a..7b2f9a2 100644
--- a/macros/gsettings.m4
+++ b/macros/gsettings.m4
@@ -7,7 +7,7 @@ AC_DEFUN([GLIB_GSETTINGS],
 [
   m4_pattern_allow([AM_V_GEN])
   AC_ARG_ENABLE(schemas-compile,
-                AC_HELP_STRING([--disable-schemas-compile],
+                AS_HELP_STRING([--disable-schemas-compile],
                                [Disable regeneration of gschemas.compiled on install]),
                 [case ${enableval} in
                   yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
@@ -17,9 +17,16 @@ AC_DEFUN([GLIB_GSETTINGS],
   AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
   PKG_PROG_PKG_CONFIG([0.16])
   AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
-  AC_SUBST(GLIB_COMPILE_SCHEMAS, `$PKG_CONFIG --variable glib_compile_schemas gio-2.0`)
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
   if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
-    AC_MSG_ERROR([glib-compile-schemas not found.])
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
   fi
 
   GSETTINGS_RULES='
@@ -27,8 +34,10 @@ AC_DEFUN([GLIB_GSETTINGS],
 
 mostlyclean-am: clean-gsettings-schemas
 
-%.gschema.valid: %.gschema.xml
-	$(AM_V_GEN) if test -f "$^"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run --schema-file=$${d}$^ && touch [$]@
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
 
 all-am: $(gsettings_SCHEMAS:.xml=.valid)
 uninstall-am: uninstall-gsettings-schemas
@@ -38,22 +47,28 @@ install-data-am: install-gsettings-schemas
 
 install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
 	@$(NORMAL_INSTALL)
-	test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-	$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
 
 uninstall-gsettings-schemas:
 	@$(NORMAL_UNINSTALL)
-	@list='\''$(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
 	test -n "$$files" || exit 0; \
 	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) --uninstall $(gsettingsschemadir)
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
 
 clean-gsettings-schemas:
-	rm -f $(gsettings_SCHEMAS:.xml=.valid)
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
 
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE)  EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]  tmp && mv [$]  tmp [$]@
+endif
 '
   _GSETTINGS_SUBST(GSETTINGS_RULES)
 ])