[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. ppa/1.9.4-1ubuntu1_hyper1+karmic-26-g72e8f0b
Chow Loong Jin
hyperair at ubuntu.com
Thu Mar 10 18:35:34 UTC 2011
The following commit has been merged in the ppa/unstable/karmic branch:
commit 30233489cc334fb52671ae34c3f7d0192a6c854b
Merge: 6de477975c82c11805eedf762e49b5f1325af14a 363f41852662732cbf29d74a654b6b44da35c527
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Mar 11 02:11:00 2011 +0800
Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
Conflicts:
debian/control
debian/rules
diff --combined debian/changelog
index 28d4240,68b8778..774b18e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,64 +1,82 @@@
+ banshee (1.9.5-1ubuntu1~hyper1+lucid) lucid; urgency=low
+
+ * Merge from Maverick, remaining changes
+ + [aed3a69] Disable soundmenu extension from building
+ + [a24ddc3] Drop soundmenu related patches
+ + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 02:01:19 +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
+
+ -- 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:
+ + 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
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 01:05:18 +0800
+
+ banshee (1.9.5-1) UNRELEASED; urgency=low
+
+ * [6e971aa] Only use GIO Hardware on linux-any (Closes: #615126)
+ * [017db91] Fix some dh_clideps issues
+ * [9c7ee7c] New upstream release
+ + Enhancements:
+ - Add support for handling u1ms:// links
+ - Windows: Add Win7 thumbnail toolbar playback buttons
+ - OS X Build: Work with new bockbuild, add MonoMac
+ + Notable Bugs Fixed (20 fixed since 1.9.4):
+ - bgo#644315: Fix album browser's border on Windows
+ - bgo#641608: windows: Fix notification icon menu positioning
+ - bgo#643188: Help: Fix help URL to library.gnome.org
+ - bgo#643407: GStreamerSharp: Properly handle GStreamer errors
+ - bgo#641674: SmartPlaylists: Fix queries with { and }
+ - Hide 'Unknown Artist' in 'All Albums' browser entry
+ * [ac45746] Squash Ubuntu delta in debian/rules
+ * [2ee4b52] Refresh 06_add-meego-desktop-file.patch
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 01:10:49 +0800
+
+ banshee (1.9.4-1ubuntu2) natty; urgency=low
+
+ * 0001-Add-support-for-u1ms-links.patch:
+ - Handle u1ms:// links in the U1 Music Store (LP: #723960)
+
+ -- Rodney Dawes <rodney.dawes at ubuntu.com> Mon, 28 Feb 2011 14:06:16 -0500
+
+banshee (1.9.4-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, libgpod and gdata# which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ - Drop UbuntuOne
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+ - Drop UbuntuOne
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 24 Feb 2011 02:09:52 +0800
+
banshee (1.9.4-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Merge from Maverick, remaining changes
@@@ -39,7 -82,7 +100,7 @@@ banshee (1.9.4-1ubuntu1~hyper1+natty) n
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 24 Feb 2011 01:51:13 +0800
- banshee (1.9.4-1ubuntu1) UNRELEASED; urgency=low
+ banshee (1.9.4-1ubuntu1) natty; urgency=low
* Merge from Debian Experimental, remaining changes:
+ Enable SoundMenu and Disable NotificationArea by default
@@@ -47,9 -90,9 +108,9 @@@
+ Enable and recommnd u1ms and soundmenu extensions
+ Move desktop file for Meego UI to /usr/share/une/applications
- -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 24 Feb 2011 01:49:47 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 26 Feb 2011 22:05:24 +0800
- banshee (1.9.4-1) UNRELEASED; urgency=low
+ banshee (1.9.4-1) unstable; urgency=low
* [f49212c] New upstream release:
+ Enhancements:
@@@ -85,25 -128,6 +146,25 @@@ 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+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ - Drop UbuntuOne
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+ - Drop UbuntuOne
+ * [1698d99] Revert use of -cil instead of -cil-dev for gdata
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 03 Feb 2011 23:57:05 +0800
+
banshee (1.9.3-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Merge from Maverick, remaining changes:
@@@ -173,24 -197,6 +234,24 @@@ 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+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ - Drop UbuntuOne
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+ - Drop UbuntuOne
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 14 Jan 2011 00:55:37 +0800
+
banshee (1.9.2-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Merge from Maverick, remaining changes:
@@@ -260,24 -266,6 +321,24 @@@ 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+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ - Drop UbuntuOne
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+ - Drop UbuntuOne
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 27 Dec 2010 11:23:43 +0800
+
banshee (1.9.1-1ubuntu2~hyper1+lucid) lucid; urgency=low
* Merge from Maverick, remaining changes:
@@@ -304,24 -292,6 +365,24 @@@ 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+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ - Drop UbuntuOne
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+ - Drop UbuntuOne
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 25 Dec 2010 01:30:16 +0800
+
banshee (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Merge from Maverick, remaining changes:
@@@ -450,22 -420,6 +511,22 @@@ 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+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 03:12:44 +0800
+
banshee (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Backport to Lucid, changes:
@@@ -563,22 -517,6 +624,22 @@@ banshee (1.8.0-1ubuntu1~hyper1+lucid) l
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 03:13:46 +0800
+banshee (1.8.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 03:28:50 +0800
+
banshee (1.8.0-2) experimental; urgency=low
* Fix duplicates on import (BGO #623441)
@@@ -606,22 -544,6 +667,22 @@@ banshee (1.8.0-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 02:41:41 +0800
+banshee (1.7.6-0ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 20 Sep 2010 04:31:04 +0800
+
banshee (1.7.6-0ubuntu1~hyper1+lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -704,22 -626,6 +765,22 @@@ banshee (1.7.5-1) UNRELEASED; urgency=l
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 18 Sep 2010 01:47:47 +0800
+banshee (1.7.5-0ubuntu2~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 11 Sep 2010 23:05:00 +0800
+
banshee (1.7.5-0ubuntu2~hyper1+lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -795,22 -701,6 +856,22 @@@ 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~karmic1) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 13 Aug 2010 18:08:25 +0800
+
banshee (1.7.4-1ubuntu1~lucid1) lucid; urgency=low
* No change backport to Lucid
@@@ -881,22 -771,6 +942,22 @@@ banshee (1.7.4-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 13 Aug 2010 00:30:24 +0800
+banshee (1.7.3-2ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 24 Jul 2010 22:19:49 +0800
+
banshee (1.7.3-2ubuntu2) maverick; urgency=low
* banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
@@@ -1132,22 -1006,6 +1193,22 @@@ banshee (1.7.1-1ubuntu1) maverick; urge
-- Didier Roche <didrocks at ubuntu.com> Mon, 05 Jul 2010 15:19:53 +0200
+banshee (1.7.1-1~hyper1~karmic1) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 31 May 2010 21:10:46 +0800
+
banshee (1.7.1-1~hyper1~lucid1) lucid; urgency=low
* No change upload to PPA
@@@ -1184,22 -1042,6 +1245,22 @@@ 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~karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 04:22:52 +0800
+
banshee (1.7.1-1~hyper1~lucid) lucid; urgency=low
* No change upload to PPA
@@@ -1218,22 -1060,6 +1279,22 @@@ banshee (1.7.1-1~hyper1~maverick) maver
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 01:41:45 +0800
+banshee (1.7.0-1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 07:19:03 +0800
+
banshee (1.7.0-1~hyper1~lucid) lucid; urgency=low
* No change upload to lucid
@@@ -1274,22 -1100,6 +1335,22 @@@ banshee (1.7.0-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 07 May 2010 23:27:08 +0800
+banshee (1.6.1-1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 27 May 2010 18:59:09 +0800
+
banshee (1.6.1-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid.
@@@ -1332,22 -1142,6 +1393,22 @@@ banshee (1.6.0-1~hyper1~lucid1) lucid;
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 03 Apr 2010 18:44:59 +0800
+banshee (1.6.0-1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 00:52:53 +0800
+
banshee (1.6.0-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -1378,22 -1172,6 +1439,22 @@@ banshee (1.6.0-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 03:12:16 +0800
+banshee (1.5.6-1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 22 Mar 2010 20:33:30 +0800
+
banshee (1.5.6-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -1435,22 -1213,6 +1496,22 @@@ banshee (1.5.6-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 21 Mar 2010 21:22:57 +0800
+banshee (1.5.5-1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from unstable, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 03:21:19 +0800
+
banshee (1.5.5-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -1486,19 -1248,6 +1547,19 @@@ banshee (1.5.5-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 03:13:23 +0800
+banshee (1.5.4-1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from unstable, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 27 Feb 2010 15:54:13 +0800
+
banshee (1.5.4-1) unstable; urgency=low
* New upstream release (Closes: #571734)
@@@ -1545,18 -1294,6 +1606,18 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 01:14:01 +0800
+banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from unstable, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition
+ - Use mono-devel 2.4.2.3
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream, and
+ force-enable LibraryWatcher
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 00:23:27 +0800
+
banshee (1.5.3-1) unstable; urgency=low
[ Chow Loong Jin ]
@@@ -1770,14 -1507,6 +1831,14 @@@ banshee (1.5.0-3) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 19 Jul 2009 00:22:34 +0800
+banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
+
+ * Upload to PPA
+ * debian/gbp.conf:
+ + Add a gbp.conf to ease git buildpackage work
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:10:33 +0800
+
banshee (1.5.0-2) experimental; urgency=low
* debian/control:
diff --combined debian/control
index e7d2c5e,b46c651..e9d2449
--- a/debian/control
+++ b/debian/control
@@@ -9,21 -9,22 +9,21 @@@ Build-Depends: debhelper (>= 7.0.50)
cli-common-dev (>= 0.5.7),
intltool (>= 0.35),
lsb-release,
- mono-devel (>= 2.4.3),
- libndesk-dbus1.0-cil-dev (>= 0.5),
- libndesk-dbus-glib1.0-cil-dev (>= 0.3),
- libmono-addins-cil-dev (>= 0.3.1),
+ mono-devel (>= 2.4.2.3),
+ libndesk-dbus1.0-cil (>= 0.5),
+ libndesk-dbus-glib1.0-cil (>= 0.3),
+ libmono-addins0.2-cil (>= 0.3.1),
libtaglib-cil-dev (>= 2.0.3.7),
- libmono-zeroconf-cil-dev (>= 0.7.3),
- libnotify-cil-dev,
- libglib2.0-cil-dev (>= 2.10),
- libgtk2.0-cil-dev (>= 2.12),
- libgconf2.0-cil-dev,
+ libmono-zeroconf1.0-cil (>= 0.7.3),
+ libnotify0.4-cil,
+ libglib2.0-cil (>= 2.10),
+ libgtk2.0-cil (>= 2.12),
+ libgconf2.0-cil,
- libgudev1.0-cil-dev (>= 0.1),
+ libgudev1.0-cil-dev (>= 0.1) [linux-any],
libgkeyfile-cil-dev (>= 0.1),
libgio2.0-cil-dev (>= 2.22),
libgtk-sharp-beans2.0-cil-dev (>= 2.8),
libgpod-cil-dev (>= 0.7.95),
- libubuntuone1.0-cil-dev,
libwebkit-dev (>= 1.2.2),
libsoup2.4-dev (>= 2.26),
libsoup-gnome2.4-dev (>= 2.26),
@@@ -33,13 -34,14 +33,14 @@@
libmtp-dev (>= 0.3.0),
gconf2,
libglib2.0-dev,
+ libwnck-dev,
libgtk2.0-dev (>= 2.8),
# libclutter-1.0-dev (>= 1.0.1),
libx11-dev,
libxrandr-dev (>= 2:1.1.1),
libxxf86vm-dev (>= 1:1.0.1),
libgstreamer0.10-dev (>= 0.10.23),
- libgstreamer-plugins-base0.10-dev (>= 0.10.26),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.23),
gnome-doc-utils (>= 0.17.3),
libgnome-desktop-dev
Standards-Version: 3.9.1
@@@ -58,6 -60,7 +59,6 @@@ Depends: ${shlibs:Depends}
gnome-icon-theme (>= 2.16)
Recommends: brasero,
avahi-daemon,
- banshee-extension-ubuntuonemusicstore (=${binary:Version}),
media-player-info
Suggests: gstreamer0.10-plugins-bad,
gstreamer0.10-plugins-ugly,
@@@ -71,6 -74,22 +72,6 @@@ Description: Media Management and Playb
and other media devices, play and manage video files and burn selections
to a CD.
-Package: banshee-extension-ubuntuonemusicstore
-Architecture: any
-Depends: banshee (>= ${source:Upstream-Version}),
- ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-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/patches/series
index 1baf4bf,8cacd23..326dd9e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,3 +1,4 @@@
+02_bundle-inotifywatcher.patch
01_Debranch-netbook-interface.patch
02_only-show-netbook-panel-on-request.patch
03_quit-only-on-explicit-shutdown-request.patch
@@@ -7,7 -6,6 +7,6 @@@
06_add-meego-desktop-file.patch
07_enable-library-watch-by-default.patch
07_enable-mpris-by-default.patch
- 07_enable-u1ms-by-default.patch
08_remove_unrelevant_media.patch
0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
99_ltmain_as-needed.patch
diff --combined debian/rules
index 18ed820,841df90..b8d4722
--- a/debian/rules
+++ b/debian/rules
@@@ -4,38 -4,56 +4,56 @@@ include /usr/share/cli-common/cli.mak
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+ CONFFLAGS = \
+ --disable-static \
+ --disable-tests \
+ --with-vendor-build-id="`lsb_release -ds`" \
+ --disable-clutter \
+ --disable-builtin-equalizer \
+ --disable-gst-sharp \
+ --enable-user-help \
+ --enable-docs \
+ --enable-youtube \
+ --disable-hal \
+ --enable-gio \
+ --disable-moonlight \
+ --enable-gnome \
+ --enable-schemas-install \
+ --enable-mtp \
+ --enable-appledevice \
+ --disable-ipod \
+ --enable-daap \
+ --disable-remote-audio \
+ --disable-torrent \
+ --enable-meego \
- --enable-gapless-playback \
++ --disable-gapless-playback \
+ --enable-podcast \
+ --enable-release \
+ --disable-shave \
+ MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
+
+ ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
+ CONFFLAGS += \
+ --disable-boo \
+ --disable-karma \
+ --disable-soundmenu \
- --enable-ubuntuone
++ --disable-ubuntuone
+ else
+ CONFFLAGS += \
+ --enable-boo \
+ --enable-karma \
+ --disable-soundmenu \
+ --disable-ubuntuone
+ endif
+
+ ifeq ($(shell dpkg-architecture -ilinux-any && echo yes), y)
+ CONFFLAGS += --enable-gio-hardware
+ else
+ CONFFLAGS += --disable-gio-hardware
+ endif
+
override_dh_auto_configure:
- dh_auto_configure -- --disable-static \
- --disable-tests \
- --with-vendor-build-id="`lsb_release -ds`" \
- --disable-clutter \
- --disable-builtin-equalizer \
- --disable-gst-sharp \
- --enable-user-help \
- --disable-boo \
- --enable-docs \
- --enable-youtube \
- --disable-hal \
- --enable-gio \
- --enable-gio-hardware \
- --disable-moonlight \
- --enable-gnome \
- --enable-schemas-install \
- --enable-mtp \
- --enable-appledevice \
- --disable-ipod \
- --disable-karma \
- --enable-daap \
- --disable-remote-audio \
- --disable-torrent \
- --enable-meego \
- --disable-soundmenu \
- --disable-ubuntuone \
- --disable-gapless-playback \
- --enable-podcast \
- --enable-release \
- --disable-shave \
- MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
+ dh_auto_configure -- $(CONFFLAGS)
# disable tests
override_dh_auto_test:
@@@ -58,6 -76,8 +76,6 @@@ override_dh_install
debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
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-1/Extensions/Banshee.UbuntuOneMusicStore.*
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