[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. debian/1.7.5-0ubuntu1-4-g33bb13b

[Iain Lane]

The following commit has been merged in the ubuntu/maverick branch:
commit 33bb13b88d9b43e6772554aae25687f4276912ed
Merge: 07ecab69ee0b73e43851687efaf492462fd11c08 f166b752dca80dff0fd55cc4fca034ada065af02
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Sep 7 17:45:50 2010 +0100

    Merge branch 'experimental' into ubuntu/maverick
    
    Conflicts:
    	debian/patches/series

diff --combined debian/patches/series
index 6a40f0e,c30735f..552a99d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,4 +1,12 @@@
 +01_Debranch-netbook-interface.patch
 +02_only-show-netbook-panel-on-request.patch
 +03_quit-only-on-explicit-shutdown-request.patch
 +04_enable-switching-between-the-2-interfaces.patch
 +05_show-a-empty-library-message-in-banshee.patch
 +06_add-meego-desktop-file.patch
 +07_enable-library-watch-by-default.patch
 +08_remove_unrelevant_media.patch
+ copy-gpod-dllmap
  0001-Don-t-copy-duplicate-libraries.patch
  0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch
  99_ltmain_as-needed.patch

-- 
banshee