[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.8.0-1-2-g477f2f7

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit ce133924ec669a320bf65ac670870ececb7bf4b1
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Oct 21 16:47:50 2010 +0800

    Fix duplicates on import (BGO #623441)

diff --git a/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch b/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch
new file mode 100644
index 0000000..59b5d0a
--- /dev/null
+++ b/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch
@@ -0,0 +1,29 @@
+From aa40b95bf04ce2c89be391d34c19aec0850bba1e Mon Sep 17 00:00:00 2001
+From: Alexander Kojevnikov <alexander at kojevnikov.com>
+Date: Mon, 18 Oct 2010 17:52:12 +1100
+Subject: [PATCH] DatabaseImportManager: Fix duplicates on import (bgo#623441)
+
+---
+ .../DatabaseImportManager.cs                       |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
+index 60526c7..75b7a52 100644
+--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
+@@ -175,11 +175,11 @@ namespace Banshee.Collection.Database
+             ServiceManager.DbConnection.BeginTransaction ();
+             try {
+                 track = new DatabaseTrackInfo ();
+-                track.Uri = uri;
+                 using (var file = StreamTagger.ProcessUri (uri)) {
+                     StreamTagger.TrackInfoMerge (track, file, false, true);
+                 }
+ 
++                track.Uri = uri;
+                 track.PrimarySource = trackPrimarySourceChooser (track);
+ 
+                 bool save_track = true;
+-- 
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ef00b81..bfd45df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@
 07_enable-library-watch-by-default.patch
 08_remove_unrelevant_media.patch
 0001-Don-t-copy-duplicate-libraries.patch
+0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch
 99_ltmain_as-needed.patch

-- 
banshee