[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.5.5-1ubuntu1-4-g2dd972e
Chow Loong Jin
hyperair at ubuntu.com
Thu Mar 25 15:31:39 UTC 2010
The following commit has been merged in the ubuntu branch:
commit 2dd972ee907f45890fd6f12d1254c5b669f75487
Merge: 4d8b052f440e1b6fe30f4bb2d1b08eb18b145ff6 f915694b9543bdeef0bcef702a8201795eca0918
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Thu Mar 25 23:06:24 2010 +0800
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 46b5586,43c8259..2f5b8e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,28 @@@
-banshee-community-extensions (1.5.5-2) UNRELEASED; urgency=low
++banshee-community-extensions (1.5.5-1ubuntu2) lucid; urgency=low
+
+ * debian/control:
- + Fix double "and" in the description of -empathy
+ + Add lsb-release to build-dep
+ * debian/(control, rules, banshee-extension-liveradio.install):
+ + Enable and add banshee-extension-liveradio package
+ * debian/copyright:
+ + Update (document src/LiveRadio/* and src/CoverWallpaper/*)
+
- -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 25 Mar 2010 11:17:11 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 25 Mar 2010 23:05:55 +0800
++
+banshee-community-extensions (1.5.5-1ubuntu1) lucid; urgency=low
+
+ * Changes from Debian not yet uploaded:
+ + debian/control:
+ - Fix double "and" in the description of -empathy
+ * Ubuntu-specific changes:
+ + debian/control, rules:
+ - Enable banshee-extension-{ubuntuonemusicstore,lirc}
+ + Fixes needs-packaging bug (LP: #537691)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 24 Mar 2010 13:53:06 +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 89a0832,4167fdb..ff21d80
--- a/debian/control
+++ b/debian/control
@@@ -8,9 -8,10 +8,10 @@@ Build-Depends: debhelper (>= 7.0.50)
mono-devel (>= 2.4.2.3),
quilt (>= 0.46-7~),
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),
@@@ -27,7 -28,7 +28,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 -41,15 +41,15 @@@ 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-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-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,18 -124,39 +124,39 @@@ 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
+ Depends: banshee (>= ${banshee:Version}),
+ banshee-extensions-common (= ${source:Version}),
+ ${cli:Depends}, ${misc:Depends}
+ Description: LiveRadio extension for Banshee
+ The LiveRadio extension for Banshee is a browser for online Internet station
+ directories integrated into the Banshee media player. It currently supports
+ live365.com, shoutcast.com and xiph.org, but its plugin-like code structure can
+ easily be extended to support just about any directory.
+ .
+ LiveRadio has the follwing features:
+ * Browse and query three online internet radio directories:
+ – live365.com
+ – shoutcast.com
+ – xiph.org
+ * Retrieve stream information and play the stream
+ * Add your favorite streams to your list of Internet Radio stations in Banshee
+ .
+ Banshee is a media management and playback application for the GNOME desktop.
+
Package: banshee-extension-lyrics
Architecture: all
Depends: banshee (>= ${banshee:Version}),
@@@ -233,12 -256,12 +256,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.
diff --combined debian/rules
index 6a91ce7,15726a4..584da5f
--- a/debian/rules
+++ b/debian/rules
@@@ -6,7 -6,6 +6,6 @@@ include /usr/share/cli-common/cli.mak
BANSHEE_VERSION = $(shell pkg-config --modversion banshee-1-thickclient)
# disable clutterflow and lirc due to dependencies missing
- # disable liveradio due to its alpha status
override_dh_auto_configure:
dh_auto_configure -- \
--with-vendor-build-id="`lsb_release -ds`" \
@@@ -17,15 -16,15 +16,15 @@@
--disable-clutterflow \
--enable-coverwallpaper \
--enable-lcd \
- --disable-lirc \
+ --enable-lirc \
--enable-lyrics \
- --disable-liveradio \
+ --enable-liveradio \
--enable-magnatune \
--enable-mirage \
--enable-radiostationfetcher \
--enable-streamrecorder \
--enable-telepathy \
- --disable-ubuntuonemusicstore \
+ --enable-ubuntuonemusicstore \
--disable-shave \
MCS=/usr/bin/mono-csc
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list