[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.6.0-1ubuntu2-7-gad2da3d

[Chow Loong Jin]

The following commit has been merged in the ubuntu branch:
commit 82d2d134cc0df5162b9ed3092f291a6ae217c169
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Apr 15 00:22:29 2010 +0800

    Drop telepathy package
    
    * Rebuild for correct dependencies in -appindicator (LP: #560095)
    * debian/(control, rules):
      + Drop banshee-extension-telepathy; not installable due to dependency
        on telepathy-gabble >= 0.9

diff --git a/debian/changelog b/debian/changelog
index 3fcfc0b..05e2bd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+banshee-community-extensions (1.6.0-1ubuntu3) lucid; urgency=low
+
+  * Rebuild for correct dependencies in -appindicator (LP: #560095)
+  * debian/(control, rules):
+    + Drop banshee-extension-telepathy; not installable due to dependency
+      on telepathy-gabble >= 0.9
+
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Apr 2010 00:21:05 +0800
+
 banshee-community-extensions (1.6.0-1ubuntu2) lucid; urgency=low
 
   * debian/(control, rules, patches):
diff --git a/debian/control b/debian/control
index b8bd890..2b3517e 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Depends: banshee-extension-alarm (>= ${source:Version}),
          banshee-extension-mirage (>= ${source:Version}),
          banshee-extension-radiostationfetcher (>= ${source:Version}),
          banshee-extension-streamrecorder (>= ${source:Version}),
-         banshee-extension-telepathy (>= ${source:Version}),
+#         banshee-extension-telepathy (>= ${source:Version}),
          banshee-extension-ubuntuonemusicstore (>= ${source:Version}),
          ${misc:Depends}
 Description: set of community contributed extensions for Banshee
@@ -245,31 +245,31 @@ Description: StreamRecorder extension for Banshee
  .
  Banshee is a media management and playback application for the GNOME desktop.
 
-Package: banshee-extension-telepathy
-Architecture: all
-Depends: banshee (>= ${banshee:Version}),
-         banshee-extensions-common (= ${source:Version}),
-         empathy (>= 2.27.91),
-         telepathy-gabble (>= 0.9),
-         telepathy-mission-control-5 (>= 5.3.1),
-         ${cli:Depends}, ${misc:Depends}
-Description: Telepathy extension for Banshee
- This extension provides integration between the Empathy instant messenger and
- Banshee. It provides the following features:
- .
-  * Download your friends' Banshee library metadata and check out what they
-    listen to, their ratings, BPM values, etc.
-  * View your friends' playlists and export them to disk
-  * Share what you're listening to with all your instant messaging friends by
-    advertising the track, artist, and album of the currently playing track in
-    Empathy's status message. This can be disabled.
-  * Download your friends' music; one track at a time or a selection. You can
-    cancel ones in progress, queued, individually or all at once. The sender has
-    the option to cancel all in progress or queued transfers only. Both sender
-    and receiver get a progress bar. File sharing can be disabled.
-  * Stream your friends' music. This feature can be disabled.
- .
-  Banshee is a media management and playback application for the GNOME desktop.
+#Package: banshee-extension-telepathy
+#Architecture: all
+#Depends: banshee (>= ${banshee:Version}),
+#         banshee-extensions-common (= ${source:Version}),
+#         empathy (>= 2.27.91),
+#         telepathy-gabble (>= 0.9),
+#         telepathy-mission-control-5 (>= 5.3.1),
+#         ${cli:Depends}, ${misc:Depends}
+#Description: Telepathy extension for Banshee
+# This extension provides integration between the Empathy instant messenger and
+# Banshee. It provides the following features:
+# .
+#  * Download your friends' Banshee library metadata and check out what they
+#    listen to, their ratings, BPM values, etc.
+#  * View your friends' playlists and export them to disk
+#  * Share what you're listening to with all your instant messaging friends by
+#    advertising the track, artist, and album of the currently playing track in
+#    Empathy's status message. This can be disabled.
+#  * Download your friends' music; one track at a time or a selection. You can
+#    cancel ones in progress, queued, individually or all at once. The sender has
+#    the option to cancel all in progress or queued transfers only. Both sender
+#    and receiver get a progress bar. File sharing can be disabled.
+#  * Stream your friends' music. This feature can be disabled.
+# .
+#  Banshee is a media management and playback application for the GNOME desktop.
 
 Package: banshee-extension-ubuntuonemusicstore
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 6e43a65..75c9253 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ override_dh_auto_configure:
 		--enable-mirage \
 		--enable-radiostationfetcher \
 		--enable-streamrecorder \
-		--enable-telepathy \
+		--disable-telepathy \
 		--enable-ubuntuonemusicstore \
 		--disable-shave \
 		MCS=/usr/bin/mono-csc

-- 
banshee-community-extensions