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

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 52b38a8cd6adaa679793ebab9d86045330b488ff
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Nov 11 22:46:06 2010 +0800

    Drop 0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch
    
    * debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch:
      + Dropped, applied upstream

diff --git a/debian/changelog b/debian/changelog
index dc1edb4..a170c38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,8 +44,10 @@ banshee (1.9.0-1) UNRELEASED; urgency=low
       - bnc#642505: Insecure LD_LIBRARY_PATH
   * debian/control:
     + Drop libmono-addins-gui-cil-dev from build-deps -- no longer needed
+  * debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch:
+    + Dropped, applied upstream
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 11 Nov 2010 15:10:59 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 11 Nov 2010 22:45:14 +0800
 
 banshee (1.8.0-2) experimental; urgency=low
 
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
deleted file mode 100644
index 59b5d0a..0000000
--- a/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 bfd45df..ef00b81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,4 @@
 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