[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. ppa/1.7.4-1ubuntu1-15-gd54fedc

Mon Sep 6 18:55:12 UTC 2010

The following commit has been merged in the ubuntu/maverick branch:
commit fe5e8fb55058b8e2e923343188070d2dd4c57e69
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Sep 6 18:39:17 2010 +0100

    Refresh and update patches to apply cleanly

diff --git a/debian/patches/05_show-a-empty-library-message-in-banshee.patch b/debian/patches/05_show-a-empty-library-message-in-banshee.patch
index 03624a6..17a0977 100644
--- a/debian/patches/05_show-a-empty-library-message-in-banshee.patch
+++ b/debian/patches/05_show-a-empty-library-message-in-banshee.patch
@@ -11,11 +11,11 @@ us empty (Bertrand Lorentz and Alex Launi)
  .../Banshee.MeeGo/MediaPanelContents.cs            |   12 +++++++++++-
  2 files changed, 20 insertions(+), 1 deletions(-)
 
-diff --git a/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs b/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
-index f549c27..8db9a0a 100644
---- a/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
-+++ b/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
-@@ -83,6 +83,15 @@ namespace Banshee.Library
+Index: banshee.git/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
+===================================================================
+--- banshee.git.orig/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs	2010-09-06 18:33:02.595809037 +0100
++++ banshee.git/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs	2010-09-06 18:33:18.868187362 +0100
+@@ -85,6 +85,15 @@
                      DatabaseTrackModel.Reload ();
                  }
              ));
@@ -30,12 +30,12 @@ index f549c27..8db9a0a 100644
 +            };
          }
  
-         public static string GetDefaultBaseDirectory ()
-diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
-index d67ad7d..556783f 100644
---- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
-+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
-@@ -62,7 +62,7 @@ namespace Banshee.MeeGo
+         public override string GetPluralItemCountString (int count)
+Index: banshee.git/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+===================================================================
+--- banshee.git.orig/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2010-09-06 18:33:02.585807567 +0100
++++ banshee.git/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2010-09-06 18:33:18.868187362 +0100
+@@ -62,7 +62,7 @@
          {
          }
  
@@ -44,7 +44,7 @@ index d67ad7d..556783f 100644
          {
              BorderWidth = 5;
              RowSpacing = 6;
-@@ -73,6 +73,7 @@ namespace Banshee.MeeGo
+@@ -73,6 +73,7 @@
              BuildHeader ();
              BuildLibrary ();
              BuildNowPlaying ();
@@ -52,7 +52,7 @@ index d67ad7d..556783f 100644
              ConnectEvents ();
  
              SetSource (ServiceManager.SourceManager.ActiveSource);
-@@ -189,6 +190,15 @@ namespace Banshee.MeeGo
+@@ -189,6 +190,15 @@
                  0, 0);
          }
  
@@ -68,6 +68,3 @@ index d67ad7d..556783f 100644
          private ScrolledWindow SetupView (Widget view)
          {
              var scrolled = new ScrolledWindow () {
--- 
-1.7.1
-
diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
index ec951f6..7fc6d2b 100644
--- a/debian/patches/06_add-meego-desktop-file.patch
+++ b/debian/patches/06_add-meego-desktop-file.patch
@@ -1,7 +1,7 @@
-Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
+Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.am
 ===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2010-08-13 00:32:56.000000000 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am	2010-08-13 00:41:07.564679264 +0800
+--- banshee.git.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2010-09-06 18:24:37.000000000 +0100
++++ banshee.git/src/Extensions/Banshee.MeeGo/Makefile.am	2010-09-06 18:35:34.157961126 +0100
 @@ -37,7 +37,8 @@
  com.meego.UX.Shell.Panels.banshee.service: com.meego.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
  	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@@ -28,11 +28,11 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
  	com.meego.UX.Shell.Panels.banshee.service.in \
  	meego-panel-banshee.desktop.in.in
 +	banshee-1.desktop.in.in
-Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
+Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.in
 ===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2010-08-13 00:32:56.000000000 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in	2010-08-13 00:45:28.823205322 +0800
-@@ -608,12 +608,14 @@
+--- banshee.git.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2010-09-06 18:31:43.000000000 +0100
++++ banshee.git/src/Extensions/Banshee.MeeGo/Makefile.in	2010-09-06 18:37:01.100668172 +0100
+@@ -624,12 +624,14 @@
  @HAVE_MEEGO_FALSE at EXTRA_DIST = $(SOURCES) $(RESOURCES) \
  @HAVE_MEEGO_FALSE@	Banshee.MeeGo.dll.config meego-panel-banshee \
  @HAVE_MEEGO_FALSE@	com.meego.UX.Shell.Panels.banshee.service.in \
@@ -49,7 +49,7 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
  @HAVE_MEEGO_TRUE at CLEANFILES = $(OUTPUT_FILES)
  @HAVE_MEEGO_TRUE at DISTCLEANFILES = *.pidb
  @HAVE_MEEGO_TRUE at MAINTAINERCLEANFILES = Makefile.in
-@@ -621,7 +623,7 @@
+@@ -637,7 +639,7 @@
  @HAVE_MEEGO_TRUE at panel_SCRIPTS = meego-panel-banshee
  @HAVE_MEEGO_TRUE at servicedir = $(datadir)/dbus-1/services
  @HAVE_MEEGO_TRUE at service_DATA = com.meego.UX.Shell.Panels.banshee.service
@@ -58,7 +58,7 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
  @HAVE_MEEGO_TRUE at desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
  @HAVE_MEEGO_TRUE at desktopfilesdir = $(datadir)/mutter-meego/panels
  @HAVE_MEEGO_TRUE at desktopfiles_DATA = $(desktopfiles_files)
-@@ -944,7 +946,9 @@
+@@ -1012,7 +1014,9 @@
  @HAVE_MEEGO_TRUE at clean-local:
  @HAVE_MEEGO_TRUE@	rm -f com.meego.UX.Shell.Panels.banshee.service \
  @HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop \
@@ -66,13 +66,13 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
 + at HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop.in \
 + at HAVE_MEEGO_TRUE@		banshee-1.desktop \
 + at HAVE_MEEGO_TRUE@		banshee-1.desktop.in
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-Index: banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
+Index: banshee.git/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2010-08-13 00:41:07.564679264 +0800
++++ banshee.git/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2010-09-06 18:35:34.157961126 +0100
 @@ -0,0 +1,11 @@
 +[Desktop Entry]
 +_Name=Banshee Netbook
diff --git a/debian/patches/07_enable-library-watch-by-default.patch b/debian/patches/07_enable-library-watch-by-default.patch
index 5c60f12..f1fba45 100644
--- a/debian/patches/07_enable-library-watch-by-default.patch
+++ b/debian/patches/07_enable-library-watch-by-default.patch
@@ -1,11 +1,11 @@
-Index: banshee-1.7.1/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
+Index: banshee.git/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
 ===================================================================
---- banshee-1.7.1.orig/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	2010-07-05 14:00:04.485387000 +0200
-+++ banshee-1.7.1/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	2010-07-05 14:00:17.377387002 +0200
+--- banshee.git.orig/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	2010-09-06 18:31:43.000000000 +0100
++++ banshee.git/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	2010-09-06 18:38:20.102209984 +0100
 @@ -8,7 +8,7 @@
      description="Automatically update music and video libraries"
      author="Christian Martellini, Alexander Hixon, Alexander Kojevnikov"
-     url="http://banshee-project.org/"
+     url="http://banshee.fm/"
 -    defaultEnabled="false">
 +    defaultEnabled="true">
  

-- 
banshee

