[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/unstable/karmic, updated. debian/1.9.0-1ubuntu2-84-g549a97b
Chow Loong Jin
hyperair at ubuntu.com
Sun Dec 26 11:22:33 UTC 2010
The following commit has been merged in the ppa/unstable/karmic branch:
commit af6d8aed83ff704170e2dcc2ad6d031c81fc1506
Merge: 9491bda3027993079663f4329178d5fd8cc0262b c1fd317f15e2b565f8dc552bf53b2826de211744
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sun Dec 26 19:02:11 2010 +0800
Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
Conflicts:
debian/control
debian/rules
diff --combined debian/changelog
index 3a05d3a,70667af..74027e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,81 +1,89 @@@
+ banshee-community-extensions (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 26 Dec 2010 18:53:29 +0800
+
+ banshee-community-extensions (1.9.1-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 26 Dec 2010 17:55:47 +0800
+
+ banshee-community-extensions (1.9.1-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 26 Dec 2010 17:54:45 +0800
+
+ banshee-community-extensions (1.9.1-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 26 Dec 2010 17:09:32 +0800
+
+ banshee-community-extensions (1.9.1-1) UNRELEASED; urgency=low
+
+ [ Chow Loong Jin ]
+ * debian/control: Add Enhances: banshee to all extension packages
+ (LP: #629532)
+ * [28fde95] Drop copyright entries for soundmenu and u1ms
+ * [fbb88b5] Add Jamendo and ZeitgeistDP copyright entries
+ * [b50ae88] Drop U1MS install file
+ * [cd5cbff] Drop trailing , from last recommends of bce
+
+ [ 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
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 26 Dec 2010 17:06:06 +0800
+
+ 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~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> Fri, 12 Nov 2010 18:07:42 +0800
+
banshee-community-extensions (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Merge from Maverick, remaining changes:
@@@ -27,15 -97,15 +105,15 @@@ banshee-community-extensions (1.9.0-1ub
-- 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
+ 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> Fri, 12 Nov 2010 15:02:36 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 18 Nov 2010 02:50:07 +0800
- banshee-community-extensions (1.9.0-1) UNRELEASED; urgency=low
+ banshee-community-extensions (1.9.0-1) experimental; urgency=low
* New upstream release
+ New extensions
@@@ -59,14 -129,6 +137,14 @@@
-- 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:
@@@ -99,26 -161,18 +177,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
@@@ -145,22 -199,6 +223,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
@@@ -170,6 -208,13 +248,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
@@@ -295,15 -340,6 +373,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 6ea4e32,e868a93..82f3a57
--- 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.9.0),
+ banshee (>= 1.9.1),
pkg-config,
liblircclient-dev (>= 0.8.6),
libglib2.0-dev,
@@@ -19,19 -19,20 +19,19 @@@
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,
- 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),
+ 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
@@@ -41,8 -42,10 +41,9 @@@ 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}),
@@@ -54,7 -57,7 +55,7 @@@
banshee-extension-radiostationfetcher (>= ${source:Version}),
banshee-extension-randombylastfm (>= ${source:Version}),
banshee-extension-streamrecorder (>= ${source:Version}),
- banshee-extension-telepathy (>= ${source:Version}),
+ banshee-extension-telepathy (>= ${source:Version})
Depends: banshee-extensions-common (= ${source:Version}),
${misc:Depends}
Description: set of community contributed extensions for Banshee
@@@ -71,6 -74,7 +72,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}
@@@ -85,6 -89,7 +87,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}
@@@ -95,7 -100,19 +98,8 @@@ 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}
@@@ -107,6 -124,7 +111,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}
@@@ -116,7 -134,21 +121,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}
@@@ -128,6 -160,7 +147,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,
@@@ -151,6 -184,7 +171,7 @@@ Description: LIRC integration extensio
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}
@@@ -171,6 -205,7 +192,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}
@@@ -185,6 -220,7 +207,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}
@@@ -194,6 -230,7 +217,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}
@@@ -212,6 -249,7 +236,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}
@@@ -222,6 -260,7 +247,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}
@@@ -234,6 -273,7 +260,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}
@@@ -246,6 -286,7 +273,7 @@@ Description: Random By Last.FM extensio
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}
@@@ -261,6 -302,7 +289,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),
diff --combined debian/rules
index 64e1e39,b67a845..65d714b
--- a/debian/rules
+++ b/debian/rules
@@@ -13,10 -13,11 +13,11 @@@ override_dh_auto_configure
--enable-schemas-install \
--enable-alarmclock \
--enable-ampache \
- --enable-appindicator \
+ --disable-appindicator \
--enable-awn \
--disable-clutterflow \
--enable-coverwallpaper \
+ --enable-jamendo \
--enable-lastfmfingerprint \
--enable-lcd \
--enable-lirc \
@@@ -27,13 -28,12 +28,12 @@@
--enable-openvp \
--enable-radiostationfetcher \
--enable-randombylastfm \
- --disable-soundmenu \
--enable-streamrecorder \
--enable-telepathy \
- --disable-ubuntuonemusicstore \
+ --disable-zeitgeistdataprovider \
--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