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

Chow Loong Jin hyperair at ubuntu.com
Wed Apr 14 17:07:42 UTC 2010


The following commit has been merged in the ubuntu branch:
commit ad2da3d2554805d66bf8aff121397f4051bea73e
Merge: 805b6ff35015b121024601876ffb52ef0401ae9f 5887bcc31f157f7becc92868d9be6f93523f63b4
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Apr 15 01:01:57 2010 +0800

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

diff --combined debian/changelog
index 97105dd,229d652..244696b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,9 +1,33 @@@
 -banshee-community-extensions (1.6.0-2) UNRELEASED; urgency=low
 +banshee-community-extensions (1.6.0-1ubuntu3) lucid; urgency=low
  
 -  * debian/control:
 +  * debian/(control, rules):
+     + Demote avant-window-navigator to suggests in banshee-extension-awn
 +    + Drop banshee-extension-telepathy; not installable due to dependency
 +      on telepathy-gabble >= 0.9 (LP: #559978)
 +    + Tighten build-dep on libappindicator-cil-dev due to missing clilibs
 +      in older versions (LP: #560095)
 +    + Drop indicator-applet and indicator-application from binary-deps of
 +      -appindicator
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Apr 2010 01:00:45 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Apr 2010 00:26:37 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu2) lucid; urgency=low
 +
 +  * debian/(control, rules, patches):
 +    + Quiltify package again
 +    + Add 0001-Use-banshee-panel-icon.patch which makes AppIndicator use
 +      the correct icon
 +    + Add 99_ignore-quilt.patch to add .pc to POTFILES.skip to fix FTBFS
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 10 Apr 2010 02:05:28 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
 +
 +  * debian/(control, rules):
 +    + Enable AppIndicator, Lirc and U1MS extensions
 +  * Fixes needs-packaging bug (LP: #537691)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 04 Apr 2010 18:17:28 +0800
  
  banshee-community-extensions (1.6.0-1) unstable; urgency=low
  
diff --combined debian/control
index 4f86c70,9b9a978..75aa803
--- a/debian/control
+++ b/debian/control
@@@ -4,14 -4,13 +4,14 @@@ Priority: optiona
  Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
  Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
 +               quilt (>= 0.46-7~),
                 cli-common-dev (>= 0.5.7),
                 mono-devel (>= 2.4.2.3),
                 autotools-dev,
                 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),
@@@ -28,8 -27,8 +28,8 @@@
                 libndesk-dbus1.0-cil-dev,
                 libmono-addins-cil-dev,
                 libnotify-cil-dev,
 -#               libappindicator-cil-dev
 -#               libubuntuone1.0-cil-dev
 +               libappindicator-cil-dev (>= 0.0.19-0ubuntu3~),
 +               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
@@@ -38,20 -37,20 +38,20 @@@ 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}),
           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-telepathy (>= ${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
@@@ -80,24 -79,25 +80,24 @@@ 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}),
 +         ${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
  Depends: banshee (>= ${banshee:Version}),
-          avant-window-navigator,
           banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
+ Suggests: avant-window-navigator
  Description: AWN integration extension for Banshee
   This package provides integration for Banshee with the Avant Window Navigator,
   which is a Mac OS X like dock for the GNOME desktop.
@@@ -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
@@@ -244,38 -244,38 +244,38 @@@ Description: StreamRecorder extension f
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
 -Package: banshee-extension-telepathy
 +#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
  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.
 +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 is a media management and playback application for the GNOME desktop.

-- 
banshee-community-extensions



More information about the Pkg-cli-apps-commits mailing list