[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.4.3-5-6-g857d997
Chow Loong Jin
hyperair at gmail.com
Tue Jun 2 06:09:05 UTC 2009
The following commit has been merged in the master branch:
commit 857d997e579f10ef297f529e60324a3d78e9d674
Author: Chow Loong Jin <hyperair at gmail.com>
Date: Tue Jun 2 13:22:40 2009 +0800
Refresh, drop patches
* debian/patches:
+ 02_system_equalizer.patch: drop a hunk, it'll work without it anyway
+ 03_fix-lastfm.patch: dropped, applied upstream
+ 20_check_notification_support.patch: dropped, applied upstream
diff --git a/debian/changelog b/debian/changelog
index 8540b74..77303dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ banshee (1.5.0-1) UNRELEASED; urgency=low
+ Fix grammatical error "an media" to "a media"
* debian/watch:
+ Updated to include changes in directory structure
+ * debian/patches:
+ + 02_system_equalizer.patch: drop a hunk, it'll work without it anyway
+ + 03_fix-lastfm.patch: dropped, applied upstream
+ + 20_check_notification_support.patch: dropped, applied upstream
- -- Chow Loong Jin <hyperair at gmail.com> Tue, 02 Jun 2009 13:01:02 +0800
+ -- Chow Loong Jin <hyperair at gmail.com> Tue, 02 Jun 2009 13:21:30 +0800
banshee (1.4.3-5) unstable; urgency=low
diff --git a/debian/patches/02_system-equalizer.patch b/debian/patches/02_system-equalizer.patch
index d7e6dea..54a46b5 100644
--- a/debian/patches/02_system-equalizer.patch
+++ b/debian/patches/02_system-equalizer.patch
@@ -19,44 +19,4 @@
MAINTAINERCLEANFILES = Makefile.in
all: all-recursive
---- a/libbanshee/banshee-player-equalizer.c.old 2008-07-30 15:42:53.000000000 +0200
-+++ a/libbanshee/banshee-player-equalizer.c 2008-07-30 16:09:31.000000000 +0200
-@@ -51,36 +51,11 @@
- }
-
- if (player->equalizer_status == BP_EQ_STATUS_UNCHECKED ||
-- player->equalizer_status == BP_EQ_STATUS_USE_BUILTIN) {
-- equalizer = gst_element_factory_make ("banshee-equalizer", "banshee-equalizer");
-- if (equalizer != NULL) {
-- if (player->equalizer_status == BP_EQ_STATUS_UNCHECKED) {
-- player->equalizer_status = BP_EQ_STATUS_USE_BUILTIN;
-- bp_debug ("Using built-in equalizer element");
-- }
--
-- return equalizer;
-- }
-- }
--
-- if (player->equalizer_status == BP_EQ_STATUS_UNCHECKED ||
- player->equalizer_status == BP_EQ_STATUS_USE_SYSTEM) {
- equalizer = gst_element_factory_make ("equalizer-10bands", "equalizer-10bands");
- if (equalizer != NULL) {
-- if (player->equalizer_status == BP_EQ_STATUS_USE_SYSTEM) {
-- return equalizer;
-- }
--
-- GstElementFactory *efactory = gst_element_get_factory (equalizer);
-- if (gst_plugin_feature_check_version (GST_PLUGIN_FEATURE (efactory), 0, 10, 9)) {
-- bp_debug ("Using system (gst-plugins-good) equalizer element");
-- player->equalizer_status = BP_EQ_STATUS_USE_SYSTEM;
-- return equalizer;
-- }
--
-- bp_debug ("Buggy system equalizer found. gst-plugins-good 0.10.9 or better "
-- "required, or build Banshee with the built-in equalizer.");
-- gst_object_unref (equalizer);
-+ player->equalizer_status = BP_EQ_STATUS_USE_SYSTEM;
-+ return equalizer;
- } else {
- bp_debug ("No system equalizer found");
- }
+
diff --git a/debian/patches/03_fix-lastfm.patch b/debian/patches/03_fix-lastfm.patch
deleted file mode 100644
index 0e772f5..0000000
--- a/debian/patches/03_fix-lastfm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
-index 1ea8e7f..1cdace7 100644
---- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
-+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
-@@ -231,12 +231,7 @@ namespace Banshee.Lastfm.Radio
- ClearChildSources ();
- sorting = true;
- foreach (StationSource child in StationSource.LoadAll (this, Account.UserName)) {
-- if (Connection.Subscriber ||
-- (!child.Type.SubscribersOnly &&
-- !(child.Type == StationType.Personal && child.Arg != null && child.Arg.Trim().ToLower() == last_username.Trim().ToLower())))
-- {
-- AddChildSource (child);
-- }
-+ AddChildSource (child);
- }
- sorting = false;
- SortChildSources ();
-diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
-index d06cf34..3ad358a 100644
---- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
-+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
-@@ -566,6 +566,7 @@ namespace Banshee.Lastfm.Radio
- stations.Add (new StationSource (lastfm, Catalog.GetString ("Loved"), "Loved", creator));
- stations.Add (new StationSource (lastfm, Catalog.GetString ("Banshee Group"), "Group", "Banshee"));
- stations.Add (new StationSource (lastfm, Catalog.GetString ("Neighbors"), "Neighbor", creator));
-+ stations.Add (new StationSource (lastfm, Catalog.GetString ("Creative Commons"), "Tag", "creative commons"));
- }
-
- return stations;
diff --git a/debian/patches/20_check_notification_support.patch b/debian/patches/20_check_notification_support.patch
deleted file mode 100644
index 00470c0..0000000
--- a/debian/patches/20_check_notification_support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' banshee-1.4.2/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs banshee-1.4.2.new/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
---- banshee-1.4.2/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs 2008-10-06 20:10:39.000000000 +0100
-+++ banshee-1.4.2.new/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs 2009-02-25 13:28:44.000000000 +0000
-@@ -59,7 +59,8 @@
- private RatingMenuItem rating_menu_item;
- private BansheeActionGroup actions;
- private uint ui_manager_id;
--
-+
-+ private bool? actions_supported;
- private bool show_notifications;
- private string notify_last_title;
- private string notify_last_artist;
-@@ -200,6 +201,17 @@
-
- disposed = true;
- }
-+
-+ private bool ActionsSupported {
-+ get {
-+ if (!actions_supported.HasValue) {
-+ actions_supported = Notifications.Global.Capabilities != null &&
-+ Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1;
-+ }
-+
-+ return actions_supported.Value;
-+ }
-+ }
-
- private bool BuildNotificationArea ()
- {
-@@ -405,8 +417,8 @@
- message, image, notif_area.Widget);
- nf.Urgency = Urgency.Low;
- nf.Timeout = 4500;
-- if (interface_action_service.PlaybackActions["NextAction"].Sensitive) {
-- nf.AddAction ("skip-song", Catalog.GetString("Skip this item"), OnSongSkipped);
-+ if (interface_action_service.PlaybackActions["NextAction"].Sensitive && ActionsSupported) {
-+ nf.AddAction ("skip-song", Catalog.GetString("Skip this item"), OnSongSkipped);
- }
- nf.Show ();
-
diff --git a/debian/patches/series b/debian/patches/series
index 2fcc058..d14b129 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-01_remove-bash-dep.patch
02_system-equalizer.patch
-03_fix-lastfm.patch
-20_check_notification_support.patch
99_ltmain_as-needed.patch
--
banshee
More information about the Pkg-cli-apps-commits
mailing list