lp://staging/~ubuntu-branches/ubuntu/natty/banshee/natty-201103250238

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/ubuntu/natty/banshee

Ubuntu branches: Pending requested 2011-03-28

Diff: 3429 lines (+135/-2788) (has conflicts)

35 files modified

.pc/.version (+0/-1)
.pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs (+0/-465)
.pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs (+0/-113)
.pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs (+0/-145)
.pc/02_only-show-netbook-panel-on-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs (+0/-145)
.pc/03_quit-only-on-explicit-shutdown-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs (+0/-147)
.pc/04_enable-switching-between-the-2-interfaces.patch/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml (+0/-237)
.pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs (+0/-113)
.pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs (+0/-142)
.pc/05_show-a-empty-library-message-in-banshee.patch/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs (+0/-174)
.pc/05_show-a-empty-library-message-in-banshee.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs (+0/-412)
.pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/Makefile.am (+0/-61)
.pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml (+0/-23)
.pc/07_enable-library-watch-by-default.patch/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml (+0/-22)
.pc/07_enable-mpris-by-default.patch/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml (+0/-21)
.pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml (+0/-24)
.pc/08_remove_unrelevant_media.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs (+0/-422)
debian/changelog (+10/-0)
debian/patches/0001-Add-support-for-u1ms-links.patch (+83/-0)
debian/patches/series (+1/-0)
ltmain.sh (+0/-14)
src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs (+0/-9)
src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs (+15/-0)
src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml (+0/-1)
src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml (+1/-1)
src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs (+2/-12)
src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs (+6/-15)
src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs (+7/-40)
src/Extensions/Banshee.MeeGo/Makefile.am (+2/-6)
src/Extensions/Banshee.MeeGo/Makefile.in (+4/-8)
src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in (+0/-11)
src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml (+1/-1)
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml (+1/-1)
src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml (+1/-1)
src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

112. By Ken VanDine on 2011-03-03

releasing version 1.9.4-1ubuntu2

111. By Ken VanDine on 2011-03-03

unapplied quilt patches and removed the .pc dir from the bzr tree

110. By Ken VanDine on 2011-03-03

* 0001-Add-support-for-u1ms-links.patch:
  - Handle u1ms:// links in the U1 Music Store (LP: #723960)

109. By Chow Loong Jin on 2011-02-26

* 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

108. By Chow Loong Jin on 2011-02-20

* 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

107. By Chow Loong Jin on 2011-01-24

* 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

106. By Robert Ancell on 2011-01-10

* debian/control:
  - Change build-depends from libwebkit-dev to libwebkitgtk-dev

105. By Chow Loong Jin on 2010-12-27

[f1bb0cf] Enable SoundMenu by default

104. By Chow Loong Jin on 2010-12-21

* 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

103. By Michael Terry on 2010-12-17

* debian/rules, debian/control:
  - Drop support for Rio Karma devices, as libkarma is not yet
    ready to enter main.