[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.6.0-1-5-ga22bb79

Chow Loong Jin hyperair at debian.org
Sun Nov 25 14:09:25 UTC 2012


The following commit has been merged in the experimental branch:
commit 081cca7c4e49d03463128002e144de55326ed8d9
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Nov 24 18:16:30 2012 +0800

    Refresh patches

diff --git a/debian/patches/Add-Meego-desktop-file.patch b/debian/patches/Add-Meego-desktop-file.patch
index 5da4a3c..1ea9fe1 100644
--- a/debian/patches/Add-Meego-desktop-file.patch
+++ b/debian/patches/Add-Meego-desktop-file.patch
@@ -55,4 +55,3 @@ index 0000000..edff676
 +Icon=media-player-banshee
 +Categories=GNOME;Audio;Music;Player;AudioVideo;
 +StartupNotify=true
--- 
diff --git a/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch b/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
index 56bad87..dcdbbf0 100644
--- a/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
+++ b/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
@@ -3,8 +3,8 @@ Date: Fri, 1 Jun 2012 16:22:37 +0800
 Subject: Add dllmaps for Banshee.NowPlaying.X11.dll
 
 ---
- .../Banshee.NowPlaying.X11.dll.config              |    3 +++
- src/Backends/Banshee.NowPlaying.X11/Makefile.am    |    1 +
+ .../Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.dll.config        |    3 +++
+ src/Backends/Banshee.NowPlaying.X11/Makefile.am                     |    1 +
  2 files changed, 4 insertions(+)
  create mode 100644 src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.dll.config
 
@@ -29,4 +29,3 @@ index d8e94fd..4e0acbe 100644
  else
  include $(top_srcdir)/build/build.dist.mk
  endif
--- 
diff --git a/debian/patches/Debrand-the-interface-to-Netbook.patch b/debian/patches/Debrand-the-interface-to-Netbook.patch
index cc211fe..09a9017 100644
--- a/debian/patches/Debrand-the-interface-to-Netbook.patch
+++ b/debian/patches/Debrand-the-interface-to-Netbook.patch
@@ -4,8 +4,8 @@ Subject: Debrand the interface to "Netbook"
 
 Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=623588
 ---
- .../Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs      |   12 ++++++------
- .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs    |    2 +-
+ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs   |   12 ++++++------
+ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs |    2 +-
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
@@ -68,4 +68,3 @@ index ffac0f1..4d0ad52 100644
                  return;
              }
  
--- 
diff --git a/debian/patches/Enable-MPRIS-extension-by-default.patch b/debian/patches/Enable-MPRIS-extension-by-default.patch
index 8d0fae7..80d45d6 100644
--- a/debian/patches/Enable-MPRIS-extension-by-default.patch
+++ b/debian/patches/Enable-MPRIS-extension-by-default.patch
@@ -3,7 +3,7 @@ Date: Fri, 20 Jan 2012 23:14:39 +0800
 Subject: Enable MPRIS extension by default
 
 ---
- .../Banshee.Mpris/Banshee.Mpris.addin.xml          |    2 +-
+ src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml b/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
@@ -19,4 +19,3 @@ index a97cfd1..730cbb0 100644
  
    <Dependencies>
      <Addin id="Banshee.Services" version="1.0" />
--- 
diff --git a/debian/patches/Enable-switching-between-the-2-interfaces.patch b/debian/patches/Enable-switching-between-the-2-interfaces.patch
index 330ec48..e1effdb 100644
--- a/debian/patches/Enable-switching-between-the-2-interfaces.patch
+++ b/debian/patches/Enable-switching-between-the-2-interfaces.patch
@@ -138,4 +138,3 @@ index 5aae94e..d615b4e 100644
          public void Dispose ()
          {
              if (panel != null) {
--- 
diff --git a/debian/patches/Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch b/debian/patches/Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
index f0f53ed..14d0789 100644
--- a/debian/patches/Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
+++ b/debian/patches/Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
@@ -5,7 +5,7 @@ Subject: Only show panel on --client=MeeGo and don't show when banshee is
 
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=623588
 ---
- .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs    |    4 +++-
+ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
@@ -27,4 +27,3 @@ index 4d0ad52..bb7b31a 100644
              }
  
              panel.BuildContents ();
--- 
diff --git a/debian/patches/Quit-only-on-explicit-shutdown-request.patch b/debian/patches/Quit-only-on-explicit-shutdown-request.patch
index a4c10fb..f10c8df 100644
--- a/debian/patches/Quit-only-on-explicit-shutdown-request.patch
+++ b/debian/patches/Quit-only-on-explicit-shutdown-request.patch
@@ -4,7 +4,7 @@ Subject: Quit only on explicit shutdown request
 
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=623588
 ---
- .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs    |    5 -----
+ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs |    5 -----
  1 file changed, 5 deletions(-)
 
 diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
@@ -23,4 +23,3 @@ index bb7b31a..5aae94e 100644
          }
  
          public void PresentPrimaryInterface ()
--- 
diff --git a/debian/patches/Remove-irrelevant-media.patch b/debian/patches/Remove-irrelevant-media.patch
index ef51e04..77e9166 100644
--- a/debian/patches/Remove-irrelevant-media.patch
+++ b/debian/patches/Remove-irrelevant-media.patch
@@ -3,7 +3,7 @@ Date: Fri, 20 Jan 2012 23:14:39 +0800
 Subject: Remove irrelevant media
 
 ---
- .../Banshee.MeeGo/MediaPanelContents.cs            |    2 +-
+ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
@@ -19,4 +19,3 @@ index e67bc7e..ca6e334 100644
              BuildLibrary ();
              BuildNowPlaying ();
              ConnectEvents ();
--- 
diff --git a/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch b/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
index bff92f8..1415462 100644
--- a/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+++ b/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
@@ -4,7 +4,7 @@ Subject: Revert "[ArtworkManager] Cache null artwork for fast lookup"
 
 This reverts commit 768c76da611a990054ff0921f24d566de86ac749.
 ---
- .../Banshee.Collection.Gui/ArtworkManager.cs       |   15 ---------------
+ .../Banshee.Collection.Gui/ArtworkManager.cs            |   15 ---------------
  1 file changed, 15 deletions(-)
 
 diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
@@ -76,4 +76,3 @@ index 6e1aa47..fe5f25e 100644
              if (inMemoryCacheOnly) {
                  return;
              }
--- 
diff --git a/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
index 8d4d329..2909090 100644
--- a/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
+++ b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
@@ -9,8 +9,8 @@ it, all SSL validations fail.
 
 Origin: commit:a5c94f2efee425320847d10748410fe9c3ff9311
 ---
- build/m4/banshee/libwebkit.m4                      |    7 +++++++
- .../libossifer/ossifer-session.c                   |    6 ++++++
+ build/m4/banshee/libwebkit.m4                            |    7 +++++++
+ src/Core/Banshee.WebBrowser/libossifer/ossifer-session.c |    6 ++++++
  2 files changed, 13 insertions(+)
 
 diff --git a/build/m4/banshee/libwebkit.m4 b/build/m4/banshee/libwebkit.m4
@@ -48,4 +48,3 @@ index 64e0215..abf07fb 100644
  #ifdef HAVE_LIBSOUP_GNOME
      path = g_strdup_printf ("%s.sqlite", cookie_db_path);
      cookie_jar = soup_cookie_jar_sqlite_new (path, FALSE);
--- 

-- 
banshee



More information about the Pkg-cli-apps-commits mailing list