[Pkg-cli-apps-commits] [banshee] 03/03: Merge remote-tracking branch 'origin/ubuntu/xenial' into ubuntu/xenial

[Chow Loong Jin]

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

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

commit 0158025bf5854491128ec78c1fc9d4b6b50c41b6
Merge: 366ada1 12baf67
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu May 12 01:45:07 2016 +0800

    Merge remote-tracking branch 'origin/ubuntu/xenial' into ubuntu/xenial

 debian/changelog      | 12 ++++++++++++
 debian/control        |  1 -
 debian/gbp.conf       |  2 +-
 debian/patches/series |  1 +
 debian/rules          |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index b614b7d,8cbeb01..25dfe51
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,13 +1,64 @@@
 -banshee (2.9.0+really2.6.2-3ubuntu2) UNRELEASED; urgency=medium
++banshee (2.9.0+really2.6.2-7ubuntu2) UNRELEASED; urgency=medium
+ 
++  [ Iain Lane ]
+   * [cee83ed] Install the svg icon into 'scalable', so that it is picked up
+     for AppStream
+   * [15cc0ce] Use Mono 4.5
+   * [d25ebf9] Update debian/gbp.conf for xenial
+   * [0721c63] Disable the daap plugin - it makes media importing hang (see
+     upstream bug #759911)
+ 
 - -- Iain Lane <laney at debian.org>  Thu, 03 Mar 2016 17:11:23 +0000
++ -- Chow Loong Jin <hyperair at debian.org>  Thu, 12 May 2016 01:43:13 +0800
++
 +banshee (2.9.0+really2.6.2-7ubuntu1) xenial; urgency=medium
 +
 +  * Merge from Debian, 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
 +    - [ccbcbbd] Make Banshee translatable in Launchpad
 +    - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
 +    - [a7156c0] Filter out libgpod-cil-dev versions built against gtk#3
 +    - [e7c634d] Update dversionmangle for extracting +really version out
 +    - [b5f10d6] Go back to dbus# 1.0 ABI.
 +  * Also brings in updated SQLite regression fix from Debian (LP: #1534971)
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Tue, 05 Apr 2016 09:43:17 +0800
 +
 +banshee (2.6.2-6) unstable; urgency=medium
 +
 +  [ Iain Lane ]
 +  * [164cfdf] Install the svg icon into 'scalable', so that it is picked up for AppStream
 +  * [88af423] Use Mono 4.5
 +
 +  [ Chow Loong Jin ]
 +  * [528b418] Build-dep on libmono-cairo4.0-cil (Closes: #808632)
 +  * [349280f] Reexport mono-4.5.patch using gbp pq
 +  * [57edbf7] Import patch fixing likelihood support detection (LP: #1534971)
 +  * [bf7a7d5] Drop banshee.menu (no longer needed)
 +  * [d67eb70] No-change bump of Standards-Version to 3.9.7.
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Tue, 05 Apr 2016 09:29:20 +0800
 +
 +banshee (2.6.2-5) unstable; urgency=medium
 +
 +  * [35552e3] Disable boo
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Tue, 10 Nov 2015 19:58:55 +0800
 +
 +banshee (2.6.2-4) unstable; urgency=medium
 +
 +  * [ede80cf] Resync ubuntu-specific parts of rules.
 +    Changes have been made in snippets that are only run in Ubuntu, but only on
 +    the Ubuntu branches. This commit syncs up these snippets.
 +  * [c669405] Drop obsolete gnome-desktop dependency
 +  * [7020ad1] Move default Copyright/License statements into wildcard Files
 +    paragraph
 +    lintian's copyright-format checker doesn't seem to apply the default
 +    copyright/license statements from the header paragraph to unlisted files.
 +  * [59aa975] No-change bump of Standards-Version to 3.9.6
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sun, 13 Sep 2015 23:08:15 +0800
  
  banshee (2.9.0+really2.6.2-3ubuntu1) wily; urgency=low
  
diff --cc debian/patches/series
index abaab93,55c1cec..84e3068
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -13,8 -13,6 +13,9 @@@ Don-t-use-the-new-decoded-pad-signal-of
  Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
  Remove-IDBusExportable-inheritance-from-exported-int.patch
  Database-fix-performance-for-the-new-SQLite-s-query-.patch
 +Fix-sqlite-likelihood_support-detection.patch
 +build-Remove-obsolete-check-for-gnome-desktop-2.0-2..patch
 +mono-4.5.patch
  Disable-Notification-area-extension-by-default.patch
  Enable-sound-menu-extension-by-default.patch
+ mono-4.5.patch

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