[Pkg-cli-apps-commits] r3864 - in /packages/banshee/trunk/debian: changelog control patches/06_stable-branch-r3636.patch patches/99_autoreconf.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Apr 1 18:41:53 UTC 2008
Author: slomo
Date: Tue Apr 1 18:41:50 2008
New Revision: 3864
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3864
Log:
debian/control,
debian/patches/06_stable-branch-r3636.patch,
debian/patches/99_autoreconf.patch,
debian/rules:
+ Another update from the stable branch to build against the system's
notify-sharp and gnome-keyring-sharp instead of the bundled versions.
Added:
packages/banshee/trunk/debian/patches/06_stable-branch-r3636.patch
Modified:
packages/banshee/trunk/debian/changelog
packages/banshee/trunk/debian/control
packages/banshee/trunk/debian/patches/99_autoreconf.patch
packages/banshee/trunk/debian/rules
Modified: packages/banshee/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/changelog?rev=3864&op=diff
==============================================================================
--- packages/banshee/trunk/debian/changelog (original)
+++ packages/banshee/trunk/debian/changelog Tue Apr 1 18:41:50 2008
@@ -1,3 +1,14 @@
+banshee (0.13.2+dfsg-10) unstable; urgency=low
+
+ * debian/control,
+ debian/patches/06_stable-branch-r3636.patch,
+ debian/patches/99_autoreconf.patch,
+ debian/rules:
+ + Another update from the stable branch to build against the system's
+ notify-sharp and gnome-keyring-sharp instead of the bundled versions.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 01 Apr 2008 20:40:37 +0200
+
banshee (0.13.2+dfsg-9) unstable; urgency=low
* debian/patches/05_stable-branch-r3518.patch:
Modified: packages/banshee/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/control?rev=3864&op=diff
==============================================================================
--- packages/banshee/trunk/debian/control (original)
+++ packages/banshee/trunk/debian/control Tue Apr 1 18:41:50 2008
@@ -2,7 +2,7 @@
Section: sound
Priority: optional
Maintainer: Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev, cli-common-dev (>= 0.4.4), intltool (>= 0.12), libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libmusicbrainz4-dev (>= 2.1.1), libnautilus-burn-dev (>= 2.12), libgstreamer0.10-dev (>= 0.10.13), libgstreamer-plugins-base0.10-dev (>= 0.10.12), gconf2, mono-mcs, mono-gmcs, libmono-dev (>= 1.1.10), libmono-system-data2.0-cil, libmono-system-web2.0-cil, libmono-cairo2.0-cil, libmono-sqlite2.0-cil, libmono2.0-cil, libmono-sharpzip2.84-cil, monodoc-base (>= 1.1.9), boo (>= 0.7.6), libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), libtaglib2.0-cil (>= 2.0.0), libgtk2.0-cil (>= 2.7), libgnome2.0-cil (>= 2.7), libgnome-vfs2.0-cil (>= 2.7), libgconf2.0-cil (>= 2.7), libglade2.0-cil (>= 2.7), libsqlite3-dev (>= 3.2), libnjb-cil (>= 0.3.0-2), libipod-cil (>= 0.8.0), libipodui-cil (>= 0.8.0), libkarma-cil (>= 0.0.5), libmtp-dev (>= 0.2.0), libmono-zeroconf1.0-cil (>= 0.7.2)
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, cli-common-dev (>= 0.4.4), intltool (>= 0.12), libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libmusicbrainz4-dev (>= 2.1.1), libnautilus-burn-dev (>= 2.12), libgstreamer0.10-dev (>= 0.10.13), libgstreamer-plugins-base0.10-dev (>= 0.10.12), gconf2, mono-mcs, mono-gmcs, libmono-dev (>= 1.1.10), libmono-system-data2.0-cil, libmono-system-web2.0-cil, libmono-cairo2.0-cil, libmono-sqlite2.0-cil, libmono2.0-cil, libmono-sharpzip2.84-cil, monodoc-base (>= 1.1.9), boo (>= 0.7.6), libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), libtaglib2.0-cil (>= 2.0.0), libgtk2.0-cil (>= 2.7), libgnome2.0-cil (>= 2.7), libgnome-vfs2.0-cil (>= 2.7), libgconf2.0-cil (>= 2.7), libglade2.0-cil (>= 2.7), libsqlite3-dev (>= 3.2), libnjb-cil (>= 0.3.0-2), libipod-cil (>= 0.8.0), libipodui-cil (>= 0.8.0), libkarma-cil (>= 0.0.5), libmtp-dev (>= 0.2.0), libmono-zeroconf1.0-cil (>= 0.7.2), libnotify0.4-cil, libgnome-keyring1.0-cil
Standards-Version: 3.7.3
Homepage: http://www.banshee-project.org
Added: packages/banshee/trunk/debian/patches/06_stable-branch-r3636.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/patches/06_stable-branch-r3636.patch?rev=3864&op=file
==============================================================================
--- packages/banshee/trunk/debian/patches/06_stable-branch-r3636.patch (added)
+++ packages/banshee/trunk/debian/patches/06_stable-branch-r3636.patch Tue Apr 1 18:41:50 2008
@@ -1,0 +1,186 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (Revision 3518)
++++ ChangeLog (Revision 3636)
+@@ -1,3 +1,27 @@
++2008-03-30 Sebastian Dröge <slomo at circular-chaos.org>
++
++ * build/m4/banshee/gnome-keyring-sharp.m4: Fix name of the pkg-config
++ file.
++
++2008-03-30 Sebastian Dröge <slomo at circular-chaos.org>
++
++ * build/Common.Makefile:
++ * build/m4/banshee/gnome-keyring-sharp.m4:
++ * configure.ac:
++ * src/Extras/Gnome.Keyring/Makefile.am: Allow building against an
++ external gnome-keyring-sharp.
++
++2008-03-26 Sebastian Dröge <slomo at circular-chaos.org>
++
++ * build/m4/banshee/notify-sharp.m4:
++ * configure.ac:
++ * src/Core/Banshee.Base/Makefile.am:
++ * src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am: Allow
++ building against an external notify-sharp if one is found. This is
++ especially important as the next notification-daemon release in a
++ few days changes the DBus API and a newer notify-sharp is required
++ then.
++
+ 2008-03-22 Aaron Bockover <abock at gnome.org>
+
+ Fixes BNC #361828 (could not burn audio CD)
+Index: src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am
+===================================================================
+--- src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am (Revision 3518)
++++ src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am (Revision 3636)
+@@ -9,6 +9,12 @@
+
+ MENU_RESOURCE = NotificationAreaIconMenu.xml
+
++if EXTERNAL_NOTIFY_SHARP
++NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
++else
++NOTIFY_SHARP_LIBS =
++endif
++
+ ASSEMBLY_SOURCES = \
+ $(top_srcdir)/src/AssemblyInfo.cs \
+ $(srcdir)/NotificationAreaIconPlugin.cs \
+@@ -16,7 +22,7 @@
+ $(srcdir)/NotificationArea.cs
+
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(MENU_RESOURCE)
+- $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
++ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(NOTIFY_SHARP_LIBS) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
+
+ include $(top_srcdir)/build/gconf-schema-rules
+
+Index: src/Extras/Gnome.Keyring/Makefile.am
+===================================================================
+--- src/Extras/Gnome.Keyring/Makefile.am (Revision 3518)
++++ src/Extras/Gnome.Keyring/Makefile.am (Revision 3636)
+@@ -3,13 +3,16 @@
+ ASSEMBLY_NAME = Gnome.Keyring
+ ASSEMBLY = $(ASSEMBLY_NAME).dll
+
++ASSEMBLY_SOURCES = $(srcdir)/*.cs
++
++if !EXTERNAL_GNOME_KEYRING_SHARP
++
+ gnome_keyringdir= $(pkglibdir)
+ gnome_keyring_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
+
+-ASSEMBLY_SOURCES = $(srcdir)/*.cs
+-
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES)
+ $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
++endif
+
+ EXTRA_DIST = $(ASSEMBLY_SOURCES)
+
+Index: src/Core/Banshee.Base/Makefile.am
+===================================================================
+--- src/Core/Banshee.Base/Makefile.am (Revision 3518)
++++ src/Core/Banshee.Base/Makefile.am (Revision 3636)
+@@ -245,9 +245,15 @@
+ $(srcdir)/MediaEngine/PlayerEngine.cs \
+ $(srcdir)/MediaEngine/IEqualizer.cs
+
++if EXTERNAL_NOTIFY_SHARP
++NOTIFICATIONS_SOURCES =
++NOTIFICATIONS_LIBS = $(NOTIFY_SHARP_LIBS)
++else
+ NOTIFICATIONS_SOURCES = \
+ $(srcdir)/Notifications/Notification.cs \
+ $(srcdir)/Notifications/Notifications.cs
++NOTIFICATIONS_LIBS =
++endif
+
+ HYENA_SOURCES = \
+ $(srcdir)/Hyena/IUndoAction.cs \
+@@ -376,7 +382,7 @@
+ Banshee_Base_EXPANDED_RESOURCES_BUILD = $(foreach resource,$(Banshee_Base_EXPANDED_RESOURCES), $(addprefix -resource:,$(resource)),$(notdir $(resource)))
+
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(Banshee_Base_EXPANDED_RESOURCES)
+- $(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
++ $(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) $(NOTIFICATIONS_LIBS) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
+
+ include $(top_srcdir)/build/gconf-schema-rules
+
+Index: build/m4/banshee/notify-sharp.m4
+===================================================================
+--- build/m4/banshee/notify-sharp.m4 (Revision 0)
++++ build/m4/banshee/notify-sharp.m4 (Revision 3636)
+@@ -0,0 +1,16 @@
++AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
++[
++ AC_ARG_ENABLE(external_notify_sharp, AC_HELP_STRING([--enable-external-notify-sharp],
++ [Use external Notify# instead of the bundled one]),
++ enable_external_notify_sharp="yes", enable_external_notify_sharp="no")
++
++ if test "x$enable_external_notify_sharp" = "xyes"; then
++ PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp)
++ AC_SUBST(NOTIFY_SHARP_LIBS)
++ AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
++ else
++ AC_MSG_RESULT([no])
++ AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
++ fi
++])
++
+Index: build/m4/banshee/gnome-keyring-sharp.m4
+===================================================================
+--- build/m4/banshee/gnome-keyring-sharp.m4 (Revision 0)
++++ build/m4/banshee/gnome-keyring-sharp.m4 (Revision 3636)
+@@ -0,0 +1,16 @@
++AC_DEFUN([BANSHEE_CHECK_GNOME_KEYRING_SHARP],
++[
++ AC_ARG_ENABLE(external_gnome_keyring_sharp, AC_HELP_STRING([--enable-external-gnome-keyring-sharp],
++ [Use external gnome-keyring-sharp instead of the bundled one]),
++ enable_external_gnome_keyring_sharp="yes", enable_external_gnome_keyring_sharp="no")
++
++ if test "x$enable_external_gnome_keyring_sharp" = "xyes"; then
++ PKG_CHECK_MODULES(GNOME_KEYRING_SHARP, gnome-keyring-sharp-1.0)
++ AC_SUBST(GNOME_KEYRING_SHARP_LIBS)
++ AM_CONDITIONAL(EXTERNAL_GNOME_KEYRING_SHARP, true)
++ else
++ AC_MSG_RESULT([no])
++ AM_CONDITIONAL(EXTERNAL_GNOME_KEYRING_SHARP, false)
++ fi
++])
++
+Index: build/Common.Makefile
+===================================================================
+--- build/Common.Makefile (Revision 3518)
++++ build/Common.Makefile (Revision 3636)
+@@ -33,7 +33,12 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
++
++if EXTERNAL_GNOME_KEYRING_SHARP
++LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
++else
+ LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++endif
+
+ if EXTERNAL_NDESK_DBUS
+ LINK_DBUS = $(NDESK_DBUS_LIBS)
+Index: configure.ac
+===================================================================
+--- configure.ac (Revision 3518)
++++ configure.ac (Revision 3636)
+@@ -70,6 +70,12 @@
+ dnl External TagLib# libraries (optional)
+ BANSHEE_CHECK_TAGLIB_SHARP
+
++dnl External notify-sharp libraries (optional)
++BANSHEE_CHECK_NOTIFY_SHARP
++
++dnl External gnome-keyring-sharp libraries (optional)
++BANSHEE_CHECK_GNOME_KEYRING_SHARP
++
+ dnl Required dependencies (managed/core)
+ BANSHEE_CHECK_GTK_SHARP
+ PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.2)
Modified: packages/banshee/trunk/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/patches/99_autoreconf.patch?rev=3864&op=diff
==============================================================================
--- packages/banshee/trunk/debian/patches/99_autoreconf.patch (original)
+++ packages/banshee/trunk/debian/patches/99_autoreconf.patch Tue Apr 1 18:41:50 2008
@@ -1,6 +1,6 @@
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/aclocal.m4 banshee-0.13.2+dfsg/aclocal.m4
--- banshee-0.13.2+dfsg.old/aclocal.m4 2008-01-09 00:06:50.000000000 +0100
-+++ banshee-0.13.2+dfsg/aclocal.m4 2008-03-25 10:09:38.000000000 +0100
++++ banshee-0.13.2+dfsg/aclocal.m4 2008-04-01 20:38:24.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -183,7 +183,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -852,9 +852,22 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
+@@ -8666,10 +8780,12 @@
+ m4_include([build/m4/banshee/dap-mtp.m4])
+ m4_include([build/m4/banshee/dap-njb.m4])
+ m4_include([build/m4/banshee/dbus.m4])
++m4_include([build/m4/banshee/gnome-keyring-sharp.m4])
+ m4_include([build/m4/banshee/gstreamer.m4])
+ m4_include([build/m4/banshee/gtk-sharp.m4])
+ m4_include([build/m4/banshee/libbanshee.m4])
+ m4_include([build/m4/banshee/nautilus-burn.m4])
++m4_include([build/m4/banshee/notify-sharp.m4])
+ m4_include([build/m4/banshee/taglib.m4])
+ m4_include([build/m4/shamrock/expansions.m4])
+ m4_include([build/m4/shamrock/gstreamer.m4])
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/branding/Makefile.in banshee-0.13.2+dfsg/branding/Makefile.in
--- banshee-0.13.2+dfsg.old/branding/Makefile.in 2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/branding/Makefile.in 2008-03-25 10:09:43.000000000 +0100
++++ banshee-0.13.2+dfsg/branding/Makefile.in 2008-04-01 20:38:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -866,7 +879,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -54,10 +54,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -874,7 +900,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -890,7 +925,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -898,7 +933,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -906,7 +941,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -914,17 +949,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -325,7 +332,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/build/m4/Makefile.in banshee-0.13.2+dfsg/build/m4/Makefile.in
--- banshee-0.13.2+dfsg.old/build/m4/Makefile.in 2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/build/m4/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/build/m4/Makefile.in 2008-04-01 20:38:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -936,7 +983,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -96,6 +98,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -944,7 +1004,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -138,14 +139,12 @@
+@@ -116,6 +119,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -138,14 +143,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -960,7 +1029,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -157,7 +156,6 @@
+@@ -157,7 +160,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -968,7 +1037,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -186,6 +184,7 @@
+@@ -186,6 +188,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -976,7 +1045,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -196,6 +195,7 @@
+@@ -196,6 +199,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -984,17 +1053,19 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -205,6 +205,7 @@
+@@ -205,6 +209,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/build/Makefile.in banshee-0.13.2+dfsg/build/Makefile.in
--- banshee-0.13.2+dfsg.old/build/Makefile.in 2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/build/Makefile.in 2008-03-25 10:09:43.000000000 +0100
++++ banshee-0.13.2+dfsg/build/Makefile.in 2008-04-01 20:38:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -1006,7 +1077,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -123,6 +123,7 @@
+@@ -45,10 +45,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -123,6 +125,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -1014,7 +1098,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -165,14 +166,12 @@
+@@ -143,6 +146,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -165,14 +170,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1030,7 +1123,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -184,7 +183,6 @@
+@@ -184,7 +187,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1038,7 +1131,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -213,6 +211,7 @@
+@@ -213,6 +215,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -1046,7 +1139,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -223,6 +222,7 @@
+@@ -223,6 +226,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -1054,15 +1147,27 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -232,6 +232,7 @@
+@@ -232,6 +236,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -558,8 +559,8 @@
+@@ -340,7 +347,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
+@@ -558,8 +566,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1073,7 +1178,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -584,8 +585,8 @@
+@@ -584,8 +592,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1084,7 +1189,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -595,13 +596,12 @@
+@@ -595,13 +603,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1102,7 +1207,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/configure banshee-0.13.2+dfsg/configure
--- banshee-0.13.2+dfsg.old/configure 2008-01-09 00:06:52.000000000 +0100
-+++ banshee-0.13.2+dfsg/configure 2008-03-25 10:09:42.000000000 +0100
++++ banshee-0.13.2+dfsg/configure 2008-04-01 20:38:28.000000000 +0200
@@ -860,14 +860,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
@@ -1131,7 +1236,22 @@
CPP
CXX
CXXFLAGS
-@@ -1001,10 +1003,8 @@
+@@ -971,6 +973,14 @@
+ EXTERNAL_TAGLIB_SHARP_TRUE
+ EXTERNAL_TAGLIB_SHARP_FALSE
+ TAGLIB_SHARP_PC_LIBS
++NOTIFY_SHARP_CFLAGS
++NOTIFY_SHARP_LIBS
++EXTERNAL_NOTIFY_SHARP_TRUE
++EXTERNAL_NOTIFY_SHARP_FALSE
++GNOME_KEYRING_SHARP_CFLAGS
++GNOME_KEYRING_SHARP_LIBS
++EXTERNAL_GNOME_KEYRING_SHARP_TRUE
++EXTERNAL_GNOME_KEYRING_SHARP_FALSE
+ GTKSHARP_CFLAGS
+ GTKSHARP_LIBS
+ SQLITE_CFLAGS
+@@ -1001,10 +1011,8 @@
DAAP_ENABLED_FALSE
GETTEXT_PACKAGE
USE_NLS
@@ -1142,7 +1262,7 @@
CATALOGS
CATOBJEXT
GMOFILES
-@@ -1014,6 +1014,7 @@
+@@ -1014,6 +1022,7 @@
PO_IN_DATADIR_FALSE
POFILES
POSUB
@@ -1150,7 +1270,45 @@
CONFIG_STATUS_DEPENDENCIES
LIBOBJS
LTLIBOBJS'
-@@ -4064,6 +4065,7 @@
+@@ -1060,6 +1069,10 @@
+ NDESK_DBUS_LIBS
+ TAGLIB_SHARP_CFLAGS
+ TAGLIB_SHARP_LIBS
++NOTIFY_SHARP_CFLAGS
++NOTIFY_SHARP_LIBS
++GNOME_KEYRING_SHARP_CFLAGS
++GNOME_KEYRING_SHARP_LIBS
+ GTKSHARP_CFLAGS
+ GTKSHARP_LIBS
+ SQLITE_CFLAGS
+@@ -1677,6 +1690,11 @@
+ Use external NDesk DBus instead of the bundled one
+ --enable-external-taglib-sharp
+ Use external TagLib# instead of the bundled one
++ --enable-external-notify-sharp
++ Use external Notify# instead of the bundled one
++ --enable-external-gnome-keyring-sharp
++ Use external gnome-keyring-sharp instead of the
++ bundled one
+ --enable-ipod Enable iPod DAP support
+ --enable-njb Enable NJB DAP support
+ --enable-mtp Enable MTP DAP support
+@@ -1750,6 +1768,14 @@
+ C compiler flags for TAGLIB_SHARP, overriding pkg-config
+ TAGLIB_SHARP_LIBS
+ linker flags for TAGLIB_SHARP, overriding pkg-config
++ NOTIFY_SHARP_CFLAGS
++ C compiler flags for NOTIFY_SHARP, overriding pkg-config
++ NOTIFY_SHARP_LIBS
++ linker flags for NOTIFY_SHARP, overriding pkg-config
++ GNOME_KEYRING_SHARP_CFLAGS
++ C compiler flags for GNOME_KEYRING_SHARP, overriding pkg-config
++ GNOME_KEYRING_SHARP_LIBS
++ linker flags for GNOME_KEYRING_SHARP, overriding pkg-config
+ GTKSHARP_CFLAGS
+ C compiler flags for GTKSHARP, overriding pkg-config
+ GTKSHARP_LIBS
+@@ -4064,6 +4090,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -1158,7 +1316,7 @@
-@@ -4084,24 +4086,18 @@
+@@ -4084,24 +4111,18 @@
@@ -1166,10 +1324,10 @@
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-
+-
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
--
+
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
+# Check the gettext tools to make sure they are GNU
@@ -1189,7 +1347,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4111,7 +4107,7 @@
+@@ -4111,7 +4132,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -1198,7 +1356,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4122,49 +4118,26 @@
+@@ -4122,49 +4143,26 @@
;;
esac
fi
@@ -1257,7 +1415,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4174,7 +4147,7 @@
+@@ -4174,7 +4172,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -1266,7 +1424,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4182,14 +4155,13 @@
+@@ -4182,14 +4180,13 @@
done
IFS=$as_save_IFS
@@ -1285,7 +1443,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -4200,12 +4172,12 @@
+@@ -4200,12 +4197,12 @@
set dummy msgfmt; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
@@ -1301,7 +1459,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4215,7 +4187,7 @@
+@@ -4215,7 +4212,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -1310,7 +1468,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4223,71 +4195,51 @@
+@@ -4223,71 +4220,51 @@
done
IFS=$as_save_IFS
@@ -1409,7 +1567,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4297,7 +4249,7 @@
+@@ -4297,7 +4274,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -1418,7 +1576,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4305,20 +4257,41 @@
+@@ -4305,20 +4282,41 @@
done
IFS=$as_save_IFS
@@ -1465,7 +1623,7 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-@@ -4337,7 +4310,7 @@
+@@ -4337,7 +4335,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
@@ -1474,7 +1632,7 @@
;
return 0;
}
-@@ -4982,7 +4955,7 @@
+@@ -4982,7 +4980,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -1483,7 +1641,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5077,7 +5050,7 @@
+@@ -5077,7 +5075,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1492,16 +1650,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5197,7 +5170,7 @@
+@@ -5197,7 +5195,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5200 "configure"' > conftest.$ac_ext
-+ echo '#line 5173 "configure"' > conftest.$ac_ext
++ echo '#line 5198 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5369,7 +5342,11 @@
+@@ -5369,7 +5367,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -1514,7 +1672,7 @@
esac
;;
esac
-@@ -6966,7 +6943,6 @@
+@@ -6966,7 +6968,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -1522,7 +1680,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -7281,7 +7257,7 @@
+@@ -7281,7 +7282,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -1531,7 +1689,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -7841,6 +7817,318 @@
+@@ -7841,6 +7842,318 @@
;;
esac
@@ -1850,7 +2008,7 @@
enable_dlopen=no
enable_win32_dll=no
-@@ -7906,7 +8194,7 @@
+@@ -7906,7 +8219,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -1859,21 +2017,21 @@
-@@ -7934,11 +8222,11 @@
+@@ -7934,11 +8247,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7937: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8225: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8250: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7941: \$? = $ac_status" >&5
-+ echo "$as_me:8229: \$? = $ac_status" >&5
++ echo "$as_me:8254: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8208,10 +8496,10 @@
+@@ -8208,10 +8521,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -1886,17 +2044,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -8224,27 +8512,27 @@
+@@ -8224,27 +8537,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8227: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8515: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8540: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8231: \$? = $ac_status" >&5
-+ echo "$as_me:8519: \$? = $ac_status" >&5
++ echo "$as_me:8544: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -1920,7 +2078,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -8271,10 +8559,10 @@
+@@ -8271,10 +8584,10 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -1933,7 +2091,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -8287,20 +8575,20 @@
+@@ -8287,20 +8600,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -1960,21 +2118,21 @@
:
else
lt_prog_compiler_static=
-@@ -8328,11 +8616,11 @@
+@@ -8328,11 +8641,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8331: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8619: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8644: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8335: \$? = $ac_status" >&5
-+ echo "$as_me:8623: \$? = $ac_status" >&5
++ echo "$as_me:8648: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8412,12 +8700,13 @@
+@@ -8412,12 +8725,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -1989,7 +2147,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -8476,7 +8765,7 @@
+@@ -8476,7 +8790,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1998,7 +2156,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -8592,12 +8881,13 @@
+@@ -8592,12 +8906,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -2013,7 +2171,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8695,7 +8985,7 @@
+@@ -8695,7 +9010,7 @@
fi
;;
@@ -2022,7 +2180,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -8715,7 +9005,7 @@
+@@ -8715,7 +9030,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -2031,7 +2189,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -8987,11 +9277,10 @@
+@@ -8987,11 +9302,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -2047,7 +2205,7 @@
else
case $cc_basename in
xlc*)
-@@ -9141,7 +9430,7 @@
+@@ -9141,7 +9455,7 @@
link_all_deplibs=yes
;;
@@ -2056,7 +2214,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9511,7 +9800,7 @@
+@@ -9511,7 +9825,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2065,7 +2223,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9852,6 +10141,18 @@
+@@ -9852,6 +10166,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2084,7 +2242,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10033,6 +10334,21 @@
+@@ -10033,6 +10359,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2106,7 +2264,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -10352,7 +10668,7 @@
+@@ -10352,7 +10693,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -2115,7 +2273,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10628,7 +10944,7 @@
+@@ -10628,7 +10969,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -2124,25 +2282,25 @@
fi
-@@ -10677,7 +10993,7 @@
+@@ -10677,7 +11018,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10680 "configure"
-+#line 10996 "configure"
++#line 11021 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10777,7 +11093,7 @@
+@@ -10777,7 +11118,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10780 "configure"
-+#line 11096 "configure"
++#line 11121 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10904,7 +11220,7 @@
+@@ -10904,7 +11245,7 @@
fi
;;
@@ -2151,7 +2309,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -10960,6 +11276,7 @@
+@@ -10960,6 +11301,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -2159,7 +2317,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -11020,7 +11337,7 @@
+@@ -11020,7 +11362,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -2168,7 +2326,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -11256,6 +11573,10 @@
+@@ -11256,6 +11598,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -2179,7 +2337,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -11504,6 +11825,7 @@
+@@ -11504,6 +11850,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -2187,7 +2345,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -11541,7 +11863,7 @@
+@@ -11541,7 +11888,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -2196,7 +2354,7 @@
# Allow CC to be a program name with arguments.
-@@ -11748,7 +12070,7 @@
+@@ -11748,7 +12095,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -2205,7 +2363,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -11761,7 +12083,7 @@
+@@ -11761,7 +12108,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -2214,7 +2372,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -12019,51 +12341,23 @@
+@@ -12019,51 +12366,23 @@
fi
;;
darwin* | rhapsody*)
@@ -2275,7 +2433,7 @@
else
case $cc_basename in
xlc*)
-@@ -12314,7 +12608,7 @@
+@@ -12314,7 +12633,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -2284,7 +2442,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -12387,7 +12681,7 @@
+@@ -12387,7 +12706,7 @@
;;
esac
;;
@@ -2293,7 +2451,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -12721,7 +13015,6 @@
+@@ -12721,7 +13040,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -2301,7 +2459,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -12823,6 +13116,11 @@
+@@ -12823,6 +13141,11 @@
$rm -f confest.$objext
@@ -2313,7 +2471,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
-@@ -12878,7 +13176,6 @@
+@@ -12878,7 +13201,6 @@
;;
esac
@@ -2321,7 +2479,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -12954,7 +13251,7 @@
+@@ -12954,7 +13276,7 @@
esac
else
case $host_os in
@@ -2330,7 +2488,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -13050,7 +13347,7 @@
+@@ -13050,7 +13372,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -2339,7 +2497,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -13088,7 +13385,7 @@
+@@ -13088,7 +13410,7 @@
;;
esac
;;
@@ -2348,7 +2506,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13181,10 +13478,10 @@
+@@ -13181,10 +13503,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -2361,17 +2519,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -13197,27 +13494,27 @@
+@@ -13197,27 +13519,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13200: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13497: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13522: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13204: \$? = $ac_status" >&5
-+ echo "$as_me:13501: \$? = $ac_status" >&5
++ echo "$as_me:13526: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -2395,7 +2553,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -13244,10 +13541,10 @@
+@@ -13244,10 +13566,10 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -2408,7 +2566,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -13260,20 +13557,20 @@
+@@ -13260,20 +13582,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -2435,21 +2593,21 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -13301,11 +13598,11 @@
+@@ -13301,11 +13623,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13304: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13601: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13626: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13308: \$? = $ac_status" >&5
-+ echo "$as_me:13605: \$? = $ac_status" >&5
++ echo "$as_me:13630: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13358,7 +13655,7 @@
+@@ -13358,7 +13680,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -2458,7 +2616,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -13373,10 +13670,14 @@
+@@ -13373,10 +13695,14 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -2473,7 +2631,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -13478,7 +13779,7 @@
+@@ -13478,7 +13804,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2482,7 +2640,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13818,6 +14119,18 @@
+@@ -13818,6 +14144,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2501,7 +2659,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -13999,6 +14312,21 @@
+@@ -13999,6 +14337,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2523,7 +2681,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -14082,6 +14410,7 @@
+@@ -14082,6 +14435,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -2531,7 +2689,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -14330,6 +14659,10 @@
+@@ -14330,6 +14684,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -2542,7 +2700,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -14544,7 +14877,7 @@
+@@ -14544,7 +14902,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -2551,7 +2709,7 @@
# Allow CC to be a program name with arguments.
-@@ -14582,7 +14915,7 @@
+@@ -14582,7 +14940,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2560,7 +2718,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -14847,10 +15180,10 @@
+@@ -14847,10 +15205,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -2573,17 +2731,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -14863,27 +15196,27 @@
+@@ -14863,27 +15221,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14866: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15199: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15224: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14870: \$? = $ac_status" >&5
-+ echo "$as_me:15203: \$? = $ac_status" >&5
++ echo "$as_me:15228: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -2607,7 +2765,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14910,10 +15243,10 @@
+@@ -14910,10 +15268,10 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -2620,7 +2778,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14926,20 +15259,20 @@
+@@ -14926,20 +15284,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -2647,21 +2805,21 @@
:
else
lt_prog_compiler_static_F77=
-@@ -14967,11 +15300,11 @@
+@@ -14967,11 +15325,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14970: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15303: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15328: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14974: \$? = $ac_status" >&5
-+ echo "$as_me:15307: \$? = $ac_status" >&5
++ echo "$as_me:15332: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15051,12 +15384,13 @@
+@@ -15051,12 +15409,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -2676,7 +2834,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -15115,7 +15449,7 @@
+@@ -15115,7 +15474,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2685,7 +2843,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -15231,12 +15565,13 @@
+@@ -15231,12 +15590,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -2700,7 +2858,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15334,7 +15669,7 @@
+@@ -15334,7 +15694,7 @@
fi
;;
@@ -2709,7 +2867,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -15354,7 +15689,7 @@
+@@ -15354,7 +15714,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -2718,7 +2876,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -15606,11 +15941,10 @@
+@@ -15606,11 +15966,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -2734,7 +2892,7 @@
else
case $cc_basename in
xlc*)
-@@ -15760,7 +16094,7 @@
+@@ -15760,7 +16119,7 @@
link_all_deplibs_F77=yes
;;
@@ -2743,7 +2901,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16079,7 +16413,7 @@
+@@ -16079,7 +16438,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2752,7 +2910,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16419,6 +16753,18 @@
+@@ -16419,6 +16778,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2771,7 +2929,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16600,6 +16946,21 @@
+@@ -16600,6 +16971,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2793,7 +2951,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -16683,6 +17044,7 @@
+@@ -16683,6 +17069,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -2801,7 +2959,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -16931,6 +17293,10 @@
+@@ -16931,6 +17318,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -2812,7 +2970,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -17105,7 +17471,7 @@
+@@ -17105,7 +17496,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -2821,21 +2979,21 @@
# Allow CC to be a program name with arguments.
-@@ -17154,11 +17520,11 @@
+@@ -17154,11 +17545,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17157: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17523: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17548: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17161: \$? = $ac_status" >&5
-+ echo "$as_me:17527: \$? = $ac_status" >&5
++ echo "$as_me:17552: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17218,7 +17584,7 @@
+@@ -17218,7 +17609,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
@@ -2844,7 +3002,7 @@
;;
darwin* | rhapsody*)
-@@ -17288,7 +17654,7 @@
+@@ -17288,7 +17679,7 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
@@ -2853,7 +3011,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -17428,10 +17794,10 @@
+@@ -17428,10 +17819,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -2866,17 +3024,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -17444,27 +17810,27 @@
+@@ -17444,27 +17835,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17447: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17813: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17838: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17451: \$? = $ac_status" >&5
-+ echo "$as_me:17817: \$? = $ac_status" >&5
++ echo "$as_me:17842: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -2900,7 +3058,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17491,10 +17857,10 @@
+@@ -17491,10 +17882,10 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -2913,7 +3071,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -17507,20 +17873,20 @@
+@@ -17507,20 +17898,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -2940,21 +3098,21 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -17548,11 +17914,11 @@
+@@ -17548,11 +17939,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17551: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17917: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17942: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17555: \$? = $ac_status" >&5
-+ echo "$as_me:17921: \$? = $ac_status" >&5
++ echo "$as_me:17946: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17632,12 +17998,13 @@
+@@ -17632,12 +18023,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -2969,7 +3127,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -17696,7 +18063,7 @@
+@@ -17696,7 +18088,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2978,7 +3136,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -17812,12 +18179,13 @@
+@@ -17812,12 +18204,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -2993,7 +3151,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -17915,7 +18283,7 @@
+@@ -17915,7 +18308,7 @@
fi
;;
@@ -3002,7 +3160,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -17935,7 +18303,7 @@
+@@ -17935,7 +18328,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -3011,7 +3169,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -18207,11 +18575,10 @@
+@@ -18207,11 +18600,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -3027,7 +3185,7 @@
else
case $cc_basename in
xlc*)
-@@ -18361,7 +18728,7 @@
+@@ -18361,7 +18753,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -3036,7 +3194,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -18680,7 +19047,7 @@
+@@ -18680,7 +19072,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3045,7 +3203,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19020,6 +19387,18 @@
+@@ -19020,6 +19412,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3064,7 +3222,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19201,6 +19580,21 @@
+@@ -19201,6 +19605,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3086,7 +3244,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -19284,6 +19678,7 @@
+@@ -19284,6 +19703,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -3094,7 +3252,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -19532,6 +19927,10 @@
+@@ -19532,6 +19952,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -3105,7 +3263,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -19705,7 +20104,7 @@
+@@ -19705,7 +20129,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -3114,7 +3272,7 @@
# Allow CC to be a program name with arguments.
-@@ -19765,6 +20164,7 @@
+@@ -19765,6 +20189,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -3122,7 +3280,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -20013,6 +20413,10 @@
+@@ -20013,6 +20438,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -3133,7 +3291,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -21526,6 +21930,9 @@
+@@ -21526,6 +21955,9 @@
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
@@ -3143,7 +3301,7 @@
esac
done
-@@ -21636,7 +22043,7 @@
+@@ -21636,7 +22068,7 @@
fi
if test -n "$PKG_CONFIG"; then
@@ -3152,7 +3310,7 @@
{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-@@ -22000,7 +22407,7 @@
+@@ -22000,7 +22432,7 @@
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3161,7 +3319,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22010,7 +22417,7 @@
+@@ -22010,7 +22442,7 @@
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3170,7 +3328,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22120,7 +22527,7 @@
+@@ -22120,7 +22552,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3179,7 +3337,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22130,7 +22537,7 @@
+@@ -22130,7 +22562,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3188,7 +3346,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22240,7 +22647,7 @@
+@@ -22240,7 +22672,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3197,7 +3355,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22250,7 +22657,7 @@
+@@ -22250,7 +22682,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3206,7 +3364,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22360,7 +22767,7 @@
+@@ -22360,7 +22792,7 @@
and GNOMEVFS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3215,7 +3373,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22370,7 +22777,7 @@
+@@ -22370,7 +22802,7 @@
and GNOMEVFS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3224,7 +3382,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22480,7 +22887,7 @@
+@@ -22480,7 +22912,7 @@
and MUSICBRAINZ_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3233,7 +3391,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22490,7 +22897,7 @@
+@@ -22490,7 +22922,7 @@
and MUSICBRAINZ_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3242,7 +3400,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22894,7 +23301,7 @@
+@@ -22894,7 +23326,7 @@
and GST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3251,7 +3409,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22904,7 +23311,7 @@
+@@ -22904,7 +23336,7 @@
and GST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3260,7 +3418,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23242,7 +23649,7 @@
+@@ -23242,7 +23674,7 @@
and MONO_MODULE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3269,7 +3427,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23252,7 +23659,7 @@
+@@ -23252,7 +23684,7 @@
and MONO_MODULE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3278,7 +3436,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23852,7 +24259,7 @@
+@@ -23852,7 +24284,7 @@
and BOO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3287,7 +3445,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23862,7 +24269,7 @@
+@@ -23862,7 +24294,7 @@
and BOO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3296,7 +3454,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24004,7 +24411,7 @@
+@@ -24004,7 +24436,7 @@
and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3305,7 +3463,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24014,7 +24421,7 @@
+@@ -24014,7 +24446,7 @@
and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3314,7 +3472,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24152,7 +24559,7 @@
+@@ -24152,7 +24584,7 @@
and TAGLIB_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3323,7 +3481,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24162,7 +24569,7 @@
+@@ -24162,7 +24594,7 @@
and TAGLIB_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3332,7 +3490,302 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24332,7 +24739,7 @@
+@@ -24200,6 +24632,294 @@
+
+
+
++ # Check whether --enable-external_notify_sharp was given.
++if test "${enable_external_notify_sharp+set}" = set; then
++ enableval=$enable_external_notify_sharp; enable_external_notify_sharp="yes"
++else
++ enable_external_notify_sharp="no"
++fi
++
++
++ if test "x$enable_external_notify_sharp" = "xyes"; then
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for NOTIFY_SHARP" >&5
++echo $ECHO_N "checking for NOTIFY_SHARP... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NOTIFY_SHARP_CFLAGS"; then
++ pkg_cv_NOTIFY_SHARP_CFLAGS="$NOTIFY_SHARP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"notify-sharp\"") >&5
++ ($PKG_CONFIG --exists --print-errors "notify-sharp") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_NOTIFY_SHARP_CFLAGS=`$PKG_CONFIG --cflags "notify-sharp" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$NOTIFY_SHARP_LIBS"; then
++ pkg_cv_NOTIFY_SHARP_LIBS="$NOTIFY_SHARP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"notify-sharp\"") >&5
++ ($PKG_CONFIG --exists --print-errors "notify-sharp") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_NOTIFY_SHARP_LIBS=`$PKG_CONFIG --libs "notify-sharp" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ NOTIFY_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "notify-sharp"`
++ else
++ NOTIFY_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "notify-sharp"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$NOTIFY_SHARP_PKG_ERRORS" >&5
++
++ { { echo "$as_me:$LINENO: error: Package requirements (notify-sharp) were not met:
++
++$NOTIFY_SHARP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables NOTIFY_SHARP_CFLAGS
++and NOTIFY_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (notify-sharp) were not met:
++
++$NOTIFY_SHARP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables NOTIFY_SHARP_CFLAGS
++and NOTIFY_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables NOTIFY_SHARP_CFLAGS
++and NOTIFY_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables NOTIFY_SHARP_CFLAGS
++and NOTIFY_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ NOTIFY_SHARP_CFLAGS=$pkg_cv_NOTIFY_SHARP_CFLAGS
++ NOTIFY_SHARP_LIBS=$pkg_cv_NOTIFY_SHARP_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
++
++ if true; then
++ EXTERNAL_NOTIFY_SHARP_TRUE=
++ EXTERNAL_NOTIFY_SHARP_FALSE='#'
++else
++ EXTERNAL_NOTIFY_SHARP_TRUE='#'
++ EXTERNAL_NOTIFY_SHARP_FALSE=
++fi
++
++ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ if false; then
++ EXTERNAL_NOTIFY_SHARP_TRUE=
++ EXTERNAL_NOTIFY_SHARP_FALSE='#'
++else
++ EXTERNAL_NOTIFY_SHARP_TRUE='#'
++ EXTERNAL_NOTIFY_SHARP_FALSE=
++fi
++
++ fi
++
++
++
++ # Check whether --enable-external_gnome_keyring_sharp was given.
++if test "${enable_external_gnome_keyring_sharp+set}" = set; then
++ enableval=$enable_external_gnome_keyring_sharp; enable_external_gnome_keyring_sharp="yes"
++else
++ enable_external_gnome_keyring_sharp="no"
++fi
++
++
++ if test "x$enable_external_gnome_keyring_sharp" = "xyes"; then
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GNOME_KEYRING_SHARP" >&5
++echo $ECHO_N "checking for GNOME_KEYRING_SHARP... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOME_KEYRING_SHARP_CFLAGS"; then
++ pkg_cv_GNOME_KEYRING_SHARP_CFLAGS="$GNOME_KEYRING_SHARP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp-1.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GNOME_KEYRING_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-sharp-1.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GNOME_KEYRING_SHARP_LIBS"; then
++ pkg_cv_GNOME_KEYRING_SHARP_LIBS="$GNOME_KEYRING_SHARP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp-1.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp-1.0") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GNOME_KEYRING_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-keyring-sharp-1.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-sharp-1.0"`
++ else
++ GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-sharp-1.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GNOME_KEYRING_SHARP_PKG_ERRORS" >&5
++
++ { { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-sharp-1.0) were not met:
++
++$GNOME_KEYRING_SHARP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GNOME_KEYRING_SHARP_CFLAGS
++and GNOME_KEYRING_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (gnome-keyring-sharp-1.0) were not met:
++
++$GNOME_KEYRING_SHARP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GNOME_KEYRING_SHARP_CFLAGS
++and GNOME_KEYRING_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GNOME_KEYRING_SHARP_CFLAGS
++and GNOME_KEYRING_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GNOME_KEYRING_SHARP_CFLAGS
++and GNOME_KEYRING_SHARP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ GNOME_KEYRING_SHARP_CFLAGS=$pkg_cv_GNOME_KEYRING_SHARP_CFLAGS
++ GNOME_KEYRING_SHARP_LIBS=$pkg_cv_GNOME_KEYRING_SHARP_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
++
++ if true; then
++ EXTERNAL_GNOME_KEYRING_SHARP_TRUE=
++ EXTERNAL_GNOME_KEYRING_SHARP_FALSE='#'
++else
++ EXTERNAL_GNOME_KEYRING_SHARP_TRUE='#'
++ EXTERNAL_GNOME_KEYRING_SHARP_FALSE=
++fi
++
++ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ if false; then
++ EXTERNAL_GNOME_KEYRING_SHARP_TRUE=
++ EXTERNAL_GNOME_KEYRING_SHARP_FALSE='#'
++else
++ EXTERNAL_GNOME_KEYRING_SHARP_TRUE='#'
++ EXTERNAL_GNOME_KEYRING_SHARP_FALSE=
++fi
++
++ fi
++
++
++
+ GTKSHARP_REQUIRED=2.7
+
+ pkg_failed=no
+@@ -24332,7 +25052,7 @@
and GTKSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3341,7 +3794,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24342,7 +24749,7 @@
+@@ -24342,7 +25062,7 @@
and GTKSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3350,7 +3803,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24445,7 +24852,7 @@
+@@ -24445,7 +25165,7 @@
and SQLITE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3359,7 +3812,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24455,7 +24862,7 @@
+@@ -24455,7 +25175,7 @@
and SQLITE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3368,7 +3821,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24996,7 +25403,7 @@
+@@ -24996,7 +25716,7 @@
and MONOZEROCONF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3377,7 +3830,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -25006,7 +25413,7 @@
+@@ -25006,7 +25726,7 @@
and MONOZEROCONF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3386,7 +3839,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -25250,7 +25657,7 @@
+@@ -25250,7 +25970,7 @@
fi
fi
@@ -3395,7 +3848,7 @@
gt_cv_have_gettext=no
-@@ -26542,6 +26949,15 @@
+@@ -26542,6 +27262,15 @@
fi
fi
@@ -3411,7 +3864,7 @@
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -26560,7 +26976,7 @@
+@@ -26560,7 +27289,7 @@
@@ -3420,7 +3873,42 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -27283,9 +27699,7 @@
+@@ -26781,6 +27510,34 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${EXTERNAL_GNOME_KEYRING_SHARP_TRUE}" && test -z "${EXTERNAL_GNOME_KEYRING_SHARP_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_GNOME_KEYRING_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"EXTERNAL_GNOME_KEYRING_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${EXTERNAL_GNOME_KEYRING_SHARP_TRUE}" && test -z "${EXTERNAL_GNOME_KEYRING_SHARP_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_GNOME_KEYRING_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"EXTERNAL_GNOME_KEYRING_SHARP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${ENABLE_IPOD_TRUE}" && test -z "${ENABLE_IPOD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_IPOD\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -27283,9 +28040,7 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -3431,7 +3919,7 @@
_ACEOF
-@@ -27323,7 +27737,7 @@
+@@ -27323,7 +28078,7 @@
"ext/dbus-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES ext/dbus-sharp/Makefile" ;;
"ext/dbus-sharp/NDesk.DBus.GLib.dll.config") CONFIG_FILES="$CONFIG_FILES ext/dbus-sharp/NDesk.DBus.GLib.dll.config" ;;
"ext/libmtp-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES ext/libmtp-sharp/Makefile" ;;
@@ -3440,7 +3928,7 @@
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES src/AssemblyInfo.cs" ;;
"src/Core/Makefile") CONFIG_FILES="$CONFIG_FILES src/Core/Makefile" ;;
-@@ -27528,9 +27942,9 @@
+@@ -27528,9 +28283,9 @@
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
@@ -3453,7 +3941,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -27572,11 +27986,11 @@
+@@ -27572,11 +28327,11 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -3469,7 +3957,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
-@@ -27602,6 +28016,8 @@
+@@ -27602,6 +28357,8 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -3478,7 +3966,7 @@
CPP!$CPP$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
-@@ -27667,8 +28083,6 @@
+@@ -27667,8 +28424,6 @@
HAVE_BOOC_TRUE!$HAVE_BOOC_TRUE$ac_delim
HAVE_BOOC_FALSE!$HAVE_BOOC_FALSE$ac_delim
EXTERNAL_BOO_TRUE!$EXTERNAL_BOO_TRUE$ac_delim
@@ -3487,7 +3975,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -27710,6 +28124,8 @@
+@@ -27710,6 +28465,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -3496,7 +3984,22 @@
NDESK_DBUS_LIBS!$NDESK_DBUS_LIBS$ac_delim
NDESK_DBUS_PC_REQUIRES!$NDESK_DBUS_PC_REQUIRES$ac_delim
EXTERNAL_NDESK_DBUS_TRUE!$EXTERNAL_NDESK_DBUS_TRUE$ac_delim
-@@ -27751,10 +28167,8 @@
+@@ -27721,6 +28478,14 @@
+ EXTERNAL_TAGLIB_SHARP_TRUE!$EXTERNAL_TAGLIB_SHARP_TRUE$ac_delim
+ EXTERNAL_TAGLIB_SHARP_FALSE!$EXTERNAL_TAGLIB_SHARP_FALSE$ac_delim
+ TAGLIB_SHARP_PC_LIBS!$TAGLIB_SHARP_PC_LIBS$ac_delim
++NOTIFY_SHARP_CFLAGS!$NOTIFY_SHARP_CFLAGS$ac_delim
++NOTIFY_SHARP_LIBS!$NOTIFY_SHARP_LIBS$ac_delim
++EXTERNAL_NOTIFY_SHARP_TRUE!$EXTERNAL_NOTIFY_SHARP_TRUE$ac_delim
++EXTERNAL_NOTIFY_SHARP_FALSE!$EXTERNAL_NOTIFY_SHARP_FALSE$ac_delim
++GNOME_KEYRING_SHARP_CFLAGS!$GNOME_KEYRING_SHARP_CFLAGS$ac_delim
++GNOME_KEYRING_SHARP_LIBS!$GNOME_KEYRING_SHARP_LIBS$ac_delim
++EXTERNAL_GNOME_KEYRING_SHARP_TRUE!$EXTERNAL_GNOME_KEYRING_SHARP_TRUE$ac_delim
++EXTERNAL_GNOME_KEYRING_SHARP_FALSE!$EXTERNAL_GNOME_KEYRING_SHARP_FALSE$ac_delim
+ GTKSHARP_CFLAGS!$GTKSHARP_CFLAGS$ac_delim
+ GTKSHARP_LIBS!$GTKSHARP_LIBS$ac_delim
+ SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
+@@ -27751,10 +28516,8 @@
DAAP_ENABLED_FALSE!$DAAP_ENABLED_FALSE$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
@@ -3507,7 +4010,7 @@
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
-@@ -27764,12 +28178,13 @@
+@@ -27764,12 +28527,13 @@
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
@@ -3518,11 +4021,11 @@
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -28170,21 +28585,22 @@
+@@ -28170,21 +28934,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -3552,7 +4055,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -28221,7 +28637,7 @@
+@@ -28221,7 +28986,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -3561,7 +4064,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -28340,10 +28756,6 @@
+@@ -28340,10 +29105,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -3574,7 +4077,7 @@
if cmp -s ${file} ${file}.out 2>/dev/null; then
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/audio-profiles/Makefile.in banshee-0.13.2+dfsg/data/audio-profiles/Makefile.in
--- banshee-0.13.2+dfsg.old/data/audio-profiles/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/audio-profiles/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/data/audio-profiles/Makefile.in 2008-04-01 20:38:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3586,7 +4089,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -106,6 +106,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -106,6 +108,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -3594,7 +4110,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -148,14 +149,12 @@
+@@ -126,6 +129,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -148,14 +153,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3610,7 +4135,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -167,7 +166,6 @@
+@@ -167,7 +170,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3618,7 +4143,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -196,6 +194,7 @@
+@@ -196,6 +198,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -3626,7 +4151,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -206,6 +205,7 @@
+@@ -206,6 +209,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -3634,15 +4159,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -215,6 +215,7 @@
+@@ -215,6 +219,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -309,7 +310,8 @@
+@@ -309,7 +316,8 @@
mp3-xing.xml.in \
vorbis.xml.in \
wavpack.xml.in \
@@ -3654,7 +4181,7 @@
EXTRA_DIST = $(audioprofiles_in_files)
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/images/app-icons/Makefile.in banshee-0.13.2+dfsg/data/images/app-icons/Makefile.in
--- banshee-0.13.2+dfsg.old/data/images/app-icons/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/images/app-icons/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/data/images/app-icons/Makefile.in 2008-04-01 20:38:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3666,7 +4193,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -96,6 +98,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -3674,7 +4214,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -138,14 +139,12 @@
+@@ -116,6 +119,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -138,14 +143,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3690,7 +4239,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -157,7 +156,6 @@
+@@ -157,7 +160,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3698,7 +4247,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -186,6 +184,7 @@
+@@ -186,6 +188,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -3706,7 +4255,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -196,6 +195,7 @@
+@@ -196,6 +199,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -3714,17 +4263,19 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -205,6 +205,7 @@
+@@ -205,6 +209,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/images/Makefile.in banshee-0.13.2+dfsg/data/images/Makefile.in
--- banshee-0.13.2+dfsg.old/data/images/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/images/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/data/images/Makefile.in 2008-04-01 20:38:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3736,7 +4287,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -3744,7 +4308,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3760,7 +4333,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3768,7 +4341,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -3776,7 +4349,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -3784,15 +4357,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -420,8 +421,8 @@
+@@ -420,8 +427,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3803,7 +4378,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -446,8 +447,8 @@
+@@ -446,8 +453,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3814,7 +4389,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -457,13 +458,12 @@
+@@ -457,13 +464,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -3832,7 +4407,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/Makefile.in banshee-0.13.2+dfsg/data/Makefile.in
--- banshee-0.13.2+dfsg.old/data/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/data/Makefile.in 2008-04-01 20:38:30.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3844,7 +4419,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -121,6 +121,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -121,6 +123,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -3852,7 +4440,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -163,14 +164,12 @@
+@@ -141,6 +144,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -163,14 +168,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3868,7 +4465,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -182,7 +181,6 @@
+@@ -182,7 +185,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3876,7 +4473,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -211,6 +209,7 @@
+@@ -211,6 +213,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -3884,7 +4481,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -221,6 +220,7 @@
+@@ -221,6 +224,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -3892,15 +4489,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -230,6 +230,7 @@
+@@ -230,6 +234,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -498,8 +499,8 @@
+@@ -498,8 +505,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3911,7 +4510,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -524,8 +525,8 @@
+@@ -524,8 +531,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -3922,7 +4521,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -535,13 +536,12 @@
+@@ -535,13 +542,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -3940,7 +4539,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/depcomp banshee-0.13.2+dfsg/depcomp
--- banshee-0.13.2+dfsg.old/depcomp 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/depcomp 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/depcomp 2008-04-01 20:38:32.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -4007,7 +4606,7 @@
# store a dummy comment line, to avoid errors with the Makefile
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/docs/Makefile.in banshee-0.13.2+dfsg/docs/Makefile.in
--- banshee-0.13.2+dfsg.old/docs/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/docs/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/docs/Makefile.in 2008-04-01 20:38:31.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4019,7 +4618,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -106,6 +106,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -106,6 +108,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4027,7 +4639,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -148,14 +149,12 @@
+@@ -126,6 +129,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -148,14 +153,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4043,7 +4664,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -167,7 +166,6 @@
+@@ -167,7 +170,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4051,7 +4672,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -196,6 +194,7 @@
+@@ -196,6 +198,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4059,7 +4680,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -206,6 +205,7 @@
+@@ -206,6 +209,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4067,15 +4688,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -215,6 +215,7 @@
+@@ -215,6 +219,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -568,10 +569,8 @@
+@@ -568,10 +575,8 @@
@BUILD_DOCS_TRUE@ $(DOC_ASSEMBLER) $(srcdir)/en
@BUILD_DOCS_TRUE at install-data-hook:
@@ -4088,7 +4711,7 @@
.NOEXPORT:
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/dbus-sharp/Makefile.in banshee-0.13.2+dfsg/ext/dbus-sharp/Makefile.in
--- banshee-0.13.2+dfsg.old/ext/dbus-sharp/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/dbus-sharp/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/ext/dbus-sharp/Makefile.in 2008-04-01 20:38:31.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4100,7 +4723,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -102,6 +102,7 @@
+@@ -45,10 +45,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -102,6 +104,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4108,7 +4744,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -144,14 +145,12 @@
+@@ -122,6 +125,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -144,14 +149,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4124,7 +4769,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -163,7 +162,6 @@
+@@ -163,7 +166,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4132,7 +4777,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -192,6 +190,7 @@
+@@ -192,6 +194,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4140,7 +4785,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -202,6 +201,7 @@
+@@ -202,6 +205,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4148,17 +4793,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -211,6 +211,7 @@
+@@ -211,6 +215,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -319,7 +326,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/hal-sharp/Makefile.in banshee-0.13.2+dfsg/ext/hal-sharp/Makefile.in
--- banshee-0.13.2+dfsg.old/ext/hal-sharp/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/hal-sharp/Makefile.in 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/ext/hal-sharp/Makefile.in 2008-04-01 20:38:31.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4170,7 +4827,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4178,7 +4848,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4194,7 +4873,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4202,7 +4881,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4210,7 +4889,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4218,17 +4897,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/libmtp-sharp/Makefile.in banshee-0.13.2+dfsg/ext/libmtp-sharp/Makefile.in
--- banshee-0.13.2+dfsg.old/ext/libmtp-sharp/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/libmtp-sharp/Makefile.in 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/ext/libmtp-sharp/Makefile.in 2008-04-01 20:38:31.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4249,7 +4940,20 @@
$(top_srcdir)/build/Common.Makefile
subdir = ext/libmtp-sharp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -63,7 +63,7 @@
+@@ -45,10 +45,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -63,7 +65,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
@@ -4258,7 +4962,7 @@
am__installdirs = "$(DESTDIR)$(asmdir)"
asmSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(asm_SCRIPTS)
-@@ -102,6 +102,7 @@
+@@ -102,6 +104,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4266,7 +4970,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -144,14 +145,12 @@
+@@ -122,6 +125,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -144,14 +149,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4282,7 +4995,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -163,7 +162,6 @@
+@@ -163,7 +166,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4290,7 +5003,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -192,6 +190,7 @@
+@@ -192,6 +194,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4298,7 +5011,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -202,6 +201,7 @@
+@@ -202,6 +205,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4306,15 +5019,27 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -211,6 +211,7 @@
+@@ -211,6 +215,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -369,7 +370,7 @@
+@@ -319,7 +326,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
+@@ -369,7 +377,7 @@
BANSHEE_DAP_PATH=$(top_builddir)/src/Dap$${BANSHEE_DAP_PATH+:$$BANSHEE_DAP_PATH} \
BANSHEE_PROFILES_PATH=$(top_builddir)/data/audio-profiles
@@ -4323,7 +5048,7 @@
ASSEMBLY = $(ASSEMBLY_NAME).dll
asmdir = $(pkglibdir)/Banshee.Dap
asm_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
-@@ -385,10 +386,11 @@
+@@ -385,10 +393,11 @@
$(srcdir)/Base/Error.cs \
$(srcdir)/Base/FileSampleData.cs \
$(srcdir)/Base/MtpDeviceStruct.cs \
@@ -4337,7 +5062,7 @@
$(srcdir)/Functions/AlbumManagement.cs \
$(srcdir)/Functions/FunctionCalls.cs \
$(srcdir)/Functions/FolderManagement.cs \
-@@ -431,7 +433,7 @@
+@@ -431,7 +440,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4348,7 +5073,7 @@
@$(NORMAL_INSTALL)
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/Makefile.in banshee-0.13.2+dfsg/ext/Makefile.in
--- banshee-0.13.2+dfsg.old/ext/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/Makefile.in 2008-03-25 10:09:44.000000000 +0100
++++ banshee-0.13.2+dfsg/ext/Makefile.in 2008-04-01 20:38:31.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4360,7 +5085,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -109,6 +109,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -109,6 +111,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4368,7 +5106,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -151,14 +152,12 @@
+@@ -129,6 +132,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -151,14 +156,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4384,7 +5131,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -170,7 +169,6 @@
+@@ -170,7 +173,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4392,7 +5139,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -199,6 +197,7 @@
+@@ -199,6 +201,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4400,7 +5147,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -209,6 +208,7 @@
+@@ -209,6 +212,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4408,15 +5155,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -218,6 +218,7 @@
+@@ -218,6 +222,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -423,8 +424,8 @@
+@@ -423,8 +430,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4427,7 +5176,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -449,8 +450,8 @@
+@@ -449,8 +456,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4438,7 +5187,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -460,13 +461,12 @@
+@@ -460,13 +467,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4456,7 +5205,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/taglib-sharp/Makefile.in banshee-0.13.2+dfsg/ext/taglib-sharp/Makefile.in
--- banshee-0.13.2+dfsg.old/ext/taglib-sharp/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/taglib-sharp/Makefile.in 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/ext/taglib-sharp/Makefile.in 2008-04-01 20:38:31.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4468,7 +5217,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -102,6 +102,7 @@
+@@ -45,10 +45,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -102,6 +104,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4476,7 +5238,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -144,14 +145,12 @@
+@@ -122,6 +125,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -144,14 +149,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4492,7 +5263,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -163,7 +162,6 @@
+@@ -163,7 +166,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4500,7 +5271,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -192,6 +190,7 @@
+@@ -192,6 +194,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4508,7 +5279,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -202,6 +201,7 @@
+@@ -202,6 +205,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4516,15 +5287,27 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -211,6 +211,7 @@
+@@ -211,6 +215,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -371,8 +372,6 @@
+@@ -319,7 +326,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
+@@ -371,8 +379,6 @@
ASSEMBLY_NAME = TagLib
ASSEMBLY = $(ASSEMBLY_NAME).dll
@@ -4533,7 +5316,7 @@
TAGLIB_CSFILES = \
$(srcdir)/TagLib/Ape/Tag.cs \
$(srcdir)/TagLib/Ape/Item.cs \
-@@ -501,6 +500,8 @@
+@@ -501,6 +507,8 @@
$(srcdir)/TagLib/FileTypes.cs \
$(srcdir)/TagLib/CorruptFileException.cs
@@ -4542,7 +5325,7 @@
EXTRA_DIST = $(TAGLIB_CSFILES) $(srcdir)/TagLib/TagLib.sources
CLEANFILES = $(taglib_SCRIPTS)
MAINTAINERCLEANFILES = Makefile.in
-@@ -696,10 +697,10 @@
+@@ -696,10 +704,10 @@
uninstall uninstall-am uninstall-taglibSCRIPTS
@@ -4558,7 +5341,7 @@
.NOEXPORT:
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/extras/Makefile.in banshee-0.13.2+dfsg/extras/Makefile.in
--- banshee-0.13.2+dfsg.old/extras/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/extras/Makefile.in 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/extras/Makefile.in 2008-04-01 20:38:31.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4570,7 +5353,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4578,7 +5374,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4594,7 +5399,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4602,7 +5407,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4610,7 +5415,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4618,15 +5423,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -422,8 +423,8 @@
+@@ -422,8 +429,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4637,7 +5444,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -448,8 +449,8 @@
+@@ -448,8 +455,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -4648,7 +5455,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -459,13 +460,12 @@
+@@ -459,13 +466,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -4666,7 +5473,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/extras/tools/Makefile.in banshee-0.13.2+dfsg/extras/tools/Makefile.in
--- banshee-0.13.2+dfsg.old/extras/tools/Makefile.in 2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/extras/tools/Makefile.in 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/extras/tools/Makefile.in 2008-04-01 20:38:32.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4678,7 +5485,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -98,6 +98,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -98,6 +100,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -4686,7 +5506,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -140,14 +141,12 @@
+@@ -118,6 +121,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -140,14 +145,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4702,7 +5531,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -159,7 +158,6 @@
+@@ -159,7 +162,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4710,7 +5539,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -188,6 +186,7 @@
+@@ -188,6 +190,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -4718,7 +5547,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -198,6 +197,7 @@
+@@ -198,6 +201,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -4726,17 +5555,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -207,6 +207,7 @@
+@@ -207,6 +211,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -315,7 +322,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/install-sh banshee-0.13.2+dfsg/install-sh
--- banshee-0.13.2+dfsg.old/install-sh 2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/install-sh 2008-03-25 10:09:43.000000000 +0100
++++ banshee-0.13.2+dfsg/install-sh 2008-04-01 20:38:29.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -5101,7 +5942,7 @@
fi
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/intltool-extract.in banshee-0.13.2+dfsg/intltool-extract.in
--- banshee-0.13.2+dfsg.old/intltool-extract.in 2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/intltool-extract.in 2008-03-25 10:09:33.000000000 +0100
++++ banshee-0.13.2+dfsg/intltool-extract.in 2008-04-01 20:38:17.000000000 +0200
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -5161,7 +6002,7 @@
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/intltool-merge.in banshee-0.13.2+dfsg/intltool-merge.in
--- banshee-0.13.2+dfsg.old/intltool-merge.in 2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/intltool-merge.in 2008-03-25 10:09:33.000000000 +0100
++++ banshee-0.13.2+dfsg/intltool-merge.in 2008-04-01 20:38:17.000000000 +0200
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -5474,7 +6315,7 @@
close OUTPUT;
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/intltool-update.in banshee-0.13.2+dfsg/intltool-update.in
--- banshee-0.13.2+dfsg.old/intltool-update.in 2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/intltool-update.in 2008-03-25 10:09:33.000000000 +0100
++++ banshee-0.13.2+dfsg/intltool-update.in 2008-04-01 20:38:17.000000000 +0200
@@ -30,7 +30,7 @@
## Release information
@@ -5734,7 +6575,7 @@
return $keywords;
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/libbanshee/Makefile.in banshee-0.13.2+dfsg/libbanshee/Makefile.in
--- banshee-0.13.2+dfsg.old/libbanshee/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/libbanshee/Makefile.in 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/libbanshee/Makefile.in 2008-04-01 20:38:32.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5746,7 +6587,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -81,7 +81,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -81,7 +83,7 @@
libbanshee_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libbanshee_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -5755,7 +6609,7 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -130,6 +130,7 @@
+@@ -130,6 +132,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -5763,7 +6617,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -172,14 +173,12 @@
+@@ -150,6 +153,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -172,14 +177,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5779,7 +6642,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -191,7 +190,6 @@
+@@ -191,7 +194,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5787,7 +6650,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -220,6 +218,7 @@
+@@ -220,6 +222,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -5795,7 +6658,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -230,6 +229,7 @@
+@@ -230,6 +233,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -5803,15 +6666,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -239,6 +239,7 @@
+@@ -239,6 +243,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -399,8 +400,8 @@
+@@ -399,8 +406,8 @@
@list='$(bansheelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -5822,7 +6687,7 @@
else :; fi; \
done
-@@ -408,8 +409,8 @@
+@@ -408,8 +415,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bansheelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -5833,7 +6698,7 @@
done
clean-bansheelibLTLIBRARIES:
-@@ -470,8 +471,8 @@
+@@ -470,8 +477,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5844,7 +6709,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -483,8 +484,8 @@
+@@ -483,8 +490,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -5855,7 +6720,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -494,13 +495,12 @@
+@@ -494,13 +501,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -5873,7 +6738,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ltmain.sh banshee-0.13.2+dfsg/ltmain.sh
--- banshee-0.13.2+dfsg.old/ltmain.sh 2007-09-21 20:28:33.000000000 +0200
-+++ banshee-0.13.2+dfsg/ltmain.sh 2008-02-02 14:28:24.000000000 +0100
++++ banshee-0.13.2+dfsg/ltmain.sh 2008-03-30 17:14:06.000000000 +0200
@@ -2,7 +2,7 @@
# NOTE: Changing this file will not affect anything until you rerun configure.
#
@@ -5889,7 +6754,7 @@
PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
-+VERSION="1.5.26 Debian 1.5.26-1"
++VERSION="1.5.26 Debian 1.5.26-2"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
@@ -6069,7 +6934,7 @@
$lt_var=\$save_$lt_var; export $lt_var
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/Makefile.in banshee-0.13.2+dfsg/Makefile.in
--- banshee-0.13.2+dfsg.old/Makefile.in 2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/Makefile.in 2008-03-25 10:09:50.000000000 +0100
++++ banshee-0.13.2+dfsg/Makefile.in 2008-04-01 20:38:39.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6081,7 +6946,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -124,6 +124,7 @@
+@@ -46,10 +46,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -124,6 +126,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6089,7 +6967,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -166,14 +167,12 @@
+@@ -144,6 +147,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -166,14 +171,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6105,7 +6992,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -185,7 +184,6 @@
+@@ -185,7 +188,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6113,7 +7000,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -214,6 +212,7 @@
+@@ -214,6 +216,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6121,7 +7008,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -224,6 +223,7 @@
+@@ -224,6 +227,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6129,15 +7016,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -233,6 +233,7 @@
+@@ -233,6 +237,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -506,8 +507,8 @@
+@@ -506,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6148,7 +7037,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -532,8 +533,8 @@
+@@ -532,8 +539,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6159,7 +7048,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -543,13 +544,12 @@
+@@ -543,13 +550,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6175,7 +7064,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -619,6 +619,10 @@
+@@ -619,6 +625,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -6186,7 +7075,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -646,6 +650,8 @@
+@@ -646,6 +656,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -6195,7 +7084,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -802,8 +808,8 @@
+@@ -802,8 +814,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
@@ -6208,7 +7097,7 @@
install-data install-data-am install-dvi install-dvi-am \
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/po/Makefile.in.in banshee-0.13.2+dfsg/po/Makefile.in.in
--- banshee-0.13.2+dfsg.old/po/Makefile.in.in 2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/po/Makefile.in.in 2008-03-25 10:09:33.000000000 +0100
++++ banshee-0.13.2+dfsg/po/Makefile.in.in 2008-04-01 20:38:17.000000000 +0200
@@ -1,10 +1,10 @@
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -6243,7 +7132,7 @@
linguas="$(USE_LINGUAS)"; \
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Core/Banshee/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee/Makefile.in 2008-03-25 10:09:46.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Core/Banshee/Makefile.in 2008-04-01 20:38:33.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6255,7 +7144,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -114,6 +114,7 @@
+@@ -47,10 +47,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -114,6 +116,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6263,7 +7165,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,14 +157,12 @@
+@@ -134,6 +137,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -156,14 +161,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6279,7 +7190,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -175,7 +174,6 @@
+@@ -175,7 +178,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6287,7 +7198,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -204,6 +202,7 @@
+@@ -204,6 +206,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6295,7 +7206,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -214,6 +213,7 @@
+@@ -214,6 +217,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6303,17 +7214,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -223,6 +223,7 @@
+@@ -223,6 +227,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -331,7 +338,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee.Base/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Base/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Core/Banshee.Base/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee.Base/Makefile.in 2008-03-25 10:09:45.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Core/Banshee.Base/Makefile.in 2008-04-01 20:38:32.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6325,7 +7248,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -113,6 +113,7 @@
+@@ -47,10 +47,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -113,6 +115,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6333,7 +7269,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -155,14 +156,12 @@
+@@ -133,6 +136,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -155,14 +160,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6349,7 +7294,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -174,7 +173,6 @@
+@@ -174,7 +177,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6357,7 +7302,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -203,6 +201,7 @@
+@@ -203,6 +205,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6365,7 +7310,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -213,6 +212,7 @@
+@@ -213,6 +216,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6373,17 +7318,56 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -222,6 +222,7 @@
+@@ -222,6 +226,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -330,7 +337,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
+@@ -622,10 +630,13 @@
+ $(srcdir)/MediaEngine/PlayerEngine.cs \
+ $(srcdir)/MediaEngine/IEqualizer.cs
+
+-NOTIFICATIONS_SOURCES = \
+- $(srcdir)/Notifications/Notification.cs \
+- $(srcdir)/Notifications/Notifications.cs
+-
++ at EXTERNAL_NOTIFY_SHARP_FALSE@NOTIFICATIONS_SOURCES = \
++ at EXTERNAL_NOTIFY_SHARP_FALSE@ $(srcdir)/Notifications/Notification.cs \
++ at EXTERNAL_NOTIFY_SHARP_FALSE@ $(srcdir)/Notifications/Notifications.cs
++
++ at EXTERNAL_NOTIFY_SHARP_TRUE@NOTIFICATIONS_SOURCES =
++ at EXTERNAL_NOTIFY_SHARP_FALSE@NOTIFICATIONS_LIBS =
++ at EXTERNAL_NOTIFY_SHARP_TRUE@NOTIFICATIONS_LIBS = $(NOTIFY_SHARP_LIBS)
+ HYENA_SOURCES = \
+ $(srcdir)/Hyena/IUndoAction.cs \
+ $(srcdir)/Hyena/UndoManager.cs
+@@ -981,7 +992,7 @@
+
+
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(Banshee_Base_EXPANDED_RESOURCES)
+- $(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
++ $(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) $(NOTIFICATIONS_LIBS) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
+
+ $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
+ if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee.Hyena/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Hyena/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Core/Banshee.Hyena/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee.Hyena/Makefile.in 2008-03-25 10:09:46.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Core/Banshee.Hyena/Makefile.in 2008-04-01 20:38:33.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6395,7 +7379,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -97,6 +97,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -97,6 +99,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6403,7 +7400,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -139,14 +140,12 @@
+@@ -117,6 +120,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -139,14 +144,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6419,7 +7425,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -158,7 +157,6 @@
+@@ -158,7 +161,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6427,7 +7433,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -187,6 +185,7 @@
+@@ -187,6 +189,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6435,7 +7441,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -197,6 +196,7 @@
+@@ -197,6 +200,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6443,17 +7449,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -206,6 +206,7 @@
+@@ -206,6 +210,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -314,7 +321,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee.Widgets/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Widgets/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Core/Banshee.Widgets/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee.Widgets/Makefile.in 2008-03-25 10:09:46.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Core/Banshee.Widgets/Makefile.in 2008-04-01 20:38:33.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6465,7 +7483,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -102,6 +102,7 @@
+@@ -45,10 +45,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -102,6 +104,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6473,7 +7504,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -144,14 +145,12 @@
+@@ -122,6 +125,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -144,14 +149,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6489,7 +7529,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -163,7 +162,6 @@
+@@ -163,7 +166,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6497,7 +7537,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -192,6 +190,7 @@
+@@ -192,6 +194,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6505,7 +7545,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -202,6 +201,7 @@
+@@ -202,6 +205,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6513,17 +7553,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -211,6 +211,7 @@
+@@ -211,6 +215,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -319,7 +326,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Makefile.in banshee-0.13.2+dfsg/src/Core/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Core/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Makefile.in 2008-03-25 10:09:46.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Core/Makefile.in 2008-04-01 20:38:33.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6535,7 +7587,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6543,7 +7608,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6559,7 +7633,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6567,7 +7641,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6575,7 +7649,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6583,15 +7657,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -426,8 +427,8 @@
+@@ -426,8 +433,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6602,7 +7678,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -452,8 +453,8 @@
+@@ -452,8 +459,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6613,7 +7689,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -463,13 +464,12 @@
+@@ -463,13 +470,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6631,7 +7707,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in 2008-03-25 10:09:46.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in 2008-04-01 20:38:33.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6643,7 +7719,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6651,7 +7740,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6667,7 +7765,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6675,7 +7773,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6683,7 +7781,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6691,17 +7789,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in 2008-03-25 10:09:46.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in 2008-04-01 20:38:34.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6713,7 +7823,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6721,7 +7844,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6737,7 +7869,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6745,7 +7877,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6753,7 +7885,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6761,17 +7893,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2008-03-25 10:09:46.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2008-04-01 20:38:34.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6783,7 +7927,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6791,7 +7948,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6807,7 +7973,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6815,7 +7981,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6823,7 +7989,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6831,17 +7997,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in 2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in 2008-03-25 10:09:47.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in 2008-04-01 20:38:34.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6853,7 +8031,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6861,7 +8052,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6877,7 +8077,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6885,7 +8085,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6893,7 +8093,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6901,15 +8101,27 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -372,6 +373,7 @@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
+@@ -372,6 +380,7 @@
ASSEMBLY = $(ASSEMBLY_NAME).dll
ASSEMBLY_SOURCES = \
$(top_srcdir)/src/AssemblyInfo.cs \
@@ -6917,7 +8129,7 @@
$(srcdir)/MtpDap.cs \
$(srcdir)/MtpDapTrackInfo.cs \
$(srcdir)/MtpDapPlaylistSource.cs
-@@ -576,7 +578,7 @@
+@@ -576,7 +585,7 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
@@ -6928,7 +8140,7 @@
.NOEXPORT:
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in 2008-03-25 10:09:47.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in 2008-04-01 20:38:34.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6940,7 +8152,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -102,6 +102,7 @@
+@@ -45,10 +45,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -102,6 +104,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -6948,7 +8173,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -144,14 +145,12 @@
+@@ -122,6 +125,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -144,14 +149,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6964,7 +8198,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -163,7 +162,6 @@
+@@ -163,7 +166,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6972,7 +8206,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -192,6 +190,7 @@
+@@ -192,6 +194,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -6980,7 +8214,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -202,6 +201,7 @@
+@@ -202,6 +205,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -6988,17 +8222,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -211,6 +211,7 @@
+@@ -211,6 +215,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -319,7 +326,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Makefile.in banshee-0.13.2+dfsg/src/Dap/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Dap/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Makefile.in 2008-03-25 10:09:47.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Dap/Makefile.in 2008-04-01 20:38:34.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7010,7 +8256,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7018,7 +8277,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7034,7 +8302,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7042,7 +8310,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7050,7 +8318,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7058,15 +8326,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -425,8 +426,8 @@
+@@ -425,8 +432,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7077,7 +8347,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -451,8 +452,8 @@
+@@ -451,8 +458,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7088,7 +8358,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -462,13 +463,12 @@
+@@ -462,13 +469,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -7106,7 +8376,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in banshee-0.13.2+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2008-03-25 10:09:47.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2008-04-01 20:38:34.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7118,7 +8388,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7126,7 +8409,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7142,7 +8434,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7150,7 +8442,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7158,7 +8450,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7166,17 +8458,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Engines/Makefile.in banshee-0.13.2+dfsg/src/Engines/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Engines/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Engines/Makefile.in 2008-03-25 10:09:47.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Engines/Makefile.in 2008-04-01 20:38:35.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7188,7 +8492,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7196,7 +8513,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7212,7 +8538,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7220,7 +8546,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7228,7 +8554,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7236,15 +8562,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -419,8 +420,8 @@
+@@ -419,8 +426,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7255,7 +8583,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -445,8 +446,8 @@
+@@ -445,8 +452,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7266,7 +8594,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -456,13 +457,12 @@
+@@ -456,13 +463,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -7284,7 +8612,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Boo/Makefile.in banshee-0.13.2+dfsg/src/Extras/Boo/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Extras/Boo/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Boo/Makefile.in 2008-03-25 10:09:47.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Extras/Boo/Makefile.in 2008-04-01 20:38:35.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7296,7 +8624,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -100,6 +100,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -100,6 +102,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7304,7 +8645,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -142,14 +143,12 @@
+@@ -120,6 +123,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -142,14 +147,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7320,7 +8670,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -161,7 +160,6 @@
+@@ -161,7 +164,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7328,7 +8678,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -190,6 +188,7 @@
+@@ -190,6 +192,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7336,7 +8686,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -200,6 +199,7 @@
+@@ -200,6 +203,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7344,17 +8694,19 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -209,6 +209,7 @@
+@@ -209,6 +213,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/BooBuddy/Makefile.in banshee-0.13.2+dfsg/src/Extras/BooBuddy/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Extras/BooBuddy/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/BooBuddy/Makefile.in 2008-03-25 10:09:47.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Extras/BooBuddy/Makefile.in 2008-04-01 20:38:35.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7366,7 +8718,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7374,7 +8739,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7390,7 +8764,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7398,7 +8772,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7406,7 +8780,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7414,17 +8788,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in banshee-0.13.2+dfsg/src/Extras/Gnome.Keyring/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Gnome.Keyring/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Extras/Gnome.Keyring/Makefile.in 2008-04-01 20:38:35.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7436,7 +8822,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7444,7 +8843,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7460,7 +8868,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7468,7 +8876,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7476,7 +8884,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7484,17 +8892,52 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
+@@ -370,9 +378,9 @@
+
+ ASSEMBLY_NAME = Gnome.Keyring
+ ASSEMBLY = $(ASSEMBLY_NAME).dll
+-gnome_keyringdir = $(pkglibdir)
+-gnome_keyring_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
+ ASSEMBLY_SOURCES = $(srcdir)/*.cs
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@gnome_keyringdir = $(pkglibdir)
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@gnome_keyring_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
+ EXTRA_DIST = $(ASSEMBLY_SOURCES)
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+ DISTCLEANFILES = *.pidb
+@@ -570,8 +578,8 @@
+ ps ps-am uninstall uninstall-am uninstall-gnome_keyringSCRIPTS
+
+
+-$(ASSEMBLY): $(ASSEMBLY_SOURCES)
+- $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@ $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Last.FM/Makefile.in banshee-0.13.2+dfsg/src/Extras/Last.FM/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Extras/Last.FM/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Last.FM/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Extras/Last.FM/Makefile.in 2008-04-01 20:38:35.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7506,7 +8949,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,7 @@
+@@ -44,10 +44,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -101,6 +103,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7514,7 +8970,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -143,14 +144,12 @@
+@@ -121,6 +124,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -143,14 +148,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7530,7 +8995,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +161,6 @@
+@@ -162,7 +165,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7538,7 +9003,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -191,6 +189,7 @@
+@@ -191,6 +193,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7546,7 +9011,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -201,6 +200,7 @@
+@@ -201,6 +204,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7554,17 +9019,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -210,6 +210,7 @@
+@@ -210,6 +214,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -318,7 +325,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Makefile.in banshee-0.13.2+dfsg/src/Extras/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Extras/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Extras/Makefile.in 2008-04-01 20:38:35.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7576,7 +9053,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7584,7 +9074,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7600,7 +9099,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7608,7 +9107,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7616,7 +9115,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7624,15 +9123,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -427,8 +428,8 @@
+@@ -427,8 +434,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7643,7 +9144,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -453,8 +454,8 @@
+@@ -453,8 +460,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7654,7 +9155,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -464,13 +465,12 @@
+@@ -464,13 +471,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -7672,7 +9173,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/MusicBrainz/Makefile.in banshee-0.13.2+dfsg/src/Extras/MusicBrainz/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Extras/MusicBrainz/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/MusicBrainz/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Extras/MusicBrainz/Makefile.in 2008-04-01 20:38:35.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7684,7 +9185,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -102,6 +102,7 @@
+@@ -45,10 +45,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -102,6 +104,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7692,7 +9206,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -144,14 +145,12 @@
+@@ -122,6 +125,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -144,14 +149,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7708,7 +9231,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -163,7 +162,6 @@
+@@ -163,7 +166,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7716,7 +9239,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -192,6 +190,7 @@
+@@ -192,6 +194,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7724,7 +9247,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -202,6 +201,7 @@
+@@ -202,6 +205,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7732,17 +9255,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -211,6 +211,7 @@
+@@ -211,6 +215,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -319,7 +326,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Makefile.in banshee-0.13.2+dfsg/src/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Makefile.in 2008-04-01 20:38:36.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7754,7 +9289,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -109,6 +109,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -109,6 +111,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7762,7 +9310,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -151,14 +152,12 @@
+@@ -129,6 +132,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -151,14 +156,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7778,7 +9335,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -170,7 +169,6 @@
+@@ -170,7 +173,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7786,7 +9343,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -199,6 +197,7 @@
+@@ -199,6 +201,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7794,7 +9351,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -209,6 +208,7 @@
+@@ -209,6 +212,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7802,15 +9359,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -218,6 +218,7 @@
+@@ -218,6 +222,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -432,8 +433,8 @@
+@@ -432,8 +439,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7821,7 +9380,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -458,8 +459,8 @@
+@@ -458,8 +465,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7832,7 +9391,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -469,13 +470,12 @@
+@@ -469,13 +476,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -7850,7 +9409,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2008-04-01 20:38:36.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7862,7 +9421,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -113,6 +113,7 @@
+@@ -47,10 +47,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -113,6 +115,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7870,7 +9442,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -155,14 +156,12 @@
+@@ -133,6 +136,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -155,14 +160,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7886,7 +9467,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -174,7 +173,6 @@
+@@ -174,7 +177,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7894,7 +9475,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -203,6 +201,7 @@
+@@ -203,6 +205,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7902,7 +9483,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -213,6 +212,7 @@
+@@ -213,6 +216,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7910,17 +9491,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -222,6 +222,7 @@
+@@ -222,6 +226,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -330,7 +337,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2008-04-01 20:38:36.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7932,7 +9525,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -110,6 +110,7 @@
+@@ -46,10 +46,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -110,6 +112,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -7940,7 +9546,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -152,14 +153,12 @@
+@@ -130,6 +133,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -152,14 +157,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7956,7 +9571,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +170,6 @@
+@@ -171,7 +174,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7964,7 +9579,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -200,6 +198,7 @@
+@@ -200,6 +202,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -7972,7 +9587,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -210,6 +209,7 @@
+@@ -210,6 +213,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -7980,17 +9595,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -219,6 +219,7 @@
+@@ -219,6 +223,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -327,7 +334,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2008-03-25 10:09:48.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2008-04-01 20:38:36.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8002,7 +9629,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -112,6 +112,7 @@
+@@ -47,10 +47,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -112,6 +114,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8010,7 +9650,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,14 +155,12 @@
+@@ -132,6 +135,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -154,14 +159,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8026,7 +9675,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -173,7 +172,6 @@
+@@ -173,7 +176,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8034,7 +9683,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -202,6 +200,7 @@
+@@ -202,6 +204,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8042,7 +9691,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -212,6 +211,7 @@
+@@ -212,6 +215,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8050,17 +9699,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -221,6 +221,7 @@
+@@ -221,6 +225,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -329,7 +336,8 @@
+ @DAAP_ENABLED_TRUE at LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ @DAAP_ENABLED_TRUE at LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ @DAAP_ENABLED_TRUE at LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+- at DAAP_ENABLED_TRUE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at DAAP_ENABLED_TRUE@@EXTERNAL_GNOME_KEYRING_SHARP_FALSE at LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at DAAP_ENABLED_TRUE@@EXTERNAL_GNOME_KEYRING_SHARP_TRUE at LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @DAAP_ENABLED_TRUE@@EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @DAAP_ENABLED_TRUE@@EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @DAAP_ENABLED_TRUE@@EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.LastFM/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.LastFM/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.LastFM/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.LastFM/Makefile.in 2008-03-25 10:09:49.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.LastFM/Makefile.in 2008-04-01 20:38:37.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8072,7 +9733,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -111,6 +111,7 @@
+@@ -47,10 +47,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -111,6 +113,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8080,7 +9754,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -153,14 +154,12 @@
+@@ -131,6 +134,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -153,14 +158,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8096,7 +9779,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -172,7 +171,6 @@
+@@ -172,7 +175,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8104,7 +9787,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -201,6 +199,7 @@
+@@ -201,6 +203,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8112,7 +9795,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -211,6 +210,7 @@
+@@ -211,6 +214,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8120,17 +9803,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -220,6 +220,7 @@
+@@ -220,6 +224,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -328,7 +335,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2008-03-25 10:09:49.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2008-04-01 20:38:37.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8142,7 +9837,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -112,6 +112,7 @@
+@@ -47,10 +47,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -112,6 +114,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8150,7 +9858,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,14 +155,12 @@
+@@ -132,6 +135,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -154,14 +159,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8166,7 +9883,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -173,7 +172,6 @@
+@@ -173,7 +176,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8174,7 +9891,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -202,6 +200,7 @@
+@@ -202,6 +204,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8182,7 +9899,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -212,6 +211,7 @@
+@@ -212,6 +215,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8190,17 +9907,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -221,6 +221,7 @@
+@@ -221,6 +225,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -329,7 +336,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2008-03-25 10:09:49.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2008-04-01 20:38:37.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8212,7 +9941,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -110,6 +110,7 @@
+@@ -46,10 +46,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -110,6 +112,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8220,7 +9962,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -152,14 +153,12 @@
+@@ -130,6 +133,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -152,14 +157,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8236,7 +9987,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +170,6 @@
+@@ -171,7 +174,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8244,7 +9995,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -200,6 +198,7 @@
+@@ -200,6 +202,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8252,7 +10003,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -210,6 +209,7 @@
+@@ -210,6 +213,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8260,17 +10011,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -219,6 +219,7 @@
+@@ -219,6 +223,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -327,7 +334,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2008-03-25 10:09:49.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2008-04-01 20:38:37.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8282,7 +10045,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -112,6 +112,7 @@
+@@ -47,10 +47,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -112,6 +114,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8290,7 +10066,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,14 +155,12 @@
+@@ -132,6 +135,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -154,14 +159,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8306,7 +10091,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -173,7 +172,6 @@
+@@ -173,7 +176,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8314,7 +10099,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -202,6 +200,7 @@
+@@ -202,6 +204,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8322,7 +10107,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -212,6 +211,7 @@
+@@ -212,6 +215,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8330,17 +10115,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -221,6 +221,7 @@
+@@ -221,6 +225,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -329,7 +336,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2008-03-25 10:09:49.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2008-04-01 20:38:37.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8352,7 +10149,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -114,6 +114,7 @@
+@@ -48,10 +48,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -114,6 +116,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8360,7 +10170,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,14 +157,12 @@
+@@ -134,6 +137,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -156,14 +161,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8376,7 +10195,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -175,7 +174,6 @@
+@@ -175,7 +178,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8384,7 +10203,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -204,6 +202,7 @@
+@@ -204,6 +206,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8392,7 +10211,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -214,6 +213,7 @@
+@@ -214,6 +217,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8400,17 +10219,40 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -223,6 +223,7 @@
+@@ -223,6 +227,11 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++ at EXTERNAL_NOTIFY_SHARP_FALSE@NOTIFY_SHARP_LIBS =
++ at EXTERNAL_NOTIFY_SHARP_TRUE@NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -331,7 +340,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
+@@ -622,7 +632,7 @@
+
+
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(MENU_RESOURCE)
+- $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
++ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(NOTIFY_SHARP_LIBS) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
+
+ $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
+ if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2008-03-25 10:09:49.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2008-04-01 20:38:38.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8422,7 +10264,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -110,6 +110,7 @@
+@@ -46,10 +46,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -110,6 +112,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8430,7 +10285,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -152,14 +153,12 @@
+@@ -130,6 +133,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -152,14 +157,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8446,7 +10310,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +170,6 @@
+@@ -171,7 +174,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8454,7 +10318,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -200,6 +198,7 @@
+@@ -200,6 +202,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8462,7 +10326,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -210,6 +209,7 @@
+@@ -210,6 +213,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8470,17 +10334,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -219,6 +219,7 @@
+@@ -219,6 +223,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -327,7 +334,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2008-03-25 10:09:50.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2008-04-01 20:38:38.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8492,7 +10368,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -110,6 +110,7 @@
+@@ -46,10 +46,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -110,6 +112,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8500,7 +10389,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -152,14 +153,12 @@
+@@ -130,6 +133,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -152,14 +157,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8516,7 +10414,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +170,6 @@
+@@ -171,7 +174,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8524,7 +10422,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -200,6 +198,7 @@
+@@ -200,6 +202,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8532,7 +10430,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -210,6 +209,7 @@
+@@ -210,6 +213,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8540,17 +10438,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -219,6 +219,7 @@
+@@ -219,6 +223,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -327,7 +334,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2008-03-25 10:09:50.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2008-04-01 20:38:38.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8562,7 +10472,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -110,6 +110,7 @@
+@@ -46,10 +46,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -110,6 +112,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8570,7 +10493,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -152,14 +153,12 @@
+@@ -130,6 +133,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -152,14 +157,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8586,7 +10518,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +170,6 @@
+@@ -171,7 +174,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8594,7 +10526,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -200,6 +198,7 @@
+@@ -200,6 +202,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8602,7 +10534,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -210,6 +209,7 @@
+@@ -210,6 +213,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8610,17 +10542,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -219,6 +219,7 @@
+@@ -219,6 +223,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -327,7 +334,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2008-03-25 10:09:50.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2008-04-01 20:38:38.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8632,7 +10576,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -43,10 +43,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -96,6 +98,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8640,7 +10597,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -138,14 +139,12 @@
+@@ -116,6 +119,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -138,14 +143,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8656,7 +10622,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -157,7 +156,6 @@
+@@ -157,7 +160,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8664,7 +10630,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -186,6 +184,7 @@
+@@ -186,6 +188,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8672,7 +10638,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -196,6 +195,7 @@
+@@ -196,6 +199,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8680,17 +10646,29 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -205,6 +205,7 @@
+@@ -205,6 +209,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -313,7 +320,8 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++ at EXTERNAL_GNOME_KEYRING_SHARP_TRUE@LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
+ @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.dll \
+ @EXTERNAL_NDESK_DBUS_FALSE@ -r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Makefile.in
--- banshee-0.13.2+dfsg.old/src/Plugins/Makefile.in 2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Makefile.in 2008-03-25 10:09:50.000000000 +0100
++++ banshee-0.13.2+dfsg/src/Plugins/Makefile.in 2008-04-01 20:38:38.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8702,7 +10680,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -108,6 +108,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -108,6 +110,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8710,7 +10701,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,14 +151,12 @@
+@@ -128,6 +131,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -150,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8726,7 +10726,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -169,7 +168,6 @@
+@@ -169,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8734,7 +10734,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -198,6 +196,7 @@
+@@ -198,6 +200,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8742,7 +10742,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -208,6 +207,7 @@
+@@ -208,6 +211,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8750,15 +10750,17 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -217,6 +217,7 @@
+@@ -217,6 +221,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -434,8 +435,8 @@
+@@ -434,8 +441,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8769,7 +10771,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -460,8 +461,8 @@
+@@ -460,8 +467,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8780,7 +10782,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -471,13 +472,12 @@
+@@ -471,13 +478,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -8798,7 +10800,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/tests/Makefile.in banshee-0.13.2+dfsg/tests/Makefile.in
--- banshee-0.13.2+dfsg.old/tests/Makefile.in 2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/tests/Makefile.in 2008-03-25 10:09:50.000000000 +0100
++++ banshee-0.13.2+dfsg/tests/Makefile.in 2008-04-01 20:38:38.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8810,7 +10812,20 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -42,10 +42,12 @@
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-njb.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
++ $(top_srcdir)/build/m4/banshee/gnome-keyring-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+@@ -96,6 +98,7 @@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOCDIR = @DOCDIR@
@@ -8818,7 +10833,16 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -138,14 +139,12 @@
+@@ -116,6 +119,8 @@
+ GMSGFMT = @GMSGFMT@
+ GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@
+ GNOMEVFS_LIBS = @GNOMEVFS_LIBS@
++GNOME_KEYRING_SHARP_CFLAGS = @GNOME_KEYRING_SHARP_CFLAGS@
++GNOME_KEYRING_SHARP_LIBS = @GNOME_KEYRING_SHARP_LIBS@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+@@ -138,14 +143,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8834,7 +10858,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -157,7 +156,6 @@
+@@ -157,7 +160,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8842,7 +10866,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
-@@ -186,6 +184,7 @@
+@@ -186,6 +188,7 @@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
MKDIR_P = @MKDIR_P@
@@ -8850,7 +10874,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONOZEROCONF_CFLAGS = @MONOZEROCONF_CFLAGS@
-@@ -196,6 +195,7 @@
+@@ -196,6 +199,7 @@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -8858,11 +10882,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -205,6 +205,7 @@
+@@ -205,6 +209,9 @@
NJBSHARP_CFLAGS = @NJBSHARP_CFLAGS@
NJBSHARP_INSTALL_FILES = @NJBSHARP_INSTALL_FILES@
NJBSHARP_LIBS = @NJBSHARP_LIBS@
+NMEDIT = @NMEDIT@
++NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
++NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Modified: packages/banshee/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/rules?rev=3864&op=diff
==============================================================================
--- packages/banshee/trunk/debian/rules (original)
+++ packages/banshee/trunk/debian/rules Tue Apr 1 18:41:50 2008
@@ -14,7 +14,8 @@
DEB_CONFIGURE_EXTRA_FLAGS+=--disable-static --enable-mtp --enable-karma \
--enable-ipod --enable-njb --disable-gstreamer-plugins-check \
--enable-external-boo --enable-external-ndesk-dbus \
- --enable-external-taglib-sharp
+ --enable-external-taglib-sharp --enable-external-notify-sharp \
+ --enable-external-gnome-keyring-sharp
install/banshee::
rm -f debian/tmp/usr/bin/banshee-import \
More information about the Pkg-cli-apps-commits
mailing list