[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.5.5-1ubuntu2-15-ga3d1f72

[Chow Loong Jin]

The following commit has been merged in the ubuntu branch:
commit a3d1f7289e3dae6aebdcb5558859968c14c0525a
Merge: 6cd5520c5f32f760e836971f4dc352b92a2dbd5f 19504d403321885d3bcf3fc1ec1baeb0c164407d
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun Apr 4 19:05:26 2010 +0800

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/control

diff --combined debian/control
index 47bdb5d,8ee8f6d..91c871d
--- a/debian/control
+++ b/debian/control
@@@ -10,7 -10,7 +10,7 @@@ Build-Depends: debhelper (>= 7.0.50)
                 lsb-release,
                 banshee (>= 1.5.5),
                 pkg-config,
 -#               liblircclient-dev (>= 0.8.6),
 +               liblircclient-dev (>= 0.8.6),
                 libglib2.0-dev,
                 libfftw3-dev,
                 libsqlite3-dev (>= 3.3),
@@@ -27,8 -27,8 +27,8 @@@
                 libndesk-dbus1.0-cil-dev,
                 libmono-addins-cil-dev,
                 libnotify-cil-dev,
 -#               libappindicator-cil-dev
 -#               libubuntuone1.0-cil-dev
 +               libappindicator-cil-dev,
 +               libubuntuone1.0-cil-dev
  Standards-Version: 3.8.4
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee-community-extensions.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee-community-extensions.git
@@@ -37,12 -37,12 +37,12 @@@ Homepage: http://gitorious.org/banshee-
  Package: banshee-community-extensions
  Architecture: all
  Depends: banshee-extension-alarm (>= ${source:Version}),
 -#         banshee-extension-appindicator (>= ${source:Version}),
 +         banshee-extension-appindicator (>= ${source:Version}),
           banshee-extension-awn (>= ${source:Version}),
  #         banshee-extension-clutterflow (>= ${source:Version}),
           banshee-extension-coverwallpaper (>= ${source:Version}),
           banshee-extension-lcd (>= ${source:Version}),
 -#         banshee-extension-lirc (>= ${source:Version}),
 +         banshee-extension-lirc (>= ${source:Version}),
           banshee-extension-liveradio (>= ${source:Version}),
           banshee-extension-lyrics (>= ${source:Version}),
           banshee-extension-magnatune (>= ${source:Version}),
@@@ -50,7 -50,7 +50,7 @@@
           banshee-extension-radiostationfetcher (>= ${source:Version}),
           banshee-extension-streamrecorder (>= ${source:Version}),
           banshee-extension-telepathy (>= ${source:Version}),
 -#         banshee-extension-ubuntuonemusicstore (>= ${source:Version}),
 +         banshee-extension-ubuntuonemusicstore (>= ${source:Version}),
           ${misc:Depends}
  Description: set of community contributed extensions for Banshee
   This package is a metapackage which depends on the current versions of all the
@@@ -79,18 -79,18 +79,18 @@@ Description: Alarm extension for Banshe
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
 -# Package: banshee-extension-appindicator
 -# Architecture: all
 -# Depends: banshee (>= ${banshee:Version}),
 -#          banshee-extensions-common (= ${source:Version}),
 -#          indicator-applet, indicator-application,
 -#          ${cli:Depends}, ${misc:Depends}
 -# Description: Application Indicator extension for Banshee
 -#  This package provides integration for Banshee with Application Indicators,
 -#  which is a replacement for the notification area in Ubuntu, as a way to add
 -#  menus in the panel.
 -#  .
 -#  Banshee is a media management and playback application for the GNOME desktop.
 +Package: banshee-extension-appindicator
 +Architecture: all
 +Depends: banshee (>= ${banshee:Version}),
 +         banshee-extensions-common (= ${source:Version}),
-          #TODO: binary-dep on appind things
++         indicator-applet, indicator-application,
 +         ${cli:Depends}, ${misc:Depends}
 +Description: Application Indicator extension for Banshee
 + This package provides integration for Banshee with Application Indicators,
 + which is a replacement for the notification area in Ubuntu, as a way to add
 + menus in the panel.
 + .
 + Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-awn
  Architecture: all
@@@ -138,17 -138,17 +138,17 @@@ Description: LCD display integration ex
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
 -# Package: banshee-extension-lirc
 -# Architecture: any
 -# Depends: banshee (>= ${banshee:Version}),
 -#          banshee-extensions-common (= ${source:Version}),
 -#          lirc,
 -#          ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
 -# Description: LIRC integration extension for Banshee
 -#  This package provides LIRC integration for Banshee, which will allow Banshee to
 -#  be controlled using an infra-red device.
 -#  .
 -#  Banshee is a media management and playback application for the GNOME desktop.
 +Package: banshee-extension-lirc
 +Architecture: any
 +Depends: banshee (>= ${banshee:Version}),
 +         banshee-extensions-common (= ${source:Version}),
 +         lirc,
 +         ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
 +Description: LIRC integration extension for Banshee
 + This package provides LIRC integration for Banshee, which will allow Banshee to
 + be controlled using an infra-red device.
 + .
 + Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-liveradio
  Architecture: all
@@@ -270,12 -270,12 +270,12 @@@ Description: Telepathy extension for Ba
   .
    Banshee is a media management and playback application for the GNOME desktop.
  
 -# Package: banshee-extension-ubuntuonemusicstore
 -# Architecture: all
 -# Depends: banshee (>= ${banshee:Version}),
 -#          banshee-extensions-common (= ${source:Version}),
 -#          ${cli:Depends}, ${misc:Depends}
 -# Description: Ubuntu One Music Store extension for Banshee
 -#  This extension makes the Ubuntu One Music Store available in Banshee.
 -#  .
 -#  Banshee is a media management and playback application for the GNOME desktop.
 +Package: banshee-extension-ubuntuonemusicstore
 +Architecture: all
 +Depends: banshee (>= ${banshee:Version}),
 +         banshee-extensions-common (= ${source:Version}),
 +         ${cli:Depends}, ${misc:Depends}
 +Description: Ubuntu One Music Store extension for Banshee
 + This extension makes the Ubuntu One Music Store available in Banshee.
 + .
 + Banshee is a media management and playback application for the GNOME desktop.

-- 
banshee-community-extensions