[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.0.1-3-18-g08ff87e

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 2f037a916cc564150c8d73a283640dd651cb4bf8
Merge: 1655f3d718bfb34900a6274e89b78e2b6491db14 d7476055a6b7c2106dca81dfd72139dccd607981
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Mon Aug 1 22:16:13 2011 +0800

    Merge branch 'master' (early part) into experimental-test

diff --combined debian/control
index 33e36fa,fef8559..143dc60
--- a/debian/control
+++ b/debian/control
@@@ -11,13 -11,13 +11,13 @@@ Build-Depends: debhelper (>= 7.0.50)
                 lsb-release,
                 mono-devel (>= 2.4.3),
                 libboo-cil-dev (>= 0.8.1),
 -               libdbus1.0-cil-dev (>= 0.5),
 -               libdbus-glib1.0-cil-dev (>= 0.3),
 +               libdbus1.0-cil-dev (>= 0.7),
 +               libdbus-glib1.0-cil-dev (>= 0.5),
                 libmono-addins-cil-dev (>= 0.3.1),
                 libtaglib-cil-dev (>= 2.0.3.7),
                 libmono-zeroconf-cil-dev (>= 0.7.3),
                 libnotify-cil-dev,
 -               libglib2.0-cil-dev (>= 2.10),
 +               libglib2.0-cil-dev (>= 2.12.10),
                 libgtk2.0-cil-dev (>= 2.12),
                 libgconf2.0-cil-dev,
                 libgudev1.0-cil-dev (>= 0.1) [linux-any],
@@@ -26,7 -26,7 +26,7 @@@
                 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),
+                libwebkitgtk-dev (>= 1.2.2) | libwebkit-dev (>= 1.2.2),
                 libsoup2.4-dev (>= 2.26),
                 libsoup-gnome2.4-dev (>= 2.26),
                 libgdata-cil-dev (>= 1.7),
@@@ -37,12 -37,12 +37,12 @@@
                 libgconf2-dev,
                 libglib2.0-dev,
                 libwnck-dev,
 -               libgtk2.0-dev (>= 2.8),
 +               libgtk2.0-dev (>= 2.12.10),
  #               libclutter-1.0-dev (>= 1.0.1),
                 libx11-dev,
                 libxrandr-dev (>= 2:1.1.1),
                 libxxf86vm-dev (>= 1:1.0.1),
 -               libgstreamer0.10-dev (>= 0.10.23),
 +               libgstreamer0.10-dev (>= 0.10.26),
                 libgstreamer-plugins-base0.10-dev (>= 0.10.26),
                 gnome-doc-utils (>= 0.17.3),
                 libgnome-desktop-dev
@@@ -67,8 -67,6 +67,8 @@@ Suggests: gstreamer0.10-plugins-bad
            gstreamer0.10-plugins-ugly,
            gstreamer0.10-ffmpeg,
            banshee-dbg (=${binary:Version})
 +Provides: banshee-api-${banshee:API},
 +          banshee-asm-${banshee:ASM}
  Breaks: banshee-extensions-common (<< 2.0.1-2~)
  Description: Media Management and Playback application
   Banshee is a media management and playback application for the GNOME

-- 
banshee