[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.4.0-2-12-g494eda6

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit e34d9f340a784ce3958964a6484ad0bb240bb3a0
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Jun 1 15:38:07 2012 +0800

    Drop patch numbers and refresh

diff --git a/debian/patches/0005-Add-Meego-desktop-file.patch b/debian/patches/Add-Meego-desktop-file.patch
similarity index 100%
rename from debian/patches/0005-Add-Meego-desktop-file.patch
rename to debian/patches/Add-Meego-desktop-file.patch
diff --git a/debian/patches/0001-Debrand-the-interface-to-Netbook.patch b/debian/patches/Debrand-the-interface-to-Netbook.patch
similarity index 100%
rename from debian/patches/0001-Debrand-the-interface-to-Netbook.patch
rename to debian/patches/Debrand-the-interface-to-Netbook.patch
diff --git a/debian/patches/0010-Drop-unnecessary-libmeego-panel-moduleref.patch b/debian/patches/Drop-unnecessary-libmeego-panel-moduleref.patch
similarity index 100%
rename from debian/patches/0010-Drop-unnecessary-libmeego-panel-moduleref.patch
rename to debian/patches/Drop-unnecessary-libmeego-panel-moduleref.patch
diff --git a/debian/patches/0009-Drop-unnecessary-winmm-moduleref.patch b/debian/patches/Drop-unnecessary-winmm-moduleref.patch
similarity index 100%
rename from debian/patches/0009-Drop-unnecessary-winmm-moduleref.patch
rename to debian/patches/Drop-unnecessary-winmm-moduleref.patch
diff --git a/debian/patches/0006-Enable-MPRIS-extension-by-default.patch b/debian/patches/Enable-MPRIS-extension-by-default.patch
similarity index 100%
rename from debian/patches/0006-Enable-MPRIS-extension-by-default.patch
rename to debian/patches/Enable-MPRIS-extension-by-default.patch
diff --git a/debian/patches/0004-Enable-switching-between-the-2-interfaces.patch b/debian/patches/Enable-switching-between-the-2-interfaces.patch
similarity index 100%
rename from debian/patches/0004-Enable-switching-between-the-2-interfaces.patch
rename to debian/patches/Enable-switching-between-the-2-interfaces.patch
diff --git a/debian/patches/0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch b/debian/patches/Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
similarity index 100%
rename from debian/patches/0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
rename to debian/patches/Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
diff --git a/debian/patches/0002-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
similarity index 100%
rename from debian/patches/0002-Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
rename to debian/patches/Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
diff --git a/debian/patches/0003-Quit-only-on-explicit-shutdown-request.patch b/debian/patches/Quit-only-on-explicit-shutdown-request.patch
similarity index 100%
rename from debian/patches/0003-Quit-only-on-explicit-shutdown-request.patch
rename to debian/patches/Quit-only-on-explicit-shutdown-request.patch
diff --git a/debian/patches/0007-Remove-irrelevant-media.patch b/debian/patches/Remove-irrelevant-media.patch
similarity index 100%
rename from debian/patches/0007-Remove-irrelevant-media.patch
rename to debian/patches/Remove-irrelevant-media.patch
diff --git a/debian/patches/0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch b/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
similarity index 100%
rename from debian/patches/0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
rename to debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
diff --git a/debian/patches/0012-libossifer-Fix-certificate-validation-with-libsoup-2.patch b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
similarity index 83%
rename from debian/patches/0012-libossifer-Fix-certificate-validation-with-libsoup-2.patch
rename to debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
index d94cfbf..8d4d329 100644
--- a/debian/patches/0012-libossifer-Fix-certificate-validation-with-libsoup-2.patch
+++ b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
@@ -14,12 +14,12 @@ Origin: commit:a5c94f2efee425320847d10748410fe9c3ff9311
  2 files changed, 13 insertions(+)
 
 diff --git a/build/m4/banshee/libwebkit.m4 b/build/m4/banshee/libwebkit.m4
-index 6c8c6eb..d1f81c8 100644
+index d1f81c8..9a6f7f5 100644
 --- a/build/m4/banshee/libwebkit.m4
 +++ b/build/m4/banshee/libwebkit.m4
-@@ -16,6 +16,13 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
- 		AC_SUBST(LIBWEBKIT_CFLAGS)
- 		AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
+@@ -23,6 +23,13 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
+ 			AC_DEFINE(HAVE_LIBSOUP_2_38, 1, [libsoup-gnome-2.4 >= 2.38 detected])
+ 		fi
  
 +		PKG_CHECK_MODULES(LIBSOUP_2_38,
 +			libsoup-gnome-2.4 >= 2.38,
@@ -32,12 +32,12 @@ index 6c8c6eb..d1f81c8 100644
  		PKG_CHECK_MODULES(LIBSOUP_GNOME,
  			libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
 diff --git a/src/Core/Banshee.WebBrowser/libossifer/ossifer-session.c b/src/Core/Banshee.WebBrowser/libossifer/ossifer-session.c
-index 328a8d5..64e0215 100644
+index 64e0215..abf07fb 100644
 --- a/src/Core/Banshee.WebBrowser/libossifer/ossifer-session.c
 +++ b/src/Core/Banshee.WebBrowser/libossifer/ossifer-session.c
-@@ -50,6 +50,12 @@ ossifer_session_initialize (const gchar *cookie_db_path,
- 
-     session = webkit_get_default_session ();
+@@ -56,6 +56,12 @@ ossifer_session_initialize (const gchar *cookie_db_path,
+                   NULL);
+ #endif
  
 +#ifdef HAVE_LIBSOUP_2_38
 +    g_object_set (session,
diff --git a/debian/patches/series b/debian/patches/series
index 3e953d8..fada110 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,12 @@
-0001-Debrand-the-interface-to-Netbook.patch
-0002-Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
-0003-Quit-only-on-explicit-shutdown-request.patch
-0004-Enable-switching-between-the-2-interfaces.patch
-0005-Add-Meego-desktop-file.patch
-0006-Enable-MPRIS-extension-by-default.patch
-0007-Remove-irrelevant-media.patch
-0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
-0009-Drop-unnecessary-winmm-moduleref.patch
-0010-Drop-unnecessary-libmeego-panel-moduleref.patch
-0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
-0012-libossifer-Fix-certificate-validation-with-libsoup-2.patch
+Debrand-the-interface-to-Netbook.patch
+Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
+Quit-only-on-explicit-shutdown-request.patch
+Enable-switching-between-the-2-interfaces.patch
+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

-- 
banshee