diff -pruN 1.9.2-1/debian/banshee-extension-soundmenu.install 1.9.2-1ubuntu1/debian/banshee-extension-soundmenu.install
--- 1.9.2-1/debian/banshee-extension-soundmenu.install	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/debian/banshee-extension-soundmenu.install	2011-01-24 14:17:35.000000000 +0000
@@ -0,0 +1 @@
+/usr/lib/banshee-1/Extensions/Banshee.SoundMenu.*
diff -pruN 1.9.2-1/debian/banshee-extension-ubuntuonemusicstore.install 1.9.2-1ubuntu1/debian/banshee-extension-ubuntuonemusicstore.install
--- 1.9.2-1/debian/banshee-extension-ubuntuonemusicstore.install	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/debian/banshee-extension-ubuntuonemusicstore.install	2011-01-24 14:17:35.000000000 +0000
@@ -0,0 +1 @@
+/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
diff -pruN 1.9.2-1/debian/banshee-meego.install 1.9.2-1ubuntu1/debian/banshee-meego.install
--- 1.9.2-1/debian/banshee-meego.install	2011-01-14 17:50:55.000000000 +0000
+++ 1.9.2-1ubuntu1/debian/banshee-meego.install	2011-01-24 14:17:35.000000000 +0000
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/banshee-1/MeeGo.exe
 debian/tmp/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll*
-debian/tmp/usr/share/mutter-meego
+debian/tmp/usr/share/mutter-meego/panels/banshee-1.desktop usr/share/une/applications
 debian/tmp/usr/share/dbus-1/services/com.meego*
diff -pruN 1.9.2-1/debian/changelog 1.9.2-1ubuntu1/debian/changelog
--- 1.9.2-1/debian/changelog	2011-01-14 19:07:50.000000000 +0000
+++ 1.9.2-1ubuntu1/debian/changelog	2011-01-24 14:17:35.000000000 +0000
@@ -1,3 +1,14 @@
+banshee (1.9.2-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian Experimental, remaining changes:
+    + Enable SoundMenu and Disable NotificationArea by default
+    + Disable boo and karma extensions
+    + Enable and recommnd u1ms and soundmenu extensions
+    + Move desktop file for Meego UI to /usr/share/une/applications
+  * [0c8acd9] Enable u1ms by default
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Mon, 24 Jan 2011 22:17:31 +0800
+
 banshee (1.9.2-1) experimental; urgency=low
 
   * [df82d8d] Add libgnome-desktop-dev build-dep
@@ -39,6 +50,29 @@ banshee (1.9.2-1) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Sat, 15 Jan 2011 02:41:50 +0800
 
+banshee (1.9.1-1ubuntu3) natty; urgency=low
+
+  * debian/control:
+    - Change build-depends from libwebkit-dev to libwebkitgtk-dev
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Mon, 10 Jan 2011 15:37:55 -0600
+
+banshee (1.9.1-1ubuntu2) natty; urgency=low
+
+  * [f1bb0cf] Enable SoundMenu by default
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Mon, 27 Dec 2010 10:59:06 +0800
+
+banshee (1.9.1-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    + Disable notification area by default
+    + Disable boo and karma extensions
+    + Enable and recommend u1ms and soundmenu extensions
+    + Move desktop file for Meego UI to /usr/share/une/applications
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Tue, 21 Dec 2010 13:22:57 +0800
+
 banshee (1.9.1-1) experimental; urgency=low
 
   [ Chow Loong Jin ]
@@ -95,6 +129,59 @@ banshee (1.9.1-1) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Sat, 25 Dec 2010 13:07:06 +0800
 
+banshee (1.9.0+git20101121.r1.b13266e-0ubuntu6) natty; urgency=low
+
+  * debian/rules, debian/control:
+    - Drop support for Rio Karma devices, as libkarma is not yet
+      ready to enter main.
+
+ -- Michael Terry <mterry@ubuntu.com>  Fri, 17 Dec 2010 09:33:48 -0500
+
+banshee (1.9.0+git20101121.r1.b13266e-0ubuntu5) natty; urgency=low
+
+  * [e0db4ba] Disable the notification area and enable MPRIS by default
+
+ -- Iain Lane <laney@ubuntu.com>  Fri, 26 Nov 2010 18:35:59 +0000
+
+banshee (1.9.0+git20101121.r1.b13266e-0ubuntu4) natty; urgency=low
+
+  * debian/rules: Fix gettext domain (LP: #677173)
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Thu, 25 Nov 2010 11:30:48 +0800
+
+banshee (1.9.0+git20101121.r1.b13266e-0ubuntu3) natty; urgency=low
+
+  * debian/control:
+    + Recommend banshee-extension-u1ms
+    + Demote gst-plugins-bad from recommends to suggests
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Tue, 23 Nov 2010 04:27:24 +0800
+
+banshee (1.9.0+git20101121.r1.b13266e-0ubuntu2) natty; urgency=low
+
+  * debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch:
+    + Revert a recent performance related patch that caused artwork to not
+      display at all
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Mon, 22 Nov 2010 05:11:45 +0800
+
+banshee (1.9.0+git20101121.r1.b13266e-0ubuntu1) natty; urgency=low
+
+  * New upstream snapshot: Drop binary dep on libmono-system-data*-cil
+  * debian/patches/06_add-meego-desktop-file.patch: Refresh
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Sun, 21 Nov 2010 12:21:02 +0800
+
+banshee (1.9.0-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    + debian/banshee-meego.install: Install netbook banshee.desktop to UNE
+      location
+    + Disable boo support
+    + Recommend soundmenu extension
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Thu, 18 Nov 2010 02:31:18 +0800
+
 banshee (1.9.0-1) experimental; urgency=low
 
   * New upstream release
@@ -146,6 +233,16 @@ banshee (1.9.0-1) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Thu, 11 Nov 2010 22:45:14 +0800
 
+banshee (1.8.0-2ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    + debian/banshee-meego.install: Install netbook banshee.desktop to UNE
+      location
+    + Disable boo support
+    + Recommend soundmenu extension
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Fri, 22 Oct 2010 01:53:21 +0800
+
 banshee (1.8.0-2) experimental; urgency=low
 
   * Fix duplicates on import (BGO #623441)
@@ -167,7 +264,7 @@ banshee (1.8.0-1) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Fri, 01 Oct 2010 02:41:41 +0800
 
-banshee (1.7.6-1) UNRELEASED; urgency=low
+banshee (1.7.6-0ubuntu1) maverick; urgency=low
 
   * New upstream release
     + Enhancements:
@@ -243,6 +340,101 @@ banshee (1.7.5-1) UNRELEASED; urgency=lo
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Sat, 18 Sep 2010 01:47:47 +0800
 
+banshee (1.7.5-0ubuntu2) maverick; urgency=low
+
+  * Fix casing of variable in patch, resolving missing dllmap issue
+  * Ensure that gpod-sharp's DLLmap is copied
+
+ -- Iain Lane <laney@ubuntu.com>  Wed, 08 Sep 2010 01:21:22 +0800
+
+banshee (1.7.5-0ubuntu1) maverick; urgency=low
+
+  [ Chow Loong Jin ]
+  * New upstream release
+    + New Features:
+      - GIO/udev-based hardware backend
+      - Apple Devices backend with support for iPod/iOS devices (LP: #554141)
+      - MPRIS v2 support (Ubuntu Sound Menu, etc)
+      - Audiobooks and Miro Guide extensions enabled by default
+    + Enhancements/API Additions:
+      - Play menu item in track context menu
+      - Amazon affiliate codes for all supported countries
+      - "Amazon MP3s" Music smart playlist
+      - Miro Guide teaser in Podcasts
+      - Zoom support in Amazon MP3 Store and Miro Guide
+      - Now Playing simplify mode that declutters the UI
+      - Play Queue shuffle action
+      - Podcast errors shown to user
+      - Better MTP device detection
+      - Default smart playlists hidden when empty, for new users
+      - New and improved user documentation
+    + Notable Bugs Fixed
+      - bgo#626786: Prevent crash in search-for-artist when blank
+      - bgo#628388: Fix overflow bug with MTP playlists
+      - bgo#625683: Fixup checkboxes now clickable
+      - bgo#626928: Fetch podcast artwork asap
+      - bgo#626791: Catch crashes caused by missing extensions
+      - bgo#528383: Re-enable writing video metadata to file
+      - bgo#626803, LP: #617017: Fix Ogg rating parsing in non-English locales
+  * debian/(control, rules):
+    + Update configure flags:
+      - --disable-hal
+      - --disable-ipod
+      - --enable-appledevice
+      - --enable-gio
+      - --enable-gio-hardware
+    + Add new build depends:
+      - libgudev1.0-cil-dev
+      - libgkeyfile-cil-dev
+      - libgio2.0-cil-dev
+      - libgtk-sharp-beans2.0-cil-dev
+      - libgpod-cil-dev
+    + Update version of libmtp-dev build-dep to 0.3.0
+    + Drop hal, podsleuth and ipod-sharp dependencies
+  * debian/patches:
+    + 0001-Don-t-copy-duplicate-libraries.patch: Don't copy duplicate
+      libraries
+    + 0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch:
+      Copy debugging libraries if they exist
+
+  [ Iain Lane ]
+  * Upload to Ubuntu from Debian git, as the dependencies are not all
+    ready in Debian.
+  * [fe5e8fb] Refresh and update patches to apply cleanly
+  * [a688fa9] Disable Boo support and remove build dependency
+  * [df01b1e] Generate translation template and set gettext domain in
+    the Ubuntu build
+  * [9c3402b] Make sure mimeinfo.cache is removed
+  * [d54fedc] Update changelog version for Ubuntu
+
+ -- Iain Lane <laney@ubuntu.com>  Mon, 06 Sep 2010 20:05:45 +0100
+
+banshee (1.7.4-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    + debian/patches:
+      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
+      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
+        interface on --client=Meego and start traditional interface
+        otherwise
+      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
+        shutdown request only
+      - 04_enable-switching-between-the-2-interfaces.patch: Enable
+        switching between netbook and traditional interfaces.
+      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
+        when starting for the first time with an empty library.
+      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
+      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
+      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
+        interface as this is irrelevant on non-Meego interfaces
+    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
+  * Ubuntu-specific changes from previous merge:
+    + Refresh patches:
+      - 04_enable-switching-between-the-2-interfaces.patch
+      - 06_add-meego-desktop-file.patch
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Fri, 13 Aug 2010 00:37:19 +0800
+
 banshee (1.7.4-1) experimental; urgency=low
 
   * New upstream release
@@ -275,6 +467,37 @@ banshee (1.7.4-1) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Fri, 13 Aug 2010 00:30:24 +0800
 
+banshee (1.7.3-2ubuntu2) maverick; urgency=low
+
+  * banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
+    system one.  Change debian/rules to delete everything below
+    debian/tmp/usr/share/mime/ except "packages" before dh_install.
+  * Minor syntax tweaks to rules.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Thu, 05 Aug 2010 00:49:55 -0400
+
+banshee (1.7.3-2ubuntu1) maverick; urgency=low
+
+  * Merge from Debian Experimental, remaining changes:
+    + debian/patches:
+      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
+      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
+        interface on --client=Meego and start traditional interface
+        otherwise
+      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
+        shutdown request only
+      - 04_enable-switching-between-the-2-interfaces.patch: Enable
+        switching between netbook and traditional interfaces.
+      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
+        when starting for the first time with an empty library.
+      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
+      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
+      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
+        interface as this is irrelevant on non-Meego interfaces
+    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Mon, 26 Jul 2010 00:32:41 +0800
+
 banshee (1.7.3-2) experimental; urgency=low
 
   * debian/control: Add libsoup{,-gnome}2.4-dev build-deps which were
@@ -282,6 +505,28 @@ banshee (1.7.3-2) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Sat, 24 Jul 2010 04:44:30 +0800
 
+banshee (1.7.3-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian Experimental, remaining changes:
+    + debian/patches:
+      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
+      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
+        interface on --client=Meego and start traditional interface
+        otherwise
+      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
+        shutdown request only
+      - 04_enable-switching-between-the-2-interfaces.patch: Enable
+        switching between netbook and traditional interfaces.
+      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
+        when starting for the first time with an empty library.
+      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
+      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
+      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
+        interface as this is irrelevant on non-Meego interfaces
+    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Fri, 23 Jul 2010 19:16:11 +0800
+
 banshee (1.7.3-1) experimental; urgency=low
 
   * New upstream release:
@@ -333,6 +578,44 @@ banshee (1.7.3-1) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Thu, 22 Jul 2010 19:07:31 +0800
 
+banshee (1.7.2-1ubuntu3) maverick; urgency=low
+
+  * debian/patches/06_add-meego-desktop-file.patch,
+    debian/banshee-meego.install:
+    - desktop file is now called banshee-1 and installed
+    in usr/share/une/applications/ to show the une desktop file in UNE
+    session only
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 20 Jul 2010 12:23:28 +0200
+
+banshee (1.7.2-1ubuntu2) maverick; urgency=low
+
+  * add debian/patches/08_remove_unrelevant_media.patch:
+    Don't show "media" in netbook interface as this is unrelevant on non
+    meego interface (LP: #602759)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 12 Jul 2010 18:39:36 +0200
+
+banshee (1.7.2-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian Experimental, remaining changes:
+    + debian/patches:
+      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
+      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
+        interface on --client=Meego and start traditional interface
+        otherwise
+      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
+        shutdown request only
+      - 04_enable-switching-between-the-2-interfaces.patch: Enable
+        switching between netbook and traditional interfaces.
+      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
+        when starting for the first time with an empty library.
+      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
+      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
+    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Wed, 07 Jul 2010 15:54:29 +0800
+
 banshee (1.7.2-1) experimental; urgency=low
 
   [ Iain Lane ]
@@ -383,6 +666,30 @@ banshee (1.7.2-1) experimental; urgency=
 
  -- Chow Loong Jin <hyperair@ubuntu.com>  Fri, 02 Jul 2010 02:21:03 +0800
 
+banshee (1.7.1-1ubuntu1) maverick; urgency=low
+
+  * Enhance netbook interface:
+    - debian/patches/01_Debranch-netbook-interface.patch
+      debrand the netbook interface to "Netbook"
+    - debian/patches/02_only-show-netbook-panel-on-request.patch:
+      only show netbook inteface on --client=Meego and start traditional
+      interface otherwise
+    - debian/patches/03_quit-only-on-explicit-shutdown-request.patch:
+      quit on explicit shutdown request only
+    - debian/patches/04_enable-switching-between-the-2-interfaces.patch:
+      switch back and forth beetween the 2 interfaces, even if traditional
+      interface started. Also, have only one interface shown at a time
+    - debian/patches/05_show-a-empty-library-message-in-banshee.patch:
+      show an empty hint when starting the first time and having no library
+      imported (Bertrand Lorentz and Alex Launi)
+    - debian/patches/06_add-meego-desktop-file.patch:
+      add desktop file to start the netbook interface
+  * debian/patches/07_enable-library-watch-by-default.patch:
+    enable library watcher
+  * debian/banshee-meego.install: install the new deskop file
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 05 Jul 2010 15:19:53 +0200
+
 banshee (1.7.1-1) experimental; urgency=low
 
   [ Chow Loong Jin ]
diff -pruN 1.9.2-1/debian/control 1.9.2-1ubuntu1/debian/control
--- 1.9.2-1/debian/control	2011-01-14 19:00:47.000000000 +0000
+++ 1.9.2-1ubuntu1/debian/control	2011-01-24 14:17:35.000000000 +0000
@@ -1,7 +1,8 @@
 Source: banshee
 Section: sound
 Priority: optional
-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team@lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo@debian.org>, Chow Loong Jin <hyperair@ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
                autotools-dev,
@@ -9,7 +10,6 @@ Build-Depends: debhelper (>= 7.0.50),
                intltool (>= 0.35),
                lsb-release,
                mono-devel (>= 2.4.3),
-               libboo-cil-dev (>= 0.8.1),
                libndesk-dbus1.0-cil-dev (>= 0.5),
                libndesk-dbus-glib1.0-cil-dev (>= 0.3),
                libmono-addins-cil-dev (>= 0.3.1),
@@ -24,8 +24,9 @@ Build-Depends: debhelper (>= 7.0.50),
                libgio2.0-cil-dev (>= 2.22),
                libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                libgpod-cil-dev (>= 0.7.95),
-               libkarma-cil-dev (>= 0.0.5),
-               libwebkit-dev (>= 1.2.2),
+               libindicate0.1-cil-dev (>= 0.4.1),
+               libubuntuone1.0-cil-dev,
+               libwebkitgtk-dev (>= 1.2.2),
                libsoup2.4-dev (>= 2.26),
                libsoup-gnome2.4-dev (>= 2.26),
                libgdata-cil-dev (>= 1.4),
@@ -59,6 +60,8 @@ Depends: ${shlibs:Depends},
          gnome-icon-theme (>= 2.16)
 Recommends: brasero,
             avahi-daemon,
+            banshee-extension-soundmenu (=${binary:Version}),
+            banshee-extension-ubuntuonemusicstore (=${binary:Version}),
             media-player-info
 Suggests: gstreamer0.10-plugins-bad,
           gstreamer0.10-plugins-ugly,
@@ -72,6 +75,38 @@ Description: Media Management and Playba
  and other media devices, play and manage video files and burn selections
  to a CD.
 
+Package: banshee-extension-soundmenu
+Architecture: any
+Depends: banshee (>= ${source:Upstream-Version}),
+         ${cli:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Enhances: banshee
+Description: Media Management and Playback application - sound menu extension
+ Banshee is a media management and playback application for the GNOME
+ desktop, allowing users to import audio from CDs, search their library,
+ create playlists of selections of their library, sync music to/from iPods
+ and other media devices, play and manage video files and burn selections
+ to a CD.
+ .
+ This package contains Banshee's support for the Sound Menu
+
+Package: banshee-extension-ubuntuonemusicstore
+Architecture: any
+Depends: banshee (>= ${source:Upstream-Version}),
+         ${cli:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Enhances: banshee
+Description: Media Management and Playback application - U1MS extension
+ Banshee is a media management and playback application for the GNOME
+ desktop, allowing users to import audio from CDs, search their library,
+ create playlists of selections of their library, sync music to/from iPods
+ and other media devices, play and manage video files and burn selections
+ to a CD.
+ .
+ This package contains Banshee's support for the Ubuntu One Music Store
+
 Package: banshee-meego
 Architecture: any
 Depends: banshee (= ${binary:Version}),
diff -pruN 1.9.2-1/debian/gbp.conf 1.9.2-1ubuntu1/debian/gbp.conf
--- 1.9.2-1/debian/gbp.conf	2011-01-14 17:50:55.000000000 +0000
+++ 1.9.2-1ubuntu1/debian/gbp.conf	2011-01-24 14:17:35.000000000 +0000
@@ -1,3 +1,3 @@
 [DEFAULT]
-debian-branch = experimental
+debian-branch = ubuntu/natty
 upstream-branch = upstream-experimental
diff -pruN 1.9.2-1/debian/patches/07_disable-notification-area-by-default.patch 1.9.2-1ubuntu1/debian/patches/07_disable-notification-area-by-default.patch
--- 1.9.2-1/debian/patches/07_disable-notification-area-by-default.patch	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/debian/patches/07_disable-notification-area-by-default.patch	2011-01-24 14:17:35.000000000 +0000
@@ -0,0 +1,13 @@
+Index: banshee.git/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
+===================================================================
+--- banshee.git.orig/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2010-11-25 10:59:38.898399669 +0000
++++ banshee.git/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2010-11-25 10:59:13.296414590 +0000
+@@ -9,7 +9,7 @@
+     description="Display an icon in the notification area for controlling Banshee."
+     author="Aaron Bockover, Sebastian Dröge, Alexander Hixon, Gabriel Burt, Ruben Vermeersch"
+     url="http://banshee.fm/"
+-    defaultEnabled="true">
++    defaultEnabled="false">
+ 
+   <Dependencies>
+     <Addin id="Banshee.Services" version="1.0"/>
diff -pruN 1.9.2-1/debian/patches/07_enable-soundmenu-by-default.patch 1.9.2-1ubuntu1/debian/patches/07_enable-soundmenu-by-default.patch
--- 1.9.2-1/debian/patches/07_enable-soundmenu-by-default.patch	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/debian/patches/07_enable-soundmenu-by-default.patch	2011-01-24 14:17:35.000000000 +0000
@@ -0,0 +1,13 @@
+Index: banshee/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2010-12-27 10:53:58.801759598 +0800
++++ banshee/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2010-12-27 10:54:07.155167954 +0800
+@@ -9,7 +9,7 @@
+     description="Control Banshee from the Sound Menu."
+     author="Bertrand Lorentz"
+     url="http://banshee-project.org/"
+-    defaultEnabled="false">
++    defaultEnabled="true">
+ 
+   <Dependencies>
+     <Addin id="Banshee.Services" version="1.0"/>
diff -pruN 1.9.2-1/debian/patches/07_enable-u1ms-by-default.patch 1.9.2-1ubuntu1/debian/patches/07_enable-u1ms-by-default.patch
--- 1.9.2-1/debian/patches/07_enable-u1ms-by-default.patch	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/debian/patches/07_enable-u1ms-by-default.patch	2011-01-24 14:17:35.000000000 +0000
@@ -0,0 +1,13 @@
+Index: banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2011-01-13 18:05:17.677167517 +0800
++++ banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2011-01-13 18:05:25.210458516 +0800
+@@ -9,7 +9,7 @@
+     description="This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+     author="Jo Shields"
+     url="http://one.ubuntu.com/"
+-    defaultEnabled="false">
++    defaultEnabled="true">
+ 
+   <Dependencies>
+     <Addin id="Banshee.Services" version="1.0"/>
diff -pruN 1.9.2-1/debian/patches/series 1.9.2-1ubuntu1/debian/patches/series
--- 1.9.2-1/debian/patches/series	2011-01-14 17:50:55.000000000 +0000
+++ 1.9.2-1ubuntu1/debian/patches/series	2011-01-24 14:17:35.000000000 +0000
@@ -6,6 +6,9 @@
 06_add-meego-desktop-file.patch
 07_enable-library-watch-by-default.patch
 07_enable-mpris-by-default.patch
+07_disable-notification-area-by-default.patch
+07_enable-soundmenu-by-default.patch
+07_enable-u1ms-by-default.patch
 08_remove_unrelevant_media.patch
 0001-Don-t-copy-duplicate-libraries.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
diff -pruN 1.9.2-1/debian/rules 1.9.2-1ubuntu1/debian/rules
--- 1.9.2-1/debian/rules	2011-01-14 17:50:55.000000000 +0000
+++ 1.9.2-1ubuntu1/debian/rules	2011-01-24 14:17:35.000000000 +0000
@@ -12,7 +12,7 @@ override_dh_auto_configure:
 	                     --disable-builtin-equalizer \
 	                     --disable-gst-sharp \
 	                     --enable-user-help \
-	                     --enable-boo \
+	                     --disable-boo \
 	                     --enable-docs \
 	                     --enable-youtube \
 	                     --disable-hal \
@@ -24,13 +24,13 @@ override_dh_auto_configure:
 	                     --enable-mtp \
 	                     --enable-appledevice \
 	                     --disable-ipod \
-	                     --enable-karma \
+	                     --disable-karma \
 	                     --enable-daap \
 	                     --disable-remote-audio \
 	                     --disable-torrent \
 	                     --enable-meego \
-	                     --disable-soundmenu \
-	                     --disable-ubuntuone \
+	                     --enable-soundmenu \
+	                     --enable-ubuntuone \
 	                     --enable-gapless-playback \
 	                     --enable-podcast \
 	                     --enable-release \
@@ -57,6 +57,9 @@ override_dh_install:
 	      debian/banshee/usr/lib/banshee-1/MeeGo.exe \
 	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
 	      debian/banshee/usr/share/dbus-1/services/com.meego*
+	# Remove U1MS and Sound Menu stuff from banshee
+	rm -r debian/banshee/usr/lib/banshee-1/Extensions/Banshee.SoundMenu.* \
+              debian/banshee/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
 ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 	cd po; intltool-update --pot
 
diff -pruN 1.9.2-1/.pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml 1.9.2-1ubuntu1/.pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
--- 1.9.2-1/.pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/.pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2010-11-14 08:41:58.000000000 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Addin 
+    id="Banshee.NotificationArea"
+    version="1.0"
+    compatVersion="1.0"
+    copyright="© 2005-2008 Novell Inc. Licensed under the MIT X11 license."
+    name="Notification Area Icon"
+    category="Utilities"
+    description="Display an icon in the notification area for controlling Banshee."
+    author="Aaron Bockover, Sebastian Dröge, Alexander Hixon, Gabriel Burt, Ruben Vermeersch"
+    url="http://banshee.fm/"
+    defaultEnabled="true">
+
+  <Dependencies>
+    <Addin id="Banshee.Services" version="1.0"/>
+    <Addin id="Banshee.ThickClient" version="1.0"/>
+  </Dependencies>
+
+  <Extension path="/Banshee/ServiceManager/Service">
+    <Service class="Banshee.NotificationArea.NotificationAreaService"/>
+  </Extension>
+  
+</Addin>
diff -pruN 1.9.2-1/.pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml 1.9.2-1ubuntu1/.pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
--- 1.9.2-1/.pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/.pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2010-12-16 00:19:58.000000000 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Addin
+    id="Banshee.SoundMenu"
+    version="1.0"
+    compatVersion="1.0"
+    copyright="Copyright 2010 Bertrand Lorentz. Licensed under the MIT X11 license."
+    name="Sound Menu integration for Banshee"
+    category="Utilities"
+    description="Control Banshee from the Sound Menu."
+    author="Bertrand Lorentz"
+    url="http://banshee-project.org/"
+    defaultEnabled="false">
+
+  <Dependencies>
+    <Addin id="Banshee.Services" version="1.0"/>
+    <Addin id="Banshee.ThickClient" version="1.0"/>
+    <Addin id="Banshee.Mpris" version="1.0"/>
+  </Dependencies>
+
+  <Extension path="/Banshee/ServiceManager/Service">
+    <Service class="Banshee.SoundMenu.SoundMenuService"/>
+  </Extension>
+
+</Addin>
diff -pruN 1.9.2-1/.pc/07_enable-u1ms-by-default.patch/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml 1.9.2-1ubuntu1/.pc/07_enable-u1ms-by-default.patch/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
--- 1.9.2-1/.pc/07_enable-u1ms-by-default.patch/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	1970-01-01 01:00:00.000000000 +0100
+++ 1.9.2-1ubuntu1/.pc/07_enable-u1ms-by-default.patch/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2010-12-16 00:19:58.000000000 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Addin 
+    id="Banshee.UbuntuOneMusicStore"
+    version="1.0"
+    compatVersion="1.0"
+    copyright="Copyright 2010 Jo Shields. Licensed under the MIT X11 license."
+    name="Ubuntu One Music Store"
+    category="Online Sources"
+    description="This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+    author="Jo Shields"
+    url="http://one.ubuntu.com/"
+    defaultEnabled="false">
+
+  <Dependencies>
+    <Addin id="Banshee.Services" version="1.0"/>
+    <Addin id="Banshee.ThickClient" version="1.0"/>
+  </Dependencies>
+
+  <Extension path="/Banshee/SourceManager/Source">
+    <Source class="Banshee.UbuntuOneMusicStore.UbuntuOneMusicStoreSource"/>
+  </Extension>
+
+</Addin>
diff -pruN 1.9.2-1/.pc/applied-patches 1.9.2-1ubuntu1/.pc/applied-patches
--- 1.9.2-1/.pc/applied-patches	2011-01-24 18:41:13.000000000 +0000
+++ 1.9.2-1ubuntu1/.pc/applied-patches	2011-01-24 18:38:36.000000000 +0000
@@ -6,6 +6,9 @@
 06_add-meego-desktop-file.patch
 07_enable-library-watch-by-default.patch
 07_enable-mpris-by-default.patch
+07_disable-notification-area-by-default.patch
+07_enable-soundmenu-by-default.patch
+07_enable-u1ms-by-default.patch
 08_remove_unrelevant_media.patch
 0001-Don-t-copy-duplicate-libraries.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
diff -pruN 1.9.2-1/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml 1.9.2-1ubuntu1/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
--- 1.9.2-1/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2010-11-14 08:41:58.000000000 +0000
+++ 1.9.2-1ubuntu1/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2011-01-24 18:38:36.000000000 +0000
@@ -9,7 +9,7 @@
     description="Display an icon in the notification area for controlling Banshee."
     author="Aaron Bockover, Sebastian Dröge, Alexander Hixon, Gabriel Burt, Ruben Vermeersch"
     url="http://banshee.fm/"
-    defaultEnabled="true">
+    defaultEnabled="false">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>
diff -pruN 1.9.2-1/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml 1.9.2-1ubuntu1/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
--- 1.9.2-1/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2010-12-16 00:19:58.000000000 +0000
+++ 1.9.2-1ubuntu1/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2011-01-24 18:38:36.000000000 +0000
@@ -9,7 +9,7 @@
     description="Control Banshee from the Sound Menu."
     author="Bertrand Lorentz"
     url="http://banshee-project.org/"
-    defaultEnabled="false">
+    defaultEnabled="true">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>
diff -pruN 1.9.2-1/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml 1.9.2-1ubuntu1/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
--- 1.9.2-1/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2010-12-16 00:19:58.000000000 +0000
+++ 1.9.2-1ubuntu1/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2011-01-24 18:38:36.000000000 +0000
@@ -9,7 +9,7 @@
     description="This extension grants access to the Ubuntu One Music Store, powered by 7digital."
     author="Jo Shields"
     url="http://one.ubuntu.com/"
-    defaultEnabled="false">
+    defaultEnabled="true">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>