[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/unstable/karmic, updated. ppa/1.8.0-1ubuntu1.hyper1+karmic-43-g9491bda
Chow Loong Jin
hyperair at ubuntu.com
Wed Nov 17 19:01:41 UTC 2010
The following commit has been merged in the ppa/unstable/karmic branch:
commit 820937c645b2f0bb9ac1830a8c7acf7fe5841dcf
Merge: 4885b980a0c04d5c1b26b6973b68f676477fbd3c 0ec746c50455d4e8a2af45accdb6d47aa86afb34
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Nov 12 18:06:23 2010 +0800
Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
Conflicts:
debian/control
debian/gbp.conf
debian/rules
diff --combined debian/changelog
index c2ccf7b,f0bdfc5..3545a34
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,56 +1,64 @@@
+ banshee-community-extensions (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
+
+ * Merge from Maverick, remaining changes:
+ + Drop soundmenu extension, since Lucid has no sound menu or
+ libindicate0.1-cil-dev
+
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 17:59:12 +0800
+
+ banshee-community-extensions (1.9.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change backport to Maverick
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 17:49:08 +0800
+
+ banshee-community-extensions (1.9.0-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * No change upload to Natty PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 17:46:22 +0800
+
+ banshee-community-extensions (1.9.0-1ubuntu1) UNRELEASED; 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> Fri, 12 Nov 2010 15:02:36 +0800
+
+ banshee-community-extensions (1.9.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + New extensions
+ - [Ampache] Browse and play your remote music with Ampache
+ - [LastfmFingerprint] Identify your music automatically, using the Last.fm
+ online service
+ - [RandomByLastfm] Shuffle your library using information from the Last.fm
+ online service
+ + Bugs Fixed:
+ - [SoundMenu] Fix removal of the preference checkbox (LP #668223)
+ * debian/copyright: Updated to include new extensions
+ * debian/banshee-extension-{ampache,lastfmfingerprint,randombylastfm}.install,
+ debian/{control,rules}:
+ + Add and enable the three new extensions
+ * debian/patches/fix-ampache-unicode.patch:
+ + Fix FTBFS due to unicode character in source
+ * debian/patches/0001-Ampache-Fix-compilation-with-banshee-1.9.0.patch:
+ + Fix FTBFS with 1.9.0
+ * debian/patches/fsck-intltool.patch: Workaround intltool stupidity with quilt
+ * debian/copyright: Update FSF address on LGPL-3+ clause
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 14:19:02 +0800
+
+banshee-community-extensions (1.8.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Revert -cil-dev transition
+ + Disable U1MS and AppIndicator
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 02 Oct 2010 19:52:09 +0800
+
banshee-community-extensions (1.8.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Backport to Lucid, changes:
@@@ -20,7 -65,7 +73,7 @@@ banshee-community-extensions (1.8.0-1ub
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 02 Oct 2010 19:13:06 +0800
- banshee-community-extensions (1.8.0-1ubuntu1) maverick-proposed; urgency=low
+ banshee-community-extensions (1.8.0-1ubuntu1) natty; urgency=low
* Merge from Debian experimental, remaining changes:
+ Enable building of AppIndicator, Lirc, SoundMenu, and U1MS
@@@ -38,26 -83,18 +91,26 @@@ banshee-community-extensions (1.8.0-1)
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 12:34:03 +0800
-banshee-community-extensions (1.7.6-0ubuntu2~hyper1+lucid) lucid; urgency=low
-
- * No change backport to Lucid
-
- -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 20 Sep 2010 04:36:50 +0800
-
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-0ubuntu2~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Use -cil instead of -cil-dev
+ + Use csc instead of mono-csc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 20 Sep 2010 04:51:16 +0800
+
+banshee-community-extensions (1.7.6-0ubuntu2~hyper1+lucid) lucid; urgency=low
+
+ * No change backport to Lucid
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 20 Sep 2010 04:36:50 +0800
+
banshee-community-extensions (1.7.6-0ubuntu1) maverick; urgency=low
* New upstream release
@@@ -84,22 -121,6 +137,22 @@@ banshee-community-extensions (1.7.4-1ub
-- 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-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Backport to Karmic
+ * Set debian-branch to ppa/unstable/karmic
+ * Use -cil instead of -cil-dev
+ * Use csc instead of mono-csc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 13 Sep 2010 04:21:34 +0800
+
banshee-community-extensions (1.7.4-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Backport to Lucid
@@@ -109,6 -130,13 +162,6 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 13 Sep 2010 04:40:40 +0800
-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
@@@ -234,15 -262,6 +287,15 @@@ banshee-community-extensions (1.6.0-1ub
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 10 Apr 2010 02:05:28 +0800
+banshee-community-extensions (1.6.0-1ubuntu1~hyper1~karmic) karmic; urgency=low
+
+ * Backport to karmic, changes:
+ + debian/control, debian/rules:
+ - Disable u1ms and appindicator
+ - Revert -cil-dev transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 06 Apr 2010 18:16:41 +0800
+
banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
* debian/(control, rules):
diff --combined debian/control
index 317ecfe,ea0bf1d..6ea4e32
--- a/debian/control
+++ b/debian/control
@@@ -9,7 -9,7 +9,7 @@@ Build-Depends: debhelper (>= 7.0.50)
mono-devel (>= 2.4.2.3),
autotools-dev,
lsb-release,
- banshee (>= 1.8.0),
+ banshee (>= 1.9.0),
pkg-config,
liblircclient-dev (>= 0.8.6),
libglib2.0-dev,
@@@ -19,17 -19,19 +19,17 @@@
libgstreamer-plugins-base0.10-dev (>= 0.10.15),
libsamplerate0-dev,
intltool (>= 0.35),
- libgconf2.0-cil-dev,
- libglib2.0-cil-dev,
- libgtk2.0-cil-dev,
+ libgconf2.0-cil,
+ libglib2.0-cil,
+ libgtk2.0-cil,
libtaglib-cil-dev,
- libndesk-dbus-glib1.0-cil-dev,
- 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),
+ libndesk-dbus-glib1.0-cil,
+ libndesk-dbus1.0-cil,
+ libmono-addins0.2-cil,
+ libnotify0.4-cil,
+ libtaoframework-opengl3.0-cil (>= 2.1),
+ libtaoframework-freeglut2.4-cil,
+ libtaoframework-sdl1.2-cil (>= 1.2.13),
mono-jay,
gnome-doc-utils (>= 0.17.3),
Standards-Version: 3.9.1
@@@ -40,18 -42,23 +40,21 @@@ Homepage: http://gitorious.org/banshee-
Package: banshee-community-extensions
Architecture: all
Recommends: banshee-extension-alarm (>= ${source:Version}),
- banshee-extension-awn (>= ${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-ampache (>= ${source:Version}),
- banshee-extension-appindicator (>= ${source:Version}),
+ banshee-extension-awn (>= ${source:Version}),
+ banshee-extension-coverwallpaper (>= ${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}),
+ banshee-extension-mirage (>= ${source:Version}),
+ banshee-extension-openvp (>= ${source:Version}),
+ banshee-extension-radiostationfetcher (>= ${source:Version}),
+ banshee-extension-randombylastfm (>= ${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
@@@ -81,6 -88,28 +84,17 @@@ Description: Alarm extension for Banshe
.
Banshee is a media management and playback application for the GNOME desktop.
+ Package: banshee-extension-ampache
+ Architecture: all
+ Depends: banshee-extensions-common (= ${source:Version}),
+ ${cli:Depends}, ${misc:Depends}
+ Description: Ampache extension for Banshee
+ This package provides integration for Banshee with the Ampache web-based audio
+ file management system, allowing Banshee to act as a frontend for Ampache
+ servers.
+ .
+ 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,6 -131,17 +116,17 @@@ Description: Cover wallpaper extension
.
Banshee is a media management and playback application for the GNOME desktop.
+ Package: banshee-extension-lastfmfingerprint
+ Architecture: any
+ Depends: banshee-extensions-common (= ${source:Version}),
+ ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends}
+ Description: Last.FM fingerprinting extension for Banshee
+ This package provides additional integration between Last.FM and Banshee,
+ allowing Banshee to automatically generate and audio fingerprint and correct
+ your metadata by querying Last.FM for the correct metadata.
+ .
+ Banshee is a media maangement and playback application for the GNOME dekstop.
+
Package: banshee-extension-lcd
Architecture: all
Depends: banshee-extensions-common (= ${source:Version}),
@@@ -208,6 -248,18 +233,18 @@@ Description: radio station fetcher exte
.
Banshee is a media management and playback application for the GNOME desktop.
+ Package: banshee-extension-randombylastfm
+ Architecture: all
+ Depends: banshee-extensions-common (= ${source:Version}),
+ ${cli:Depends}, ${misc:Depends}
+ Description: Random By Last.FM extension for Banshee
+ This package provide additional integration between Last.FM and Banshee,
+ providing a new random mode which queries Last.FM for a list of similar artists
+ to the song you are currently playing, then compares that list with your
+ library to pick only artists that match.
+ .
+ Banshee is a media management and playback application for the GNOME desktop.
+
Package: banshee-extension-streamrecorder
Architecture: all
Depends: banshee-extensions-common (= ${source:Version}),
@@@ -247,3 -299,12 +284,3 @@@ 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/rules
index e228dc5,a92d16e..64e1e39
--- a/debian/rules
+++ b/debian/rules
@@@ -12,10 -12,12 +12,12 @@@ override_dh_auto_configure
--enable-gnome \
--enable-schemas-install \
--enable-alarmclock \
+ --enable-ampache \
- --enable-appindicator \
+ --disable-appindicator \
--enable-awn \
--disable-clutterflow \
--enable-coverwallpaper \
+ --enable-lastfmfingerprint \
--enable-lcd \
--enable-lirc \
--enable-lyrics \
@@@ -24,13 -26,14 +26,14 @@@
--enable-mirage \
--enable-openvp \
--enable-radiostationfetcher \
+ --enable-randombylastfm \
--disable-soundmenu \
--enable-streamrecorder \
--enable-telepathy \
- --enable-ubuntuonemusicstore \
+ --disable-ubuntuonemusicstore \
--disable-shave \
--enable-user-help \
- MCS=/usr/bin/mono-csc
+ MCS=/usr/bin/csc
override_dh_gencontrol:
for pkg in `sed -n 's/^Package: //p' debian/control`; do \
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list