[Pkg-cli-apps-commits] [banshee] 01/03: Merge branch 'master' into ubuntu/xenial
Chow Loong Jin
hyperair at debian.org
Wed May 11 17:45:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch ubuntu/xenial
in repository banshee.
commit 42bb1c1a0e605aa19be4a8bf4d5c7a7f614af365
Merge: 15d64a9 bb9f89e
Author: Chow Loong Jin <hyperair at debian.org>
Date: Tue Apr 5 09:45:54 2016 +0800
Merge branch 'master' into ubuntu/xenial
debian/banshee.install | 2 ++
debian/banshee.menu | 5 ---
debian/changelog | 35 ++++++++++++++++++
debian/control | 5 +--
debian/copyright | 2 ++
.../Fix-sqlite-likelihood_support-detection.patch | 31 ++++++++++++++++
...e-obsolete-check-for-gnome-desktop-2.0-2..patch | 31 ++++++++++++++++
debian/patches/mono-4.5.patch | 41 ++++++++++++++++++++++
debian/patches/series | 3 ++
debian/rules | 3 +-
10 files changed, 149 insertions(+), 9 deletions(-)
diff --cc debian/changelog
index 2b85a80,dc25c70..5eb9bb6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,38 +1,53 @@@
+ 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
+
+ * 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 SQLite regression fix from Debian (LP: #1447956)
+
+ -- Chow Loong Jin <hyperair at debian.org> Mon, 25 May 2015 11:20:26 +0800
+
banshee (2.6.2-3) unstable; urgency=medium
* [967721a] Reexport patches via gbp-pq
diff --cc debian/control
index f7d88c5,ab0050c..46cd219
--- a/debian/control
+++ b/debian/control
@@@ -6,14 -5,15 +6,16 @@@ XSBC-Original-Maintainer: Debian CLI Ap
Uploaders: Sebastian Dröge <slomo at debian.org>, Chow Loong Jin <hyperair at debian.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
+ dh-translations,
+ dh-exec,
autotools-dev,
cli-common-dev (>= 0.5.7),
intltool (>= 0.35),
lsb-release,
mono-devel (>= 2.4.3),
+ libmono-cairo4.0-cil,
- libdbus2.0-cil-dev,
- libdbus-glib2.0-cil-dev,
+ libdbus1.0-cil-dev,
+ libdbus-glib1.0-cil-dev,
libmono-addins-cil-dev (>= 0.6.2),
libtaglib-cil-dev (>= 2.0.3.7),
libmono-zeroconf-cil-dev (>= 0.7.3),
diff --cc debian/patches/series
index cdfce19,89b4b86..abaab93
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -11,7 -11,9 +11,10 @@@ Initial-port-to-GStreamer-1.0.patc
Remove-build-time-enable-gapless-playback-option.patch
Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
-Use-dbus-2.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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git
More information about the Pkg-cli-apps-commits
mailing list