[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.5.4-1-1-g41c50d7

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 41c50d73c4bde959a9c419b89c5231def5c91917
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Mar 2 18:44:01 2010 +0800

    Fix a crash with sqlite

diff --git a/debian/changelog b/debian/changelog
index c10b4f9..06c3a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+banshee (1.5.4-2) UNRELEASED; urgency=low
+
+  * debian/patches/01_fix-sqlite-crash.patch:
+    + Fix a crash with sqlite (Closes: #572136)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 02 Mar 2010 18:43:55 +0800
+
 banshee (1.5.4-1) unstable; urgency=low
 
   * New upstream release (Closes: #571734)
diff --git a/debian/patches/01_fix-sqlite-crash.patch b/debian/patches/01_fix-sqlite-crash.patch
new file mode 100644
index 0000000..89e48c3
--- /dev/null
+++ b/debian/patches/01_fix-sqlite-crash.patch
@@ -0,0 +1,80 @@
+commit 854fe2820efc62b8dfea1a560bad5447e3adf1c4
+Author: Alexander Kojevnikov <alexander at kojevnikov.com>
+Date:   Fri Feb 26 12:29:28 2010 +1100
+
+    [BansheeQuery] Fix an exception (bgo#611128)
+    
+    Make sure `default_sort*` strings are already initialised when
+    calling methods that use them.
+
+diff --git a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
+index 3d48fdd..28f366f 100644
+--- a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
++++ b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
+@@ -56,31 +56,8 @@ namespace Banshee.Query
+         private static bool asc = true;
+         private static bool desc = false;
+ 
+-        public static QueryOrder RandomOrder = CreateQueryOrder ("Random",     asc,  Catalog.GetString ("Random"), null);
+-
+-        public static QueryOrder [] Orders = new QueryOrder [] {
+-            RandomOrder,
+-            CreateQueryOrder ("Album",      asc,  Catalog.GetString ("Album"), AlbumField),
+-            CreateQueryOrder ("Artist",     asc,  Catalog.GetString ("Artist"), ArtistField),
+-            // Translators: noun
+-            CreateQueryOrder ("Title",      asc,  Catalog.GetString ("Name"), TitleField),
+-            CreateQueryOrder ("Genre",      asc,  Catalog.GetString ("Genre"), GenreField),
+-            null,
+-            CreateQueryOrder ("Rating",     desc, Catalog.GetString ("Highest Rating"), RatingField),
+-            CreateQueryOrder ("Rating",     asc,  Catalog.GetString ("Lowest Rating"), RatingField),
+-            null,
+-            CreateQueryOrder ("Score",      desc, Catalog.GetString ("Highest Score"), ScoreField),
+-            CreateQueryOrder ("Score",      asc,  Catalog.GetString ("Lowest Score"), ScoreField),
+-            null,
+-            CreateQueryOrder ("PlayCount",  desc, Catalog.GetString ("Most Often Played"), PlayCountField),
+-            CreateQueryOrder ("PlayCount",  asc,  Catalog.GetString ("Least Often Played"), PlayCountField),
+-            null,
+-            CreateQueryOrder ("LastPlayedStamp", desc, Catalog.GetString ("Most Recently Played"), LastPlayedField),
+-            CreateQueryOrder ("LastPlayedStamp", asc,  Catalog.GetString ("Least Recently Played"), LastPlayedField),
+-            null,
+-            CreateQueryOrder ("DateAddedStamp",  desc, Catalog.GetString ("Most Recently Added"), DateAddedField),
+-            CreateQueryOrder ("DateAddedStamp",  asc,  Catalog.GetString ("Least Recently Added"), DateAddedField)
+-        };
++        public static readonly QueryOrder RandomOrder;
++        public static readonly QueryOrder [] Orders;
+ 
+         public static QueryLimit [] Limits = new QueryLimit [] {
+             new QueryLimit ("songs",   Catalog.GetString ("items"), true),
+@@ -375,6 +352,32 @@ namespace Banshee.Query
+ 
+             default_sort = String.Format (default_sort_template, "");
+             default_sort_by_year = String.Format (default_sort_template, "CoreTracks.Year ASC, ");
++
++            RandomOrder = CreateQueryOrder ("Random", asc, Catalog.GetString ("Random"), null);
++
++            Orders = new QueryOrder [] {
++                RandomOrder,
++                CreateQueryOrder ("Album",      asc,  Catalog.GetString ("Album"), AlbumField),
++                CreateQueryOrder ("Artist",     asc,  Catalog.GetString ("Artist"), ArtistField),
++                // Translators: noun
++                CreateQueryOrder ("Title",      asc,  Catalog.GetString ("Name"), TitleField),
++                CreateQueryOrder ("Genre",      asc,  Catalog.GetString ("Genre"), GenreField),
++                null,
++                CreateQueryOrder ("Rating",     desc, Catalog.GetString ("Highest Rating"), RatingField),
++                CreateQueryOrder ("Rating",     asc,  Catalog.GetString ("Lowest Rating"), RatingField),
++                null,
++                CreateQueryOrder ("Score",      desc, Catalog.GetString ("Highest Score"), ScoreField),
++                CreateQueryOrder ("Score",      asc,  Catalog.GetString ("Lowest Score"), ScoreField),
++                null,
++                CreateQueryOrder ("PlayCount",  desc, Catalog.GetString ("Most Often Played"), PlayCountField),
++                CreateQueryOrder ("PlayCount",  asc,  Catalog.GetString ("Least Often Played"), PlayCountField),
++                null,
++                CreateQueryOrder ("LastPlayedStamp", desc, Catalog.GetString ("Most Recently Played"), LastPlayedField),
++                CreateQueryOrder ("LastPlayedStamp", asc,  Catalog.GetString ("Least Recently Played"), LastPlayedField),
++                null,
++                CreateQueryOrder ("DateAddedStamp",  desc, Catalog.GetString ("Most Recently Added"), DateAddedField),
++                CreateQueryOrder ("DateAddedStamp",  asc,  Catalog.GetString ("Least Recently Added"), DateAddedField)
++            };
+         }
+ 
+         private const string default_sort_template = @"CoreAlbums.ArtistNameSortKey ASC, {0}CoreAlbums.TitleSortKey ASC, CoreTracks.Disc ASC, CoreTracks.TrackNumber ASC";
diff --git a/debian/patches/series b/debian/patches/series
index 2497acb..29fb66d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_fix-sqlite-crash.patch
 99_ltmain_as-needed.patch

-- 
banshee