[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/2.1.1-2-93-g9093265
Iain Lane
laney at debian.org
Sun Jun 26 12:51:08 UTC 2011
The following commit has been merged in the ubuntu branch:
commit c0b38754fc38be0008630d456e3c92729831855f
Merge: fe4706227fc5712bc9aec8dae68ca5d432471292 84d5ae4d02d91e63ebae35f39f7dda4521673623
Author: Iain Lane <laney at debian.org>
Date: Sun Jun 26 13:15:14 2011 +0100
Merge branch 'experimental' into ubuntu
Conflicts:
debian/gbp.conf
diff --combined debian/changelog
index 56ae239,107b096..f45c96c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,53 +1,60 @@@
+ banshee-community-extensions (2.1.1-2) experimental; urgency=low
+
+ * No-change rebuild vs. new zeitgeist-sharp ABI
+
+ -- Iain Lane <laney at debian.org> Fri, 17 Jun 2011 15:31:08 +0100
+
+ banshee-community-extensions (2.1.1-1) experimental; urgency=low
+
+ * [39d331d] Fix pushd usage inside Makefile
+ * [2b7eac6] Imported Upstream version 2.1.1:
+ + Enhancements since 2.0.0:
+ - Use dbus-sharp instead of ndesk-dbus. The Telepathy extension does not
+ bundle the ndesk-dbus sources anymore.
+ - ClutterFlow: Major refactoring and code cleanup, for better readability.
+ + Notable bugs fixed since 2.0.0:
+ - ClutterFlow: Fix NRE crash (bgo#647134)
+ - Karaoke: add an gst_init() call to make sure gstreamer is working
+ - Karaoke: fix NRE on dispose if audiokaraoke was not found
+ - LastfmFingerprint: Don't strdup strings
+ - LastfmFingerprint: Fix empty name exception (bgo#648168)
+ - Lirc: Drop liblirc_client.so moduleref (LP: #773686)
+ - LiveRadio: Re-enable ShoutCast with request structure from
+ RadioStationFetcher
+ - Lyrics: Always update pane title when track changes (bgo#647108)
+ - RadioStationFetcher: Updated the shoutcast plugin to fix the IP address
+ - ZeitgeistDataprovider: Register dataprovider in DataSource Registry
+ (LP: #691842)
+ - ZeitgeistDataprovider: Differenciate between ScheduledActivity and
+ UserActivity (LP: #748120)
+ * [b28fd78] Drop upstreamed patches
+ * Fix unresolved modulerefs with cli-common-dev 0.8 (Closes: #627384)
+ + [0787020] Exclude libgdk-win32 moduleref
+ + [597f885] Cherry-pick liblastfmfpbridge dllmap
+ + [94a7827] Exclude glibsharpglue-2 moduleref
+ + [f042731] Cherry-pick patch to fix gstreamer dllimport
+ * [b83b3e2] Use dh_gencontrol -- -V for substvars
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 14 Jun 2011 02:31:33 +0800
+
+ banshee-community-extensions (2.0.1-2) UNRELEASED; urgency=low
+
+ * [ea79349] Build-dep on dbus# instead of ndesk-dbus
+ * [353fb83] Forward port to DBus#
+ * [98b5b34] Add autoreconf
+ * [a83884a] Bump build-dep on Banshee to 2.1.0
+ * [0f06608] Backport upstream patch to fix autoreconf
+ * [e1773a6] Use upstream autogen.sh with dh_autoreconf
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 28 May 2011 19:34:16 +0800
+
+banshee-community-extensions (2.0.1-1ubuntu1) oneiric; urgency=low
+
+ * [6a83a31] Merge from Debian Unstable, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 07 May 2011 17:12:01 +0800
+
banshee-community-extensions (2.0.1-1) unstable; urgency=low
* [c02b8fd] Move over to bz2 in debian/watch
@@@ -27,28 -70,12 +77,28 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 05 May 2011 06:59:58 +0800
+banshee-community-extensions (2.0.0-2ubuntu1) natty; urgency=low
+
+ * [4914145] Merge from Debian Unstable, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+ * [11e40ce] Drop explicit banshee depends from -lirc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:11:26 +0800
+
banshee-community-extensions (2.0.0-2) unstable; urgency=low
* [44303f2] Add Enhances: banshee to b-c-e (LP: #758526)
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 27 Apr 2011 22:55:21 +0800
+banshee-community-extensions (2.0.0-1ubuntu1) natty; urgency=low
+
+ * [36d8c92] Merge from Debian Unstable, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+ * [11e40ce] Drop explicit banshee depends from -lirc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:11:26 +0800
+
banshee-community-extensions (2.0.0-1) unstable; urgency=low
* [b1cf183] New upstream release
@@@ -58,13 -85,6 +108,13 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:00:13 +0800
+banshee-community-extensions (1.9.6-1ubuntu1) natty; urgency=low
+
+ * [ceb501c] Merge from Debian Unstable, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 22:21:22 +0800
+
banshee-community-extensions (1.9.6-1) unstable; urgency=low
* [9bb7ba5] New upstream release:
@@@ -81,13 -101,6 +131,13 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 27 Mar 2011 04:32:23 +0800
+banshee-community-extensions (1.9.5-1ubuntu1) natty; urgency=low
+
+ * Merge from Debian Unstable, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 22:21:22 +0800
+
banshee-community-extensions (1.9.5-1) unstable; urgency=low
* [aea54e9] New upstream release:
@@@ -105,13 -118,6 +155,13 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 21:50:31 +0800
+banshee-community-extensions (1.9.3-1ubuntu1) natty; urgency=low
+
+ * [a5570d7] Merge from Debian Experimental, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 01 Mar 2011 01:54:03 +0800
+
banshee-community-extensions (1.9.3-1) unstable; urgency=low
* [2d6dcff] New upstream release:
@@@ -132,13 -138,6 +182,13 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 20 Feb 2011 16:48:42 +0800
+banshee-community-extensions (1.9.2-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 14 Jan 2011 01:58:33 +0800
+
banshee-community-extensions (1.9.2-1) UNRELEASED; urgency=low
* [280f6c6] Enable Clutterflow
@@@ -154,13 -153,6 +204,13 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 19 Jan 2011 22:03:57 +0800
+banshee-community-extensions (1.9.1-1ubuntu1) natty; 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) experimental; urgency=low
[ Chow Loong Jin ]
@@@ -206,22 -198,6 +256,22 @@@
-- 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) 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
@@@ -246,14 -222,6 +296,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
@@@ -264,13 -232,7 +314,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:
@@@ -290,19 -252,6 +340,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
@@@ -354,14 -303,6 +404,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:
@@@ -390,52 -331,6 +440,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 4888bcd,19d2958..9c51214
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,17 +1,19 @@@
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,
+ dh-autoreconf,
+ libgconf2-dev,
lsb-release,
- banshee (>= 1.9.6),
+ banshee (>= 2.1.0),
pkg-config,
+ liblircclient-dev (>= 0.8.6),
libglib2.0-dev,
libfftw3-dev,
libsqlite3-dev (>= 3.3),
@@@ -23,11 -23,10 +25,11 @@@
libglib2.0-cil-dev,
libgtk2.0-cil-dev,
libtaglib-cil-dev,
- libndesk-dbus-glib1.0-cil-dev,
- libndesk-dbus1.0-cil-dev,
+ libdbus-glib1.0-cil-dev,
+ libdbus1.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),
@@@ -46,14 -45,12 +48,14 @@@ Architecture: al
Enhances: banshee
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-clutterflow (>= ${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}),
@@@ -106,17 -103,6 +108,17 @@@ 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
@@@ -198,17 -184,6 +200,17 @@@ 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-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
diff --combined debian/rules
index 60036e8,181fd58..31d650f
--- a/debian/rules
+++ b/debian/rules
@@@ -5,6 -5,10 +5,10 @@@ include /usr/share/cli-common/cli.mak
BANSHEE_VERSION = $(shell pkg-config --modversion banshee-thickclient)
+ override_dh_autoreconf:
+ ln -s debian/autogen.sh
+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
# disable zeitgeistdataprovider and lirc due to dependencies missing
override_dh_auto_configure:
dh_auto_configure -- \
@@@ -13,7 -17,7 +17,7 @@@
--enable-schemas-install \
--enable-alarmclock \
--enable-ampache \
- --disable-appindicator \
+ --enable-appindicator \
--enable-awn \
--enable-clutterflow \
--enable-coverwallpaper \
@@@ -21,7 -25,7 +25,7 @@@
--enable-karaoke \
--enable-lastfmfingerprint \
--enable-lcd \
- --disable-lirc \
+ --enable-lirc \
--enable-lyrics \
--enable-liveradio \
--enable-magnatune \
@@@ -41,13 -45,15 +45,15 @@@ override_dh_auto_install
find debian/tmp -name '*.la' -o -name '*.a' -delete
override_dh_gencontrol:
- for pkg in `sed -n 's/^Package: //p' debian/control`; do \
- echo "banshee:Version=$(BANSHEE_VERSION)" >> debian/$$pkg.substvars; \
- done
- dh_gencontrol
+ dh_gencontrol -- -Vbanshee:Version=$(BANSHEE_VERSION)
override_dh_makeclilibs: # do nothing -- we do not want clilibs to come
# from anything, and especially not clutterflow.
+ override_dh_clideps:
+ dh_clideps \
+ --exclude-moduleref=libgdk-win32-2.0-0.dll \
+ --exclude-moduleref=glibsharpglue-2
+
%:
- dh $@
+ dh --with=autoreconf $@
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list