[Pkg-cli-apps-commits] [banshee] 05/06: Merge branch 'experimental' into ubuntu/trusty

[Chow Loong Jin]

This is an automated email from the git hooks/post-receive script.

hyperair pushed a commit to branch ubuntu/trusty
in repository banshee.

commit e46e107e9075423fa99099c4cbe5b0f1009729ca
Merge: c556d4b 6183318
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Dec 15 22:50:20 2013 +0800

    Merge branch 'experimental' into ubuntu/trusty
    
    Conflicts:
    	debian/patches/series

 debian/changelog                                   |  9 ++++-
 .../patches/Fix-ambiguity-in-DateTime-class.patch  | 41 ++++++++++++++++++++++
 debian/patches/Use-dbus-2.patch                    | 27 +++++++++++++-
 debian/patches/series                              |  1 +
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index b7fdada,794b291..651926d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,9 +1,24 @@@
+ banshee (2.9.0-2) experimental; urgency=low
+ 
+   * [75630d7] Fix up .pc files to use dbus#2
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Mon, 09 Dec 2013 19:35:11 +0800
+ 
 +banshee (2.9.0-1ubuntu1) trusty; urgency=low
 +
 +  * [67f86b7] Set debian-branch to trusty
 +  * [46d8724] 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
 +    - [9b356d6] Add workaround for set_Height exception.
 +    - [ccbcbbd] Make Banshee translatable in Launchpad
 +    - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
 +    - [03c8cad] Set debian-branch to ubuntu/raring
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Tue, 26 Nov 2013 22:36:50 +0800
 +
  banshee (2.9.0-1) experimental; urgency=low
  
    * [7021981] Tweak gbp.conf for experimental branch
diff --cc debian/patches/series
index 0446ad2,934ac2a..362d9ae
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -14,6 -14,4 +14,7 @@@ Use-new-style-GStreamer-1.0-raw-audio-c
  Use-notify-sharp-3.0-to-match-Gtk-3.0.patch
  Use-dbus-2.patch
  libbnpx11-Don-t-use-non-existent-macros.patch
+ Fix-ambiguity-in-DateTime-class.patch
 +Disable-Notification-area-extension-by-default.patch
 +Enable-sound-menu-extension-by-default.patch
 +Change-Amazon-redirect-url.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git