[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/natty, updated. debian/2.0.0-2ubuntu1-44-g876aa7a
Chow Loong Jin
hyperair at ubuntu.com
Fri May 6 09:08:54 UTC 2011
The following commit has been merged in the ppa/natty branch:
commit b0e67d08094be39ba041862712ad0219aac22a77
Merge: 0de0fc763f4659133a5c4ddddd4764b6c0f89f6c 9b17c17cbdd20278e0c98c9e5f78c6c696aa7bdf
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Thu May 5 10:02:38 2011 +0800
Merge branch 'ubuntu/oneiric' into ppa/oneiric
Conflicts:
debian/gbp.conf
debian/patches/90_amazon_url.patch
debian/patches/series
diff --combined debian/changelog
index dd2e15f,71b39de..f9423ca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,66 +1,76 @@@
+ banshee (2.0.1-1ubuntu1) UNRELEASED; urgency=low
+
+ * [327a8d2] Merge from Debian Unstable, remaining changes:
+ + Enable SoundMenu and Disable NotificationArea by default
+ + Disable boo and karma extensions
+ + Enable and recommnd u1ms and soundmenu extensions
+ + Move desktop file for Meego UI to /usr/share/une/applications
+ + Change the url for the Amazon store redirector
+ + Create the U1MS widget earlier and bump libu1 requirement
+ * [2ca3f6a] Refresh 90_amazon_url.patch
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 03 May 2011 21:50:10 +0800
+
+ banshee (2.0.1-1) UNRELEASED; urgency=low
+
+ * [5f2e8a7] Switch over to bz2 in debian/watch
+ * [5dcec7d] New upstream release:
+ + AmazonMp3.Store: Fix signed-in detection for UK store
+ + PodcastFeedPropertiesDialog: Fix display of feed URL (underscore)
+ + bgo#648941: Add .spc to whitelist
+ + bgo#648458: PlsPlaylistFormat: Make parsing the header case+insensitive
+ + bgo#647754: Add USB ids for Xperia X12
+ + bgo#647024: Lastfm: Fix NRE crash
+ + bgo#646991: AlbumListView: Fix disappearing option in Preferences
+ + bgo#647932: DatabaseSource: Fix NRE in SkipTrackIfRemoved
+ + bgo#642140: Last.fm: Close HTTP streams when finished with them
+ + bgo#633552: AppleDevice: Ensure m4a/mp3 are supported
+ + bgo#647144: StreamPositionLabel: Avoid unnecessary redraws
+ + bgo#647089: Daap: Bind to IPAddress.Loopback instead of Any (LP: #753986)
+ + bgo#647059: Fix Remote Daap crash
+ * [5bd47d1] Drop upstreamed 10_bind-to-loopback-for-daap
+ * [a853ad8] Drop upstreamed 11_reduce_cpu_usage.patch
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 03 May 2011 21:42:30 +0800
+
+ banshee (2.0.0-2ubuntu1) natty; urgency=low
+
+ * [d07fe37] Merge from Debian Unstable, remaining changes:
+ + Enable SoundMenu and Disable NotificationArea by default
+ + Disable boo and karma extensions
+ + Enable and recommnd u1ms and soundmenu extensions
+ + Move desktop file for Meego UI to /usr/share/une/applications
+ + Change the url for the Amazon store redirector
+ + Create the U1MS widget earlier and bump libu1 requirement
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 18 Apr 2011 11:38:56 +0800
+
+ banshee (2.0.0-2) unstable; urgency=low
+
+ [ Chow Loong Jin ]
+ * [8ee2dd2] Set compression to bz2
+ * [0ffc007] Disable dh_makeclilibs
+ * [a9bdd15] Update copyright file to dep-5
+ * [8c123e8] Don't enable librarywatcher by default (LP: #760902, #622313)
+ * [0d952b6] Refresh 08_remove_unrelevant_media.patch
+
+ [ Christopher James Halse Rogers ]
+ * [5809dc3] Cherry-pick CPU-usage reduction patches from stable-2.0
+ * [920dd3e] Bump GIO# build-depend to ensure we build against the fixed
+ package
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 16 Apr 2011 18:51:30 +0800
+
+banshee (2.0.0-1ubuntu3~hyper1+natty) natty; urgency=low
+
+ * [ea7cf01] Merge from Ubuntu Natty, remaining changes:
+ + [a55ea97] Revert "Disable Boo support and remove build dependency"
+ + [7fb44c9] Revert "Temporarily disable Rio Karma support until libkarma is
+ back in shape"
+ * [953736e] Revert amazon url change for PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 12 Apr 2011 21:17:06 +0800
+
banshee (2.0.0-1ubuntu3) natty; urgency=low
* 11_reduce_cpu_usage.patch:
@@@ -17,16 -70,6 +80,16 @@@
-- Christopher James Halse Rogers <raof at ubuntu.com> Mon, 11 Apr 2011 18:14:48 +1000
+banshee (2.0.0-1ubuntu2+hyper1+natty) natty; urgency=low
+
+ * [0e3de76] Merge from Ubuntu Natty, remaining changes:
+ + [a55ea97] Revert "Disable Boo support and remove build dependency"
+ + [7fb44c9] Revert "Temporarily disable Rio Karma support until libkarma is
+ back in shape"
+ * [953736e] Revert amazon url change for PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 09 Apr 2011 22:02:05 +0800
+
banshee (2.0.0-1ubuntu2) natty; urgency=low
* 90_amazon_url.patch:
@@@ -37,15 -80,6 +100,15 @@@
-- Rodney Dawes <rodney.dawes at canonical.com> Fri, 08 Apr 2011 23:37:37 -0400
+banshee (2.0.0-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * [ad4cbef] Merge from Ubuntu Natty, remaining changes:
+ + [a55ea97] Revert "Disable Boo support and remove build dependency"
+ + [7fb44c9] Revert "Temporarily disable Rio Karma support until libkarma is
+ back in shape"
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:24:51 +0800
+
banshee (2.0.0-1ubuntu1) natty; urgency=low
* Merge from Debian Unstable, remaining changes:
@@@ -77,15 -111,6 +140,15 @@@ 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+natty) natty; urgency=low
+
+ * [bd79546] Merge from Ubuntu Natty, remaining changes:
+ + [a55ea97] Revert "Disable Boo support and remove build dependency"
+ + [7fb44c9] Revert "Temporarily disable Rio Karma support until libkarma is
+ back in shape"
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 25 Mar 2011 21:36:01 +0800
+
banshee (1.9.6-1ubuntu1) natty; urgency=low
* Merge from Debian Unstable, remaining changes:
@@@ -132,19 -157,6 +195,19 @@@ 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+natty1) natty; urgency=low
+
+ * [a55ea97] Revert "Disable Boo support and remove build dependency"
+ * [7fb44c9] Revert "Temporarily disable Rio Karma support until libkarma is back in shape"
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Mar 2011 19:46:33 +0800
+
+banshee (1.9.5-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * Backport to natty
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 01:55:30 +0800
+
banshee (1.9.5-1ubuntu1) natty; urgency=low
* Merge from Debian Unstable, remaining changes:
@@@ -183,12 -195,6 +246,12 @@@ 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+natty) natty; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 24 Feb 2011 01:51:13 +0800
+
banshee (1.9.4-1ubuntu1) natty; urgency=low
* Merge from Debian Experimental, remaining changes:
@@@ -235,12 -241,6 +298,12 @@@ 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+natty) natty; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 03 Feb 2011 22:17:53 +0800
+
banshee (1.9.3-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian Experimental, remaining changes:
@@@ -288,12 -288,6 +351,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+natty) natty; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 14 Jan 2011 00:35:43 +0800
+
banshee (1.9.2-1) experimental; urgency=low
* [df82d8d] Add libgnome-desktop-dev build-dep
@@@ -348,12 -342,6 +411,12 @@@ banshee (1.9.1-1ubuntu2) natty; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 27 Dec 2010 10:59:06 +0800
+banshee (1.9.1-1ubuntu2~hyper1+natty) natty; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 27 Dec 2010 11:07:40 +0800
+
banshee (1.9.1-1ubuntu1) natty; urgency=low
* Merge from Debian experimental, remaining changes:
@@@ -364,12 -352,6 +427,12 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Tue, 21 Dec 2010 13:22:57 +0800
+banshee (1.9.1-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 24 Dec 2010 21:21:47 +0800
+
banshee (1.9.1-1) experimental; urgency=low
[ Chow Loong Jin ]
@@@ -479,12 -461,6 +542,12 @@@ banshee (1.9.0-1ubuntu1) natty; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 18 Nov 2010 02:31:18 +0800
+banshee (1.9.0-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 01:15:49 +0800
+
banshee (1.9.0-1) experimental; urgency=low
* New upstream release
diff --combined debian/patches/series
index 29bee28,dda308b..6dfe579
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,15 -2,12 +2,11 @@@
02_only-show-netbook-panel-on-request.patch
03_quit-only-on-explicit-shutdown-request.patch
04_enable-switching-between-the-2-interfaces.patch
- 05_show-a-empty-library-message-in-banshee.patch
06_add-meego-desktop-file.patch
- 07_enable-library-watch-by-default.patch
07_enable-mpris-by-default.patch
07_disable-notification-area-by-default.patch
07_enable-soundmenu-by-default.patch
08_remove_unrelevant_media.patch
0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
- 10_bind-to-loopback-for-daap
- 11_reduce_cpu_usage.patch
-90_amazon_url.patch
91_u1ms-initialize-earlier.patch
99_ltmain_as-needed.patch
diff --combined debian/rules
index 39a709c,8a1681f..c9278e3
--- a/debian/rules
+++ b/debian/rules
@@@ -34,8 -34,8 +34,8 @@@ CONFFLAGS =
ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
CONFFLAGS += \
- --disable-boo \
- --disable-karma \
+ --enable-boo \
+ --enable-karma \
--enable-soundmenu \
--enable-ubuntuone
else
@@@ -65,6 -65,9 +65,9 @@@ override_dh_strip
override_dh_clistrip:
dh_clistrip --dbg-package=banshee-dbg
+ # disable dh_makeclilibs for weird signed libraries
+ override_dh_makeclilibs:
+
override_dh_install:
# make sure we don't include a generated MIME database
find debian/tmp/usr/share/mime/ -mindepth 1 -maxdepth 1 -not -name packages -print0 | xargs -0 rm -rf
--
banshee
More information about the Pkg-cli-apps-commits
mailing list