Merge branch 'master' into dbus-sharp

Conflicts:
	build/pkg-config/banshee-core.pc.in
	src/Backends/Banshee.Hal/Banshee.Hal.csproj
	src/Backends/Banshee.Hal/Banshee.HalBackend/DkDisk.cs
	src/Backends/Banshee.Hal/Hal/Device.cs
	src/Backends/Banshee.Hal/Hal/Manager.cs
	src/Backends/Banshee.Hal/Hal/Volume.cs
	src/Hyena

1 files changed, 56 insertions, 93 deletions

diff --git a/configure.ac b/configure.ac
index e394e7fb4..23dfc95d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 dnl Granularly define the version components
 dnl Remember to also update the Display Version
-m4_define([banshee_version_major], [1])
-m4_define([banshee_version_minor], [9])
-m4_define([banshee_version_micro], [5])
+m4_define([banshee_version_major], [2])
+m4_define([banshee_version_minor], [0])
+m4_define([banshee_version_micro], [0])
 
 dnl this can sometimes differ manually
-m4_define([banshee_display_version], ["1.9.5"])
+m4_define([banshee_display_version], ["2.0"])
 
 dnl set to 0 when doing an official release
 m4_define([banshee_version_pre_release], [0])
@@ -13,10 +13,7 @@ m4_define([banshee_version_pre_release], [0])
 m4_define([concat], $1$2$3$4)
 
 dnl create base version string
-m4_define([banshee_version], concat(
-	banshee_version_major.,
-	banshee_version_minor.,
-	banshee_version_micro))
+m4_define([banshee_version], concat(banshee_version_major., banshee_version_minor., banshee_version_micro))
 
 dnl create the release version
 m4_define([banshee_version],
@@ -24,15 +21,11 @@ m4_define([banshee_version],
 		banshee_version,
 		concat(banshee_version, banshee_version_pre_release)))
 
-m4_define([banshee_api_version],
-	[banshee_version_major.banshee_version_minor])
-
-m4_define([banshee_asm_version],
-	[banshee_api_version.0.0])
+m4_define([banshee_api_version], [banshee_version_major.banshee_version_minor])
+m4_define([banshee_asm_version], [banshee_api_version.0.0])
 
 AC_PREREQ(2.52)
-AC_INIT([banshee], banshee_version,
-	[http://bugzilla.gnome.org/enter_bug.cgi?product=banshee])
+AC_INIT([banshee], banshee_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=banshee])
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign])
 AM_MAINTAINER_MODE
@@ -45,7 +38,7 @@ AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
 dnl How to configure for distcheck
-DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast --enable-user-help --enable-release"
+DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-user-help --enable-release"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
 dnl Export Version Info
@@ -71,26 +64,16 @@ dnl User help
 SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
 
 dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(1.9.1)
+SHAMROCK_CHECK_MONO_MODULE(2.4.3)
 SHAMROCK_FIND_MONO_2_0_COMPILER
 SHAMROCK_FIND_MONO_RUNTIME
-SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
-	Mono.Cairo
-	Mono.Posix
-	ICSharpCode.SharpZipLib
-])
-
-dnl Check for mono >= 2.4.3 for LibraryWatcher extension, with fix for bnc#322330
-PKG_CHECK_MODULES(MONO_2_4_3, mono >= 2.4.3, HAVE_MONO_2_4_3=yes, HAVE_MONO_2_4_3=no)
-AM_CONDITIONAL(ENABLE_LIBRARY_WATCHER, test "x$HAVE_MONO_2_4_3" = "xyes")
+SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
 
 dnl Check for GNOME >= 2.28 to see if we should remove
 dnl 'Media Player' from the app Name, bgo#596242, except
 dnl in MeeGo where GNOME >= 2.28, but we want the full name
-PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28,
-	HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no)
-PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel,
-	HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
+PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28, HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no)
+PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
 if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
 	BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
 else
@@ -98,6 +81,14 @@ else
 fi
 AC_SUBST(BANSHEE_DESKTOP_NAME)
 
+if test "x$HAVE_MEEGO_PANEL" = "xyes"; then
+  MEEGO_PANELS_DIR=`$PKG_CONFIG --variable=meego_panel_panels_dir meego-panel`
+else
+  MEEGO_PANELS_DIR='${datadir}/mutter-meego/panels'
+fi
+AC_SUBST(MEEGO_PANELS_DIR)
+
+
 dnl Check for gdk-x11 >= 2.22 for NotificationArea extension, bgo#638477
 PKG_CHECK_MODULES(GDK_2_22, gdk-x11-2.0 >= 2.22, have_gdk_2_22=yes, have_gdk_2_22=no)
 AM_CONDITIONAL(HAVE_GDK_2_22, test "x$have_gdk_2_22" = "xyes")
@@ -123,9 +114,6 @@ BANSHEE_CHECK_LIBWEBKIT
 dnl gdata (optional through --disable-youtube)
 BANSHEE_CHECK_YOUTUBE
 
-dnl Check for disabled hal
-BANSHEE_CHECK_HAL
-
 dnl gtk#-beans and gio#
 BANSHEE_CHECK_GIO_SHARP
 
@@ -147,10 +135,7 @@ BANSHEE_CHECK_OSX
 PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.4)
 
 dnl GNOME (optional)
-AC_ARG_ENABLE(gnome, 
-	AC_HELP_STRING([--disable-gnome], 
-		[Disable GNOME support]), 
-	, enable_gnome="yes")
+AC_ARG_ENABLE(gnome, AC_HELP_STRING([--disable-gnome], [Disable GNOME support]), , enable_gnome="yes")
 if test "x$enable_gnome" = "xyes"; then
 	BANSHEE_CHECK_GNOME_SHARP
 	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
@@ -164,7 +149,6 @@ fi
 dnl DAP support (each module is optional)
 BANSHEE_CHECK_DAP_MTP
 BANSHEE_CHECK_DAP_APPLEDEVICE
-BANSHEE_CHECK_DAP_IPOD
 BANSHEE_CHECK_DAP_KARMA
 
 dnl DAAP support (optional)
@@ -203,13 +187,6 @@ AM_CONDITIONAL(ENABLE_GAPLESS, test "x$ENABLE_GAPLESS" = "xyes")
 dnl i18n
 SHAMROCK_CONFIGURE_I18N($PACKAGE)
 
-dnl the bird is the word
-AC_ARG_ENABLE(podcast, 
-	AC_HELP_STRING([--disable-podcast], 
-		[Disable Podcasting support]), 
-	, enable_podcast="yes")
-AM_CONDITIONAL(ENABLE_PODCAST, test "x$enable_podcast" = "xyes")
-
 AC_ARG_ENABLE(release,
 	AC_HELP_STRING([--enable-release],
 		[Use release configuration]),
@@ -279,9 +256,6 @@ extras/Makefile
 
 libbanshee/Makefile
 
-gstreamer/Makefile
-gstreamer/equalizer/Makefile
-
 src/Hyena/Makefile
 src/Hyena/build/Makefile
 src/Hyena/build/pkg-config/Makefile
@@ -296,8 +270,8 @@ src/AssemblyInfo.cs
 src/Clients/Makefile
 src/Clients/Beroe/Makefile
 src/Clients/Booter/Makefile
-src/Clients/Booter/banshee-1.linux
-src/Clients/Booter/banshee-1.darwin
+src/Clients/Booter/banshee.linux
+src/Clients/Booter/banshee.darwin
 src/Clients/Halie/Makefile
 src/Clients/Muinshee/Makefile
 src/Clients/Nereid/Makefile
@@ -317,7 +291,6 @@ src/Backends/Banshee.Gio/Makefile
 src/Backends/Banshee.Gnome/Makefile
 src/Backends/Banshee.GStreamer/Makefile
 src/Backends/Banshee.GStreamerSharp/Makefile
-src/Backends/Banshee.Hal/Makefile
 src/Backends/Banshee.Unix/Makefile
 src/Backends/Banshee.Osx/Makefile
 src/Backends/Banshee.NowPlaying.X11/Makefile
@@ -335,7 +308,6 @@ src/Libraries/MusicBrainz/Makefile
 src/Dap/Makefile
 src/Dap/Banshee.Dap/Makefile
 src/Dap/Banshee.Dap.AppleDevice/Makefile
-src/Dap/Banshee.Dap.Ipod/Makefile
 src/Dap/Banshee.Dap.MassStorage/Makefile
 src/Dap/Banshee.Dap.Mtp/Makefile
 src/Dap/Banshee.Dap.Karma/Makefile
@@ -350,6 +322,7 @@ src/Extensions/Banshee.Bpm/Makefile
 src/Extensions/Banshee.CoverArt/Makefile
 src/Extensions/Banshee.Daap/Makefile
 src/Extensions/Banshee.Emusic/Makefile
+src/Extensions/Banshee.Emusic.Store/Makefile
 src/Extensions/Banshee.FileSystemQueue/Makefile
 src/Extensions/Banshee.InternetArchive/Makefile
 src/Extensions/Banshee.Fixup/Makefile
@@ -384,57 +357,48 @@ cat <<EOF
 ${PACKAGE}-${VERSION}
 
   Build Environment
-    Install Prefix:    ${prefix}
-    Datadir:           ${expanded_datadir}
-    Libdir:            ${expanded_libdir}
+    Install Prefix:        ${prefix}
+    Datadir:               ${expanded_datadir}
+    Libdir:                ${expanded_libdir}
 
-    C Compiler:        ${CC}
-    Mono C# Compiler:  ${MCS} ${GMCS_FLAGS}
-    Mono Runtime:      ${MONO}
+    C Compiler:            ${CC}
+    Mono C# Compiler:      ${MCS} ${GMCS_FLAGS}
+    Mono Runtime:          ${MONO}
+    Gtk#:                  ${gtk_version}
 
   Video/Graphics:
-    Graphics System:   ${GRAPHICS_SUBSYSTEM}
-    X11 Video:         ${have_xvidmode}
-    Clutter:           ${enable_clutter}
+    Graphics System:       ${GRAPHICS_SUBSYSTEM}
+    X11 Video:             ${have_xvidmode}
+    Clutter:               ${enable_clutter}
 
   Operating System/Desktop Environment:
-    GNOME Support:     ${enable_gnome}
-    OSX Support:       ${enable_osx}
-    MeeGo Support:     ${enable_meego}
+    GNOME Support:         ${enable_gnome}
+    OSX Support:           ${enable_osx}
+    MeeGo Support:         ${enable_meego}
 
   Digital Audio Player (DAP) Support:
-    Mass Storage:      yes
-    MTP:               ${enable_libmtp}
-    Apple Device:      ${enable_appledevice}
-    iPod:              ${enable_ipodsharp}
-    Karma:             ${enable_karmasharp}
+    Apple Device:          ${enable_appledevice} (libgpod-sharp)
+    Karma:                 ${enable_karmasharp}
+    Mass Storage:          yes
+    MTP:                   ${enable_libmtp}
 
   Extra Features:
-    Web Browser:       ${have_libwebkit} (webkit-1.0 >= $WEBKIT_MIN_VERSION, libsoup-2.4 >= $SOUP_MIN_VERSION)
-      + GNOME Proxy    ${have_libsoup_gnome} (libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION)
-      + Amazon MP3     ${have_libwebkit}
-      + Miro Guide     ${have_libwebkit}
-      + Wikipedia      ${have_libwebkit}
-    Boo Scripting:     ${enable_boo}
-    Builtin Equalizer: ${enable_builtin_equalizer}
-    DAAP:              ${enable_daap}
-    GIO Backend:       ${enable_gio} (glib >= 2.22, gtk-sharp-beans, and gio-sharp)
-    GIO Hardware:      ${enable_gio_hardware} (gudev-sharp, gkeyfile-sharp)
-    HAL Backend:       ${enable_hal}
-    Library Watcher:   ${HAVE_MONO_2_4_3} (Mono >= 2.4.3)
-    Podcasts:          ${enable_podcast}
-    Gapless playback:  ${ENABLE_GAPLESS} (gstreamer-plugins-base > 0.10.25.2)
-    YouTube extension: ${enable_youtube} (gdata-sharp >= 1.4)
-    Sound menu:        ${enable_soundmenu}
-    Ubuntu One Store:  ${enable_ubuntuone} (ubuntuone-sharp)
+    Web Browser:           ${have_libwebkit} (webkit-1.0 >= $WEBKIT_MIN_VERSION, libsoup-2.4 >= $SOUP_MIN_VERSION)
+      + GNOME Proxy        ${have_libsoup_gnome} (libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION)
+    Boo Scripting:         ${enable_boo}
+    DAAP:                  ${enable_daap}
+    GIO Backend:           ${enable_gio} (glib >= 2.22, gtk-sharp-beans, and gio-sharp)
+    GIO Hardware:          ${enable_gio_hardware} (gudev-sharp, gkeyfile-sharp)
+    YouTube:               ${enable_youtube} (gdata-sharp >= 1.4)
+    Sound Menu:            ${enable_soundmenu}
+    Ubuntu One Store:      ${enable_ubuntuone} (ubuntuone-sharp >= 0.3.2)
 
   Build/Development:
-    Unit Tests:        ${do_tests} (nunit >= ${NUNIT_REQUIRED})
-    API Docs:          ${enable_docs} (monodocer and mdassembler)
-    User Help:         ${enable_user_help} (gnome-doc-utils >= 0.17.3)
-    Custom a11y:       ${gtksharp_with_a11y} (gtk-sharp >= 2.12.10)
-    Release Build:     ${enable_release}
-    Vendor Build ID:   ${vendor_build_id}
+    Unit Tests:            ${do_tests} (nunit >= ${NUNIT_REQUIRED})
+    API Docs:              ${enable_docs} (monodocer and mdassembler)
+    User Help:             ${enable_user_help} (gnome-doc-utils >= 0.17.3)
+    Release Build:         ${enable_release}
+    Vendor Build ID:       ${vendor_build_id}
 
 EOF
 
@@ -451,4 +415,3 @@ if test -d ${expanded_libdir}/${PACKAGE}; then
 	echo "           Installing over an existing install will cause conflicts!"
 	echo 
 fi
-