[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/maverick, updated. ppa/2.3.4.ds-1ubuntu2_hyper1+maverick-17-ge6028ce
Chow Loong Jin
hyperair at debian.org
Sun Feb 19 06:54:57 UTC 2012
The following commit has been merged in the ppa/unstable/maverick branch:
commit dee2c78b8ee489afd54f19f066351b195b956a40
Merge: c5bae841c5009c24be94519ab41f217c7fb06111 54491c1a2a7029814c458dc98c2255be57abcb9a
Author: Chow Loong Jin <hyperair at debian.org>
Date: Sun Feb 19 14:42:40 2012 +0800
Merge branch 'ppa/unstable/natty' into ppa/unstable/maverick
diff --combined debian/changelog
index edbe1bf,22b7dae..ca6e2a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,66 +1,72 @@@
+ banshee (2.3.5-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * Backport to natty
+
+ -- Chow Loong Jin <hyperair at debian.org> Sun, 19 Feb 2012 13:43:37 +0800
+
+ banshee (2.3.5-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
+
+ * Merge from Precise PPA, remaining changes:
+ + [e48edba] Revert "Disable Ubuntu One extension"
+ This reverts commit 84062006bee1d118e40322a1561b88130f67618d.
+ + [3a43003] Revert "Revert "Lower mono-addins build-dep to 0.6-1-2~
+ (0.6.2 not packaged yet)""
+ This reverts commit 2ccd32314aac46bc98fb5400be6595063ad1c7c1.
+
+ -- Chow Loong Jin <hyperair at debian.org> Sun, 19 Feb 2012 13:41:25 +0800
+
+ banshee (2.3.5-1ubuntu1~hyper1+precise) precise; urgency=low
+
+ * Merge from Ubuntu Precise, remaining changes:
+ + Re-enable boo and karma
+ + Drop amazon URL patch
+
+ -- Chow Loong Jin <hyperair at debian.org> Sun, 19 Feb 2012 13:37:15 +0800
+
+ banshee (2.3.5-1ubuntu1) precise; urgency=low
+
+ * Merge from Debian Experimental, remaining changes:
+ + Enable and recommend SoundMenu and Disable NotificationArea by default
+ + Disable boo and karma extensions
+ + Move desktop file for Meego UI to /usr/share/une/applications
+ + Change the url for the Amazon store redirector
+
+ -- Chow Loong Jin <hyperair at debian.org> Sat, 18 Feb 2012 22:17:24 +0800
+
+ banshee (2.3.5-1) experimental; urgency=low
+
+ * [e79ef58] Imported Upstream version 2.3.5:
+ + New features:
+ - UPnP support
+ Browse and play music or videos shared over your local network
+ by UPnP device.
+ + Enhancements:
+ - bgo#587964: Dap: Add support for DOS folder separator in playlists
+ - bgo#548636: Lastfm: Use one standard directory for last.fm caching
+ - Add option to hide the artist filter
+ - Add a Composer filter in the SearchEntry filter menu
+ - MusicBrainz: Enable FreeBSD support
+ - AudioscrobblerConnection: Add logging for last.fm scrobbler
+ + Notable Bugs Fixed (5 fixed since 2.3.4):
+ - Fix MusicBrainz dllmap for cross-architecture support
+ - LibraryWatcher: Catch and log exception when processing changes
+ - Improve readability of the Last.fm user guide page
+ - Prevent missing icons in the source tarball
+ * [93c81cd] Add libmono-upnp-cil-dev to build-dep for DLNA
+ * [b90b9f3] Enable DLNA support in configure
+ * [5dba058] Update missing configure flags.
+ * Drop --disable-builtin-equalizer. The option has been removed.
+ * Add --enable-gio-hardware. It was enabled by automagic before.
+ * [0677418] Refresh winmm patch and drop Makefile.in hunks
+
+ -- Chow Loong Jin <hyperair at debian.org> Fri, 17 Feb 2012 08:13:32 +0800
+
+banshee (2.3.4.ds-1ubuntu2~hyper1+maverick) maverick; urgency=low
+
+ * Backport to maverick
+
+ -- Chow Loong Jin <hyperair at debian.org> Sun, 12 Feb 2012 01:56:26 +0800
+
banshee (2.3.4.ds-1ubuntu2~hyper1+natty) natty; urgency=low
* Backport to Natty
@@@ -259,15 -316,6 +322,15 @@@ banshee (2.1.3-1ubuntu1~hyper1+natty) n
-- Chow Loong Jin <hyperair at ubuntu.com> Tue, 30 Aug 2011 02:07:42 +0800
+banshee (2.1.3-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+ - [1e7ce76] Disable U1MS
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 30 Aug 2011 02:23:25 +0800
+
banshee (2.1.3-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
* Merge from Ubuntu Oneiric, remaining changes:
@@@ -384,15 -432,6 +447,15 @@@ banshee (2.1.0-1ubuntu1~hyper1+natty) n
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 14 May 2011 22:34:56 +0800
+banshee (2.1.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+ * [1e7ce76] Disable U1MS
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 15 May 2011 00:52:25 +0800
+
banshee (2.1.0-1) experimental; urgency=low
* [6b1b0d2] New upstream release:
@@@ -579,14 -618,6 +642,14 @@@ banshee (2.0.0-1ubuntu2) natty; urgency
-- Rodney Dawes <rodney.dawes at canonical.com> Fri, 08 Apr 2011 23:37:37 -0400
+banshee (2.0.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:26:15 +0800
+
banshee (2.0.0-1ubuntu1~hyper1+natty) natty; urgency=low
* [ad4cbef] Merge from Ubuntu Natty, remaining changes:
@@@ -627,14 -658,6 +690,14 @@@ banshee (2.0.0-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 06 Apr 2011 18:14:27 +0800
+banshee (1.9.6-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 25 Mar 2011 22:19:37 +0800
+
banshee (1.9.6-1ubuntu1~hyper1+natty) natty; urgency=low
* [bd79546] Merge from Ubuntu Natty, remaining changes:
@@@ -690,14 -713,6 +753,14 @@@ banshee (1.9.6-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 26 Mar 2011 00:48:41 +0800
+banshee (1.9.5-1ubuntu1~hyper1+maverick1) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Mar 2011 19:50:54 +0800
+
banshee (1.9.5-1ubuntu1~hyper1+natty1) natty; urgency=low
* [a55ea97] Revert "Disable Boo support and remove build dependency"
@@@ -705,14 -720,6 +768,14 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Mar 2011 19:46:33 +0800
+banshee (1.9.5-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 01:56:41 +0800
+
banshee (1.9.5-1ubuntu1~hyper1+natty) natty; urgency=low
* Backport to natty
@@@ -757,14 -764,6 +820,14 @@@ banshee (1.9.4-1ubuntu2) natty; urgency
-- Rodney Dawes <rodney.dawes at ubuntu.com> Mon, 28 Feb 2011 14:06:16 -0500
+banshee (1.9.4-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 24 Feb 2011 01:53:11 +0800
+
banshee (1.9.4-1ubuntu1~hyper1+natty) natty; urgency=low
* No change upload to PPA
@@@ -817,13 -816,6 +880,13 @@@ banshee (1.9.3-2) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Feb 2011 18:53:16 +0800
+banshee (1.9.3-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ * [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 03 Feb 2011 23:06:42 +0800
+
banshee (1.9.3-1ubuntu1~hyper1+natty) natty; urgency=low
* No change upload to PPA
@@@ -877,12 -869,6 +940,12 @@@ banshee (1.9.2-1ubuntu1) natty; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 24 Jan 2011 22:17:31 +0800
+banshee (1.9.2-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 14 Jan 2011 00:38:09 +0800
+
banshee (1.9.2-1ubuntu1~hyper1+natty) natty; urgency=low
* No change backport to PPA
@@@ -937,12 -923,6 +1000,12 @@@ banshee (1.9.1-1ubuntu3) natty; urgency
-- Robert Ancell <robert.ancell at canonical.com> Mon, 10 Jan 2011 15:37:55 -0600
+banshee (1.9.1-1ubuntu2~hyper1+maverick) maverick; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 27 Dec 2010 11:12:33 +0800
+
banshee (1.9.1-1ubuntu2) natty; urgency=low
* [f1bb0cf] Enable SoundMenu by default
@@@ -955,12 -935,6 +1018,12 @@@ banshee (1.9.1-1ubuntu2~hyper1+natty) n
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 27 Dec 2010 11:07:40 +0800
+banshee (1.9.1-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 24 Dec 2010 21:34:25 +0800
+
banshee (1.9.1-1ubuntu1) natty; urgency=low
* Merge from Debian experimental, remaining changes:
@@@ -1076,12 -1050,6 +1139,12 @@@ banshee (1.9.0+git20101121.r1.b13266e-0
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 21 Nov 2010 12:21:02 +0800
+banshee (1.9.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Backport to Maverick
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 01:21:16 +0800
+
banshee (1.9.0-1ubuntu1) natty; urgency=low
* Merge from Debian experimental, remaining changes:
@@@ -1159,12 -1127,6 +1222,12 @@@ banshee (1.8.0-2ubuntu1) natty; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 22 Oct 2010 01:53:21 +0800
+banshee (1.8.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change upload to Maverick PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 03:40:04 +0800
+
banshee (1.8.0-2) experimental; urgency=low
* Fix duplicates on import (BGO #623441)
@@@ -1331,12 -1293,6 +1394,12 @@@ banshee (1.7.5-0ubuntu1) maverick; urge
-- Iain Lane <laney at ubuntu.com> Mon, 06 Sep 2010 20:05:45 +0100
+banshee (1.7.4-1ubuntu1~maverick1) maverick; urgency=low
+
+ * No change backport to Maverick
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 13 Aug 2010 17:45:50 +0800
+
banshee (1.7.4-1ubuntu1) maverick; urgency=low
* Merge from Debian experimental, remaining changes:
@@@ -1594,12 -1550,6 +1657,12 @@@ banshee (1.7.2-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Jul 2010 02:21:03 +0800
+banshee (1.7.2-1~hyper1+maverick) maverick; urgency=low
+
+ * No change upload to Maverick PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Jul 2010 13:05:01 +0800
+
banshee (1.7.1-1ubuntu1) maverick; urgency=low
* Enhance netbook interface:
@@@ -1654,18 -1604,6 +1717,18 @@@ banshee (1.7.1-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 27 May 2010 18:14:20 +0800
+banshee (1.7.1-1~hyper1~maverick1) maverick; urgency=low
+
+ * Split MeeGo out into its own package
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 31 May 2010 21:03:52 +0800
+
+banshee (1.7.1-1~hyper1~maverick) maverick; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 01:41:45 +0800
+
banshee (1.7.0-1) experimental; urgency=low
* New upstream release:
diff --combined debian/control
index 538e741,368b640..e90a07f
--- a/debian/control
+++ b/debian/control
@@@ -26,8 -26,8 +26,8 @@@ Build-Depends: debhelper (>= 7.0.50)
libgio2.0-cil-dev (>= 2.22.3-1~),
libgtk-sharp-beans2.0-cil-dev (>= 2.8),
libgpod-cil-dev (>= 0.7.95),
+ libindicate0.1-cil-dev (>= 0.4.1),
libkarma-cil-dev (>= 0.0.5),
- libubuntuone1.0-cil-dev (>= 0.9.2),
libwebkitgtk-dev (>= 1.2.2) | libwebkit-dev (>= 1.2.2),
libsoup2.4-dev (>= 2.26),
libsoup-gnome2.4-dev (>= 2.26),
@@@ -47,7 -47,8 +47,8 @@@
libgstreamer0.10-dev (>= 0.10.26),
libgstreamer-plugins-base0.10-dev (>= 0.10.26),
gnome-doc-utils (>= 0.17.3),
- libgnome-desktop-dev
+ libgnome-desktop-dev,
+ libmono-upnp-cil-dev (>= 0.1)
Standards-Version: 3.9.2
Homepage: http://www.banshee.fm
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
@@@ -97,6 -98,23 +98,6 @@@ Description: Media Management and Playb
.
This package contains Banshee's support for the Sound Menu
-Package: banshee-extension-ubuntuonemusicstore
-Architecture: any
-Depends: banshee (>= ${source:Upstream-Version}),
- ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
- libubuntuone1.0-cil (>= 0.9.2)
-Enhances: banshee
-Description: Media Management and Playback application - U1MS extension
- Banshee is a media management and playback application for the GNOME
- desktop, allowing users to import audio from CDs, search their library,
- create playlists of selections of their library, sync music to/from iPods
- and other media devices, play and manage video files and burn selections
- to a CD.
- .
- This package contains Banshee's support for the Ubuntu One Music Store
-
Package: banshee-meego
Architecture: any
Depends: banshee (= ${binary:Version}),
diff --combined debian/rules
index edb0d25,e3cb34c..758fd47
--- a/debian/rules
+++ b/debian/rules
@@@ -12,13 -12,14 +12,14 @@@ CONFFLAGS =
--disable-tests \
--with-vendor-build-id="`lsb_release -ds`" \
--disable-clutter \
- --disable-builtin-equalizer \
--disable-gst-sharp \
--enable-user-help \
--enable-docs \
--enable-youtube \
--enable-gio \
+ --enable-gio-hardware \
--disable-moonlight \
+ --enable-upnp \
--enable-gnome \
--enable-schemas-install \
--enable-mtp \
@@@ -37,7 -38,7 +38,7 @@@ CONFFLAGS +=
--enable-boo \
--enable-karma \
--enable-soundmenu \
- --enable-ubuntuone
+ --disable-ubuntuone
else
CONFFLAGS += \
--enable-boo \
@@@ -82,7 -83,8 +83,7 @@@ override_dh_install
debian/banshee/usr/share/dbus-1/services/com.meego*
ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
# Remove U1MS and Sound Menu stuff from banshee
- rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.* \
- debian/banshee/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
+ rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.*
cd po; intltool-update --pot
for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
--
banshee
More information about the Pkg-cli-apps-commits
mailing list