[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/natty, updated. debian/1.9.0+git20101121.r1.b13266e-0ubuntu5-26-g325502b

[Chow Loong Jin]

The following commit has been merged in the ubuntu/natty branch:
commit 082c0fd9695e1b010aaacc50b576e165c5daf289
Author: Michael Terry <mterry at ubuntu.com>
Date:   Fri Dec 17 09:33:48 2010 -0500

    Imported Debian patch 1.9.0+git20101121.r1.b13266e-0ubuntu6

diff --git a/debian/changelog b/debian/changelog
index a07cee6..4bc7d7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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 at 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
diff --git a/debian/control b/debian/control
index 36318e8..e0a393f 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ 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),
                libsoup2.4-dev (>= 2.26),
                libsoup-gnome2.4-dev (>= 2.26),
diff --git a/debian/rules b/debian/rules
index 2adccb3..bf298b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ override_dh_auto_configure:
 	                     --enable-mtp \
 	                     --enable-appledevice \
 	                     --disable-ipod \
-	                     --enable-karma \
 	                     --enable-daap \
 	                     --disable-remote-audio \
 	                     --disable-torrent \

-- 
banshee