[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.9.0-1ubuntu2-16-gdddf53e

Iain Lane laney at ubuntu.com
Thu Dec 23 20:59:19 UTC 2010


The following commit has been merged in the ubuntu branch:
commit ae93a859547f46642aeac60aff82c4af3fd1ea33
Merge: 44c52b86898b4e1efd7624e71ca84cb204c7dbc2 ab3bbb8bfba2e427ad099e601e8e9235dcbcc12d
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Dec 23 19:57:49 2010 +0000

    Merge branch 'experimental' into ubuntu
    
    Conflicts:
    	debian/control
    	debian/rules

diff --combined debian/changelog
index 73ee539,da43a77..4aa474e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,44 +1,60 @@@
+ banshee-community-extensions (1.9.1-1) UNRELEASED; urgency=low
+ 
+   [ Chow Loong Jin ]
+   * debian/control: Add Enhances: banshee to all extension packages
+     (LP: #629532)
+ 
+   [ Iain Lane ]
+   * [f8f664d] Imported Upstream version 1.9.1
+     + New extensions:
+      - [Jamendo] Browse the Jamendo catalog, stream and download free music
+      - [ZeitgeistDataprovider] Publish your Banshee activities into Zeitgeist
+     + Enhancements:
+      - [LastfmFingerprint] Correct more information : album name, track
+        number, etc.
+      - [build] Various build/unit test fixes
+     + Bugs Fixed:
+      - [Ampache] Improve handling of large libraries (bgo#636069)
+      - [Ampache] Reduce the initial load time by loading songs on demand
+        (bgo#636041)
+      - [LastfmFingerprint] Fix NRE when fingerprint request times out
+        (bgo#635899)
+      - [Lirc] Add a dllmap for lirc_client (bgo#635848)
+      - [Lyrics] Properly trim artist name and track title and fix NRE
+        (bgo#635616)
+      - [Lyrics] Change regex on LyricWiki to show only original language
+        (bgo#635434)
+      - [Lyrics] Throw a NetworkUnavailableException when there is no network
+        (bgo#634787)
+   * [09c12b3] Remove references to Sound Menu extension: no longer
+     shipped
+   * [1567a22] Remove references to U1MS extension: no longer shipped
+   * [4cbeb96] Enable new Jamendo extension (LP: #397070)
+   * [b70c12b] Don't build the new Zeitgeist data provider
+   * [614b9dd] Refresh fix-ampache-unicode.patch to apply to this release
+   * [aef7f5a] Remove merged patch 0001-Ampache-Fix-compilation-with-
+     banshee-1.9.0.patch
+   * [5cb5732] Increase minimal required Banshee version to 1.9.1 per
+     upstream configure checks
+ 
+  -- Iain Lane <laney at ubuntu.com>  Thu, 23 Dec 2010 19:21:03 +0000
+ 
 +banshee-community-extensions (1.9.0-1ubuntu2) natty; urgency=low
 +
 +  * [5c94c08] Disable OpenVP extension temporarily.
 +  * [609c47e] Enable Ubuntu One Music Store by default
 +  * [6d26f8b] Fix build with new RandomBy APIs included in git snapshot
 +
 + -- Iain Lane <laney at ubuntu.com>  Wed, 24 Nov 2010 14:59:52 +0000
 +
 +banshee-community-extensions (1.9.0-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable building of AppIndicator, Lirc, SoundMenu, and U1MS
 +    + Also enable SoundMenu extension by default
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 18 Nov 2010 02:50:07 +0800
 +
  banshee-community-extensions (1.9.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -38,14 -63,6 +79,14 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 14:19:02 +0800
  
 +banshee-community-extensions (1.8.0-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable building of AppIndicator, Lirc, SoundMenu, and U1MS
 +    + Also enable SoundMenu extension by default
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 02 Oct 2010 16:40:06 +0800
 +
  banshee-community-extensions (1.8.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -56,13 -73,7 +97,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 12:34:03 +0800
  
 -banshee-community-extensions (1.7.6-1) UNRELEASED; urgency=low
 +banshee-community-extensions (1.7.6-0ubuntu2) maverick; urgency=low
 +
 +  * Correct typo in banshee-extension-soundmenu recommendation
 +
 + -- Emmet Hikory <persia at ubuntu.com>  Sun, 19 Sep 2010 12:01:03 +0900
 +
 +banshee-community-extensions (1.7.6-0ubuntu1) maverick; urgency=low
  
    * New upstream release
      + Enhancements:
@@@ -82,19 -93,6 +123,19 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 18 Sep 2010 03:35:36 +0800
  
 +banshee-community-extensions (1.7.4-1ubuntu2) maverick; urgency=low
 +
 +  * No-change rebuild to pick up latest libindicate ABI. (LP: #636253)
 +
 + -- Iain Lane <laney at ubuntu.com>  Mon, 13 Sep 2010 23:14:59 +0100
 +
 +banshee-community-extensions (1.7.4-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from experimental, remaining changes:
 +    + Enable AppIndicator, Lirc, SoundMenu, and U1MS
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 24 Aug 2010 22:02:51 +0800
 +
  banshee-community-extensions (1.7.4-1) experimental; urgency=low
  
    * New upstream release
@@@ -146,14 -144,6 +187,14 @@@ banshee-community-extensions (1.6.1-2) 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 26 Jul 2010 01:12:38 +0800
  
 +banshee-community-extensions (1.6.1-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from Debian unstable, remaining changes:
 +    + Enable appindicator, lirc, and ubuntuonemusicstore extensions
 +  * Also fixes LP: #597283, which just require a rebuild of appindicator
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 23 Jun 2010 01:14:29 +0800
 +
  banshee-community-extensions (1.6.1-1) unstable; urgency=low
  
    * New upstream bugfix release:
@@@ -182,52 -172,6 +223,52 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 08 Jun 2010 13:45:22 +0800
  
 +banshee-community-extensions (1.6.0-1ubuntu5) lucid; urgency=low
 +
 +  * Add 0001-AppIndicator-Stopping-the-notifications-from-lagging.patch to
 +    fix notification lag with Notify OSD (LP: #566112)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 23 Apr 2010 22:36:16 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu4) lucid; urgency=low
 +
 +  * debian/control:
 +    + Build-dep on libappindicator0.1-cil-dev instead, due to adding of
 +      the API version number into the name of the package (LP: #564506)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 17 Apr 2010 14:55:24 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu3) lucid; urgency=low
 +
 +  * 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 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
  
    * New upstream release
diff --combined debian/control
index 07b3c47,1e7adf5..38a1c47
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,15 +1,17 @@@
  Source: banshee-community-extensions
  Section: sound
  Priority: optional
 -Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-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),
                 cli-common-dev (>= 0.5.7),
                 mono-devel (>= 2.4.2.3),
                 autotools-dev,
                 lsb-release,
-                banshee (>> 1.9.0+),
+                banshee (>= 1.9.1),
                 pkg-config,
 +               liblircclient-dev (>= 0.8.6),
                 libglib2.0-dev,
                 libfftw3-dev,
                 libsqlite3-dev (>= 3.3),
@@@ -27,14 -25,11 +27,14 @@@
                 libndesk-dbus1.0-cil-dev,
                 libmono-addins-cil-dev,
                 libnotify-cil-dev,
 +               libappindicator0.1-cil-dev,
 +               libubuntuone1.0-cil-dev,
                 libtaoframework-opengl-cil-dev (>= 2.1),
                 libtaoframework-freeglut-cil-dev,
                 libtaoframework-sdl-cil-dev (>= 1.2.13),
                 mono-jay,
 -               gnome-doc-utils (>= 0.17.3)
 +               gnome-doc-utils (>= 0.17.3),
 +               libindicate0.1-cil-dev (>= 0.4.1)
  Standards-Version: 3.9.1
  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
@@@ -44,12 -39,11 +44,13 @@@ Package: banshee-community-extension
  Architecture: all
  Recommends: banshee-extension-alarm (>= ${source:Version}),
              banshee-extension-ampache (>= ${source:Version}),
 +            banshee-extension-appindicator (>= ${source:Version}),
              banshee-extension-awn (>= ${source:Version}),
              banshee-extension-coverwallpaper (>= ${source:Version}),
+             banshee-extension-jamendo (>= ${source:Version}),
              banshee-extension-lastfmfingerprint (>= ${source:Version}),
              banshee-extension-lcd (>= ${source:Version}),
 +            banshee-extension-lirc (>= ${source:Version}),
              banshee-extension-liveradio (>= ${source:Version}),
              banshee-extension-lyrics (>= ${source:Version}),
              banshee-extension-magnatune (>= ${source:Version}),
@@@ -57,10 -51,8 +58,10 @@@
              banshee-extension-openvp (>= ${source:Version}),
              banshee-extension-radiostationfetcher (>= ${source:Version}),
              banshee-extension-randombylastfm (>= ${source:Version}),
 +            banshee-extension-soundmenu (>= ${source:Version}),
              banshee-extension-streamrecorder (>= ${source:Version}),
              banshee-extension-telepathy (>= ${source:Version}),
 +            banshee-extension-ubuntuonemusicstore (>= ${source:Version})
  Depends: banshee-extensions-common (= ${source:Version}),
           ${misc:Depends}
  Description: set of community contributed extensions for Banshee
@@@ -77,6 -69,7 +78,7 @@@ Description: common files for banshee-c
   install one of other extension packages.
  
  Package: banshee-extension-alarm
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -91,6 -84,7 +93,7 @@@ Description: Alarm extension for Banshe
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-ampache
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -101,18 -95,8 +104,19 @@@ Description: Ampache extension for Bans
   .
   Banshee is a media management and playback application for the GNOME desktop
  
 +Package: banshee-extension-appindicator
 +Architecture: all
 +Depends: 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
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -124,6 -108,7 +128,7 @@@ Description: AWN integration extension 
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-coverwallpaper
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -133,7 -118,21 +138,21 @@@ Description: Cover wallpaper extension 
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
+ Package: banshee-extension-jamendo
+ Enhances: banshee
+ Architecture: all
+ Depends: banshee-extensions-common (= ${source:Version}),
+          ${cli:Depends}, ${misc:Depends}
+ Description: Jamendo extension for Banshee
+  This package provides integration with the Jamendo music service. Jamendo is a
+  community of music authors and performers which makes free music available.
+  This extension allows you to browse the Jamendo catalog, stream and download
+  free music.
+  .
+  Banshee is a media management and playback application for the GNOME desktop.
+ 
  Package: banshee-extension-lastfmfingerprint
+ Enhances: banshee
  Architecture: any
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends}
@@@ -145,6 -144,7 +164,7 @@@ Description: Last.FM fingerprinting ext
   Banshee is a media maangement and playback application for the GNOME dekstop.
  
  Package: banshee-extension-lcd
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           lcdproc,
@@@ -155,19 -155,8 +175,20 @@@ 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-liveradio
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -188,6 -177,7 +209,7 @@@ Description: LiveRadio extension for Ba
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-lyrics
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -202,6 -192,7 +224,7 @@@ Description: Lyrics extension for Bansh
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-magnatune
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -211,6 -202,7 +234,7 @@@ Description: Magnatune for Banshe
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-mirage
+ Enhances: banshee
  Architecture: any
  Depends: banshee-extensions-common (= ${source:Version}),
           ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
@@@ -229,6 -221,7 +253,7 @@@ Description: Automatic Playlist Generat
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-openvp
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
@@@ -239,6 -232,7 +264,7 @@@ Description: visualizations extension f
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-radiostationfetcher
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -251,6 -245,7 +277,7 @@@ Description: radio station fetcher exte
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-randombylastfm
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -262,18 -257,8 +289,19 @@@ Description: Random By Last.FM extensio
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
 +Package: banshee-extension-soundmenu
 +Architecture: all
 +Depends: banshee-extensions-common (= ${source:Version}),
 +         ${cli:Depends}, ${misc:Depends}
 +Description: SoundMenu extension for Banshee
 + This package provides integration for Banshee with the Sound Menu, allowing the
 + user to view information about the currently playing track and control Banshee
 + using the Sound Menu.
 + .
 + Banshee is a media management and playback application for the GNOME desktop.
 +
  Package: banshee-extension-streamrecorder
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
@@@ -289,6 -274,7 +317,7 @@@ Description: StreamRecorder extension f
   Banshee is a media management and playback application for the GNOME desktop.
  
  Package: banshee-extension-telepathy
+ Enhances: banshee
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
           empathy (>= 2.27.91),
@@@ -312,12 -298,3 +341,12 @@@ Description: Telepathy extension for Ba
    * 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-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.
diff --combined debian/patches/series
index a44dacb,90e56bc..125144d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,2 +1,6 @@@
 +enable-soundmenu.patch
 +enable-u1ms.patch
  fix-ampache-unicode.patch
- 0001-Ampache-Fix-compilation-with-banshee-1.9.0.patch
  fsck-intltool.patch
 +mirage-new-randomby-api.patch
 +randombylastfm-new-randomby-api.patch
diff --combined debian/rules
index ae6d3a3,0dbd416..49e0490
--- a/debian/rules
+++ b/debian/rules
@@@ -13,13 -13,14 +13,14 @@@ override_dh_auto_configure
  		--enable-schemas-install \
  		--enable-alarmclock \
  		--enable-ampache \
 -		--disable-appindicator \
 +		--enable-appindicator \
  		--enable-awn \
  		--disable-clutterflow \
  		--enable-coverwallpaper \
+ 		--enable-jamendo \
  		--enable-lastfmfingerprint \
  		--enable-lcd \
 -		--disable-lirc \
 +		--enable-lirc \
  		--enable-lyrics \
  		--enable-liveradio \
  		--enable-magnatune \
@@@ -27,10 -28,9 +28,11 @@@
  		--enable-openvp \
  		--enable-radiostationfetcher \
  		--enable-randombylastfm \
 +		--enable-soundmenu \
  		--enable-streamrecorder \
  		--enable-telepathy \
 +		--enable-ubuntuonemusicstore \
+ 		--disable-zeitgeistdataprovider \
  		--disable-shave \
  		--enable-user-help \
  		MCS=/usr/bin/mono-csc

-- 
banshee-community-extensions



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