[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/precise, updated. debian/2.4.1-1-167-g53a1366

Chow Loong Jin hyperair at debian.org
Sat Jun 2 21:14:24 UTC 2012


The following commit has been merged in the ubuntu/precise branch:
commit c8567dab047b9fa7ce96fd73d8e5141d13ff8001
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Jun 2 13:05:49 2012 +0800

    Refresh patches and drop patch numbers

diff --git a/debian/patches/Add-Meego-desktop-file.patch b/debian/patches/Add-Meego-desktop-file.patch
index 41e56e9..5da4a3c 100644
--- a/debian/patches/Add-Meego-desktop-file.patch
+++ b/debian/patches/Add-Meego-desktop-file.patch
@@ -3,13 +3,13 @@ Date: Fri, 20 Jan 2012 23:14:39 +0800
 Subject: Add Meego desktop file
 
 ---
- src/Extensions/Banshee.MeeGo/Makefile.am           |    8 ++++++--
+ src/Extensions/Banshee.MeeGo/Makefile.am           |   10 +++++++---
  src/Extensions/Banshee.MeeGo/banshee.desktop.in.in |   11 +++++++++++
- 2 files changed, 17 insertions(+), 2 deletions(-)
+ 2 files changed, 18 insertions(+), 3 deletions(-)
  create mode 100644 src/Extensions/Banshee.MeeGo/banshee.desktop.in.in
 
 diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
-index bb42b94..de4076b 100644
+index bb42b94..7c3dd78 100644
 --- a/src/Extensions/Banshee.MeeGo/Makefile.am
 +++ b/src/Extensions/Banshee.MeeGo/Makefile.am
 @@ -37,7 +37,8 @@ service_DATA = com.meego.UX.Shell.Panels.banshee.service
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 f761642..56bad87 100644
--- a/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
+++ b/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
@@ -18,7 +18,7 @@ index 0000000..83f5efc
 +  <dllmap dll="libgobject-2.0.so" target="libgobject-2.0.so.0" os="!windows"/>
 +</configuration>
 diff --git a/src/Backends/Banshee.NowPlaying.X11/Makefile.am b/src/Backends/Banshee.NowPlaying.X11/Makefile.am
-index d8e94fd..738668c 100644
+index d8e94fd..4e0acbe 100644
 --- a/src/Backends/Banshee.NowPlaying.X11/Makefile.am
 +++ b/src/Backends/Banshee.NowPlaying.X11/Makefile.am
 @@ -11,6 +11,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
diff --git a/debian/patches/0016-Change-Amazon-redirect-url.patch b/debian/patches/Change-Amazon-redirect-url.patch
similarity index 100%
rename from debian/patches/0016-Change-Amazon-redirect-url.patch
rename to debian/patches/Change-Amazon-redirect-url.patch
diff --git a/debian/patches/0014-Disable-Notification-area-extension-by-default.patch b/debian/patches/Disable-Notification-area-extension-by-default.patch
similarity index 100%
rename from debian/patches/0014-Disable-Notification-area-extension-by-default.patch
rename to debian/patches/Disable-Notification-area-extension-by-default.patch
diff --git a/debian/patches/0015-Enable-sound-menu-extension-by-default.patch b/debian/patches/Enable-sound-menu-extension-by-default.patch
similarity index 100%
rename from debian/patches/0015-Enable-sound-menu-extension-by-default.patch
rename to debian/patches/Enable-sound-menu-extension-by-default.patch
diff --git a/debian/patches/0017-Workaround-for-set_Height-exceptions.patch b/debian/patches/Workaround-for-set_Height-exceptions.patch
similarity index 100%
rename from debian/patches/0017-Workaround-for-set_Height-exceptions.patch
rename to debian/patches/Workaround-for-set_Height-exceptions.patch
diff --git a/debian/patches/series b/debian/patches/series
index e1a60c6..227c31d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,7 @@ Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
 libossifer-Fix-certificate-validation-with-libsoup-2.patch
 Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
-0014-Disable-Notification-area-extension-by-default.patch
-0015-Enable-sound-menu-extension-by-default.patch
-0016-Change-Amazon-redirect-url.patch
-0017-Workaround-for-set_Height-exceptions.patch
+Disable-Notification-area-extension-by-default.patch
+Enable-sound-menu-extension-by-default.patch
+Change-Amazon-redirect-url.patch
+Workaround-for-set_Height-exceptions.patch

-- 
banshee



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