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

[Chow Loong Jin]

The following commit has been merged in the ubuntu branch:
commit 87bb073745640617f1eb59c80fd93aaadcecec32
Merge: 404ba0677a1ecab1aeab173ace0c3f1750b07aa1 78f8242aefc94f34ea4887af3ca4e13d6abcb84c
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Wed Mar 24 13:14:49 2010 +0800

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

diff --combined debian/changelog
index 3470c18,c06fc71..403f069
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,12 +1,12 @@@
- banshee-community-extensions (1.5.5-0ubuntu1) UNRELEASED; urgency=low
 -banshee-community-extensions (1.5.5-2) UNRELEASED; urgency=low
++banshee-community-extensions (1.5.5-1ubuntu1) UNRELEASED; urgency=low
+ 
+   * debian/control:
+     + Fix double "and" in the description of -empathy
+ 
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 22 Mar 2010 09:07:43 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 24 Mar 2010 13:14:31 +0800
+ 
+ banshee-community-extensions (1.5.5-1) unstable; urgency=low
  
 -  * Initial release (Closes: #570329)
 +  * Initial release (LP: #537691)
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Mar 2010 21:36:21 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 17 Mar 2010 00:50:46 +0800
diff --combined debian/control
index 4ac72dd,fc9226b..89a0832
--- a/debian/control
+++ b/debian/control
@@@ -10,7 -10,7 +10,7 @@@ Build-Depends: debhelper (>= 7.0.50)
                 autotools-dev,
                 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,7 -27,7 +27,7 @@@
                 libndesk-dbus1.0-cil-dev,
                 libmono-addins-cil-dev,
                 libnotify-cil-dev,
 -#               libubuntuone1.0-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
@@@ -40,14 -40,14 +40,14 @@@ Depends: banshee-extension-alarm (>= ${
  #         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-lyrics (>= ${source:Version}),
           banshee-extension-magnatune (>= ${source:Version}),
           banshee-extension-mirage (>= ${source:Version}),
           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
@@@ -122,17 -122,17 +122,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-lyrics
  Architecture: all
@@@ -217,7 -217,7 +217,7 @@@ Depends: banshee (>= ${banshee:Version}
           ${cli:Depends}, ${misc:Depends}
  Description: Telepathy extension for Banshee
   This extension provides integration between the Empathy instant messenger and
-  and Banshee. It provides the following features:
+  Banshee. It provides the following features:
   .
    * Download your friends' Banshee library metadata and check out what they
      listen to, their ratings, BPM values, etc.
@@@ -233,12 -233,12 +233,12 @@@
   .
    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