[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.6.1-1ubuntu1-23-g80b7106

Chow Loong Jin hyperair at ubuntu.com
Tue Aug 24 20:16:50 UTC 2010


The following commit has been merged in the ubuntu branch:
commit d2fc8f0821f12d1d7a5d06c274056544956ba40a
Merge: b3e9309ddd61ce87704c8fb9fe2f9450e0a9625c 61ad7dbb31aaaf27d06c6a1fd9f8cbdd8a8638c3
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Aug 24 15:09:58 2010 +0800

    Merge branch 'experimental' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf

diff --combined debian/changelog
index 4aaf0fd,749f9bb..7568362
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,54 +1,62 @@@
+ banshee-community-extensions (1.7.4-1) UNRELEASED; urgency=low
+ 
+   * New upstream release
+     + New extensions:
+       - [OpenVP] Add various visualizations to the Now Playing source
+       - [SoundMenu] Control Banshee from the sound menu available in Ubuntu
+     + Enhancements
+       - User help is now available, automatically integrated into the Banshee
+         help pages.
+       - [AppIndicator] Avoid conflicts with NotificationArea by not being
+         enabled at the same time
+     + Bugs fixed:
+       - [AppIndicator] Fix toggle state issue when the window was launched from
+         its starter
+       - [AppIndicator] Stop the notifications from lagging and stacking up
+         (bgo#616652)
+       - [AppIndicator] Use banshee-panel icon if it exists
+       - [ClutterFlow] Fix crash when checking GL extensions
+       - [ClutterFlow] Copy the clutter-sharp assemblies during installation
+       - [LiveRadio] Fix ShoutCAST streams (lp#572819)
+       - [LiveRadio] Fix crash when disabling last enabled plugin (bgo#623983)
+       - [Lyrics] Follow the WriteMetadata preference
+       - [Mirage] Remove the ineffective "Duplicate Search" menu entry
+       - [Mirage] Explicitly link mirageaudiotest to GStreamer libs (bgo#624084)
+       - [Mirage] Delay initialization to avoid slowing down Banshee's startup
+       - [StreamRecorder] Use a filesink in the gstreamer pipeline (bgo#616167)
+       - [Telepathy] Update Now Playing information when gapless is on
+       - [UbuntuOneMusicStore] Delay initialization until actually needed
+   * debian/control:
+     + Build-dep on banshee (>= 1.7.4)
+     + Tighten binary dependency on banshee in anticipation of future ABI
+       breakage
+     + No-change Standards-Version bump from 3.8.4 to 3.9.1
+   * debian/(control, banshee-extension-openvp.install,
+     banshee-extension-alarm.install, rules):
+     + Introduce banshee-extension-openvp package
+     + Enable and install new OpenVP extension to new package
+     + Disable SoundMenu (indicate-sharp not yet in Debian)
+     + Enable user help
+   * debian/copyright:
+     + Update to document the licensing of OpenVP and SoundMenu
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 24 Aug 2010 02:46:37 +0800
+ 
+ banshee-community-extensions (1.6.1-2) experimental; urgency=low
+ 
+   * Rebuild against new Banshee (1.7.3)
+   * debian/control: Build-dep on banshee (>= 1.7.3)
+ 
+  -- 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:
@@@ -34,52 -77,6 +85,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 1ba14fe,824cf75..1bf57ec
--- a/debian/control
+++ b/debian/control
@@@ -8,9 -8,8 +8,9 @@@ Build-Depends: debhelper (>= 7.0.50)
                 mono-devel (>= 2.4.2.3),
                 autotools-dev,
                 lsb-release,
-                banshee (>= 1.5.5),
+                banshee (>= 1.7.4),
                 pkg-config,
 +               liblircclient-dev (>= 0.8.6),
                 libglib2.0-dev,
                 libfftw3-dev,
                 libsqlite3-dev (>= 3.3),
@@@ -27,9 -26,12 +27,14 @@@
                 libndesk-dbus1.0-cil-dev,
                 libmono-addins-cil-dev,
                 libnotify-cil-dev,
 +               libappindicator0.1-cil-dev,
 +               libubuntuone1.0-cil-dev
- Standards-Version: 3.8.4
+                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)
+ 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
  Homepage: http://gitorious.org/banshee-community-extensions
@@@ -37,20 -39,17 +42,20 @@@
  Package: banshee-community-extensions
  Architecture: all
  Recommends: banshee-extension-alarm (>= ${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-liveradio (>= ${source:Version}),
           banshee-extension-lyrics (>= ${source:Version}),
           banshee-extension-magnatune (>= ${source:Version}),
           banshee-extension-mirage (>= ${source:Version}),
+          banshee-extension-openvp (>= ${source:Version}),
           banshee-extension-radiostationfetcher (>= ${source:Version}),
           banshee-extension-streamrecorder (>= ${source:Version}),
           banshee-extension-telepathy (>= ${source:Version}),
 +         banshee-extension-ubuntuonemusicstore (>= ${source:Version}),
  Depends: banshee (>= ${banshee:Version}),
           ${misc:Depends}
  Description: set of community contributed extensions for Banshee
@@@ -60,6 -59,7 +65,7 @@@
  Package: banshee-extensions-common
  Architecture: all
  Depends: banshee (>= ${banshee:Version}),
+          banshee (<< ${banshee:Version}.),
           ${misc:Depends}
  Description: common files for banshee-community-extensions
   This package contains the common files for all the extensions in the Banshee
@@@ -80,17 -80,6 +86,17 @@@ 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-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-extensions-common (= ${source:Version}),
@@@ -102,17 -91,6 +108,6 @@@ Description: AWN integration extension 
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
- # Package: banshee-extension-clutterflow
- # Architecture: all
- # Depends: banshee (>= ${banshee:Version}),
- #          banshee-extensions-common (= ${source:Version}),
- #          ${cli:Depends}, ${misc:Depends}
- # Description: CoverFlow functionality for Banshee
- #  This package provides a clone of the CoverFlow functionality for
- #  Banshee using the Clutter toolkit.
- #  .
- #  Banshee is a media management and playback application for the GNOME desktop.
- 
  Package: banshee-extension-coverwallpaper
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
@@@ -134,18 -112,6 +129,18 @@@ 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
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
@@@ -207,6 -173,16 +202,16 @@@ Description: Automatic Playlist Generat
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
+ Package: banshee-extension-openvp
+ Architecture: all
+ Depends: banshee-extensions-common (= ${source:Version}),
+          ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
+ Description: visualizations extension for Banshee
+  This package contains an extension for Banshee which adds various
+  visualizations to the Now Playing source in Banshee.
+  .
+  Banshee is a media management and playback application for the GNOME desktop.
+ 
  Package: banshee-extension-radiostationfetcher
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
@@@ -258,12 -234,3 +263,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/gbp.conf
index 647ad42,56e6548..6532833
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,3 +1,3 @@@
  [DEFAULT]
 -debian-branch = experimental
 +debian-branch = ubuntu
+ upstream-branch = upstream-experimental
diff --combined debian/rules
index 69fd269,caa9124..89f6ae0
--- a/debian/rules
+++ b/debian/rules
@@@ -12,21 -12,24 +12,24 @@@ override_dh_auto_configure
  		--enable-gnome \
  		--enable-schemas-install \
  		--enable-alarmclock \
 -		--disable-appindicator \
 +		--enable-appindicator \
  		--enable-awn \
  		--disable-clutterflow \
  		--enable-coverwallpaper \
  		--enable-lcd \
 -		--disable-lirc \
 +		--enable-lirc \
  		--enable-lyrics \
  		--enable-liveradio \
  		--enable-magnatune \
  		--enable-mirage \
+ 		--enable-openvp \
  		--enable-radiostationfetcher \
+ 		--disable-soundmenu \
  		--enable-streamrecorder \
  		--enable-telepathy \
 -		--disable-ubuntuonemusicstore \
 +		--enable-ubuntuonemusicstore \
  		--disable-shave \
+ 		--enable-user-help \
  		MCS=/usr/bin/mono-csc
  
  override_dh_gencontrol:

-- 
banshee-community-extensions



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