[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.4.0-2-12-g494eda6
Chow Loong Jin
hyperair at debian.org
Sat Jun 2 03:57:57 UTC 2012
The following commit has been merged in the master branch:
commit 028167e6d3d7fa7742d660d096814dbf644127e0
Author: Chow Loong Jin <hyperair at debian.org>
Date: Fri Jun 1 16:01:06 2012 +0800
Drop moduleref-removing patches
Use --exclude-moduleref instead.
diff --git a/debian/patches/Drop-unnecessary-libmeego-panel-moduleref.patch b/debian/patches/Drop-unnecessary-libmeego-panel-moduleref.patch
deleted file mode 100644
index ce4729c..0000000
--- a/debian/patches/Drop-unnecessary-libmeego-panel-moduleref.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Fri, 20 Jan 2012 23:14:39 +0800
-Subject: Drop unnecessary libmeego-panel moduleref
-
----
- .../Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs | 57 ++++++++++----------
- src/Extensions/Banshee.MeeGo/Makefile.am | 2 -
- 2 files changed, 29 insertions(+), 30 deletions(-)
-
-diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
-index 9f16ba7..2d05388 100644
---- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
-+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
-@@ -40,7 +40,7 @@ namespace Banshee.MeeGo
- {
- public static MeeGoPanel Instance { get; private set; }
-
-- private PanelGtk embedded_panel;
-+ // private PanelGtk embedded_panel;
- private Window window_panel;
-
- public MediaPanelContents Contents { get; private set; }
-@@ -55,25 +55,25 @@ namespace Banshee.MeeGo
-
- var timer = Log.DebugTimerStart ();
-
-- try {
-- Log.Debug ("Attempting to create Netbook toolbar panel");
-- embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
-- null, "media-button", true);
-- embedded_panel.ShowBeginEvent += (o, e) => {
-- ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-- if (Contents != null) {
-- Contents.SyncSearchEntry ();
-- }
-- };
-- while (Gtk.Application.EventsPending ()) {
-- Gtk.Application.RunIteration ();
-- }
-- } catch (Exception e) {
-- if (!(e is DllNotFoundException)) {
-- Log.Exception ("Could not bind to Netbook panel", e);
-- }
-+ // try {
-+ // Log.Debug ("Attempting to create Netbook toolbar panel");
-+ // embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
-+ // null, "media-button", true);
-+ // embedded_panel.ShowBeginEvent += (o, e) => {
-+ // ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-+ // if (Contents != null) {
-+ // Contents.SyncSearchEntry ();
-+ // }
-+ // };
-+ // while (Gtk.Application.EventsPending ()) {
-+ // Gtk.Application.RunIteration ();
-+ // }
-+ // } catch (Exception e) {
-+ // if (!(e is DllNotFoundException)) {
-+ // Log.Exception ("Could not bind to Netbook panel", e);
-+ // }
- window_panel = new Gtk.Window ("Netbook Media Panel");
-- }
-+ // }
-
- Log.DebugTimerPrint (timer, "Netbook panel created: {0}");
- }
-@@ -89,9 +89,10 @@ namespace Banshee.MeeGo
- Contents.ShowAll ();
- Log.DebugTimerPrint (timer, "Netbook panel contents created: {0}");
-
-- if (embedded_panel != null) {
-- embedded_panel.SetChild (Contents);
-- } else if (window_panel != null) {
-+ // if (embedded_panel != null) {
-+ // embedded_panel.SetChild (Contents);
-+ // } else if (window_panel != null)
-+ {
- window_panel.Add (Contents);
- window_panel.SetDefaultSize (1000, 500);
- window_panel.WindowPosition = WindowPosition.Center;
-@@ -106,17 +107,17 @@ namespace Banshee.MeeGo
- public void Hide ()
- {
- window_panel.Hide ();
-- if (embedded_panel != null) {
-- embedded_panel.Hide ();
-- }
-+ // if (embedded_panel != null) {
-+ // embedded_panel.Hide ();
-+ // }
- }
-
- public void Show ()
- {
- window_panel.Show ();
-- if (embedded_panel != null) {
-- embedded_panel.Show ();
-- }
-+ // if (embedded_panel != null) {
-+ // embedded_panel.Show ();
-+ // }
- }
- }
- }
-diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
-index de4076b..0fb45b7 100644
---- a/src/Extensions/Banshee.MeeGo/Makefile.am
-+++ b/src/Extensions/Banshee.MeeGo/Makefile.am
-@@ -15,8 +15,6 @@ SOURCES = \
- Banshee.MeeGo/PlaybackBox.cs \
- Banshee.MeeGo/SearchEntry.cs \
- MeeGo.Panel/PanelButtonState.cs \
-- MeeGo.Panel/PanelClient.cs \
-- MeeGo.Panel/PanelGtk.cs \
- MeeGo.Panel/SetPositionHandler.cs \
- MeeGo.Panel/SetSizeHandler.cs
-
---
diff --git a/debian/patches/Drop-unnecessary-winmm-moduleref.patch b/debian/patches/Drop-unnecessary-winmm-moduleref.patch
deleted file mode 100644
index 5709ad2..0000000
--- a/debian/patches/Drop-unnecessary-winmm-moduleref.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Fri, 20 Jan 2012 23:14:39 +0800
-Subject: Drop unnecessary winmm moduleref
-
----
- src/Libraries/MusicBrainz/Makefile.am | 1 -
- src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/Libraries/MusicBrainz/Makefile.am b/src/Libraries/MusicBrainz/Makefile.am
-index 904d3fa..ba44e98 100644
---- a/src/Libraries/MusicBrainz/Makefile.am
-+++ b/src/Libraries/MusicBrainz/Makefile.am
-@@ -6,7 +6,6 @@ SOURCES = \
- MusicBrainz/Disc.cs \
- MusicBrainz/DiscFreeBsd.cs \
- MusicBrainz/DiscLinux.cs \
-- MusicBrainz/DiscWin32.cs \
- MusicBrainz/Event.cs \
- MusicBrainz/Label.cs \
- MusicBrainz/LocalDisc.cs \
-diff --git a/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs b/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
-index 90bfe55..ad2672b 100644
---- a/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
-+++ b/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
-@@ -144,7 +144,7 @@ namespace MusicBrainz
- //case PlatformID.Win32NT:
- //return new DiscWin32NT (device);
- default:
-- return new DiscWin32 (device);
-+ return null;
- }
- } catch (Exception exception) {
- throw new LocalDiscException (exception);
---
diff --git a/debian/patches/series b/debian/patches/series
index fada110..bbbc388 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,5 @@ Add-Meego-desktop-file.patch
Enable-MPRIS-extension-by-default.patch
Remove-irrelevant-media.patch
Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
-Drop-unnecessary-winmm-moduleref.patch
-Drop-unnecessary-libmeego-panel-moduleref.patch
Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
libossifer-Fix-certificate-validation-with-libsoup-2.patch
diff --git a/debian/rules b/debian/rules
index ef6c9a7..c33e2db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,13 @@ override_dh_clistrip:
# disable dh_makeclilibs for weird signed libraries
override_dh_makeclilibs:
+override_dh_clideps:
+ dh_clideps \
+ --exclude-moduleref=libmeego-panel \
+ --exclude-moduleref=winmm \
+ --exclude-moduleref=libbanshee \
+ --exclude-moduleref=libbnpx11
+
override_dh_install:
# make sure we don't include a generated MIME database
find debian/tmp/usr/share/mime/ -mindepth 1 -maxdepth 1 -not -name packages -print0 | xargs -0 rm -rf
--
banshee
More information about the Pkg-cli-apps-commits
mailing list