Merge lp://staging/~ubuntu-branches/ubuntu/natty/banshee/natty-201103250238 into lp://staging/ubuntu/natty/banshee
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/banshee/natty-201103250238 |
| Merge into: | lp://staging/ubuntu/natty/banshee |
| Diff against target: |
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) Conflict: can't delete .pc because it is not empty. Not deleting. Conflict because .pc is not versioned, but has versioned children. Versioned directory. Conflict: can't delete .pc/06_add-meego-desktop-file.patch because it is not empty. Not deleting. Conflict because .pc/06_add-meego-desktop-file.patch is not versioned, but has versioned children. Versioned directory. Conflict: can't delete .pc/06_add-meego-desktop-file.patch/src because it is not empty. Not deleting. Conflict because .pc/06_add-meego-desktop-file.patch/src is not versioned, but has versioned children. Versioned directory. Conflict: can't delete .pc/06_add-meego-desktop-file.patch/src/Extensions because it is not empty. Not deleting. Conflict because .pc/06_add-meego-desktop-file.patch/src/Extensions is not versioned, but has versioned children. Versioned directory. Conflict: can't delete .pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo because it is not empty. Not deleting. Conflict because .pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo is not versioned, but has versioned children. Versioned directory. Contents conflict in .pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/Makefile.in Conflict: can't delete .pc/99_ltmain_as-needed.patch because it is not empty. Not deleting. Conflict because .pc/99_ltmain_as-needed.patch is not versioned, but has versioned children. Versioned directory. Contents conflict in .pc/99_ltmain_as-needed.patch/ltmain.sh Contents conflict in .pc/applied-patches Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/banshee/natty-201103250238 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/banshee now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/banshee/natty-201103250238. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 112. By Ken VanDine
-
releasing version 1.9.4-1ubuntu2
- 111. By Ken VanDine
-
unapplied quilt patches and removed the .pc dir from the bzr tree
- 110. By Ken VanDine
-
* 0001-Add-
support- for-u1ms- links.patch:
- Handle u1ms:// links in the U1 Music Store (LP: #723960)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
