[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.0-1-1-g6a62bc2

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit 6a62bc284b8a9f2d4d0c2e5c452f4b018fde8ff1
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat Jun 26 22:29:17 2010 +0100

    Drop obsolete patch ubuntu_nofuse_fix_photo_import
    
    * ubuntu_nofuse_fix_photo_import.patch: Drop — obsolete with new import
      system.

diff --git a/debian/changelog b/debian/changelog
index 43d8810..470b019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+f-spot (0.7.0-2) UNRELEASED; urgency=low
+
+  * ubuntu_nofuse_fix_photo_import.patch: Drop — obsolete with new import
+    system.
+
+ -- Iain Lane <laney at ubuntu.com>  Sat, 26 Jun 2010 22:20:03 +0100
+
 f-spot (0.7.0-1) experimental; urgency=low
 
   * New upstream release 0.7.0
diff --git a/debian/patches/series b/debian/patches/series
index ee7e8e9..999e49f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ debian_libfspotjpegtran-linkage.patch
 # ubuntu_importer-targetdir-selector.patch
 
 ubuntu_fix_export_crash_FlickrRemote.cs.patch
-ubuntu_nofuse_fix_photo_import.patch
 ubuntu_xdg-photo-dir.patch
 
 #ubuntu_add_editing_to_view_mode.patch
diff --git a/debian/patches/ubuntu_nofuse_fix_photo_import.patch b/debian/patches/ubuntu_nofuse_fix_photo_import.patch
deleted file mode 100644
index 68717d5..0000000
--- a/debian/patches/ubuntu_nofuse_fix_photo_import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ubuntu_nofuse_fix_photo_import.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
-##
-## DP: Set X-GIO-NoFuse in the import desktop so gvfs uri are correctly used
-## DP: LP: #338466
-
- at DPATCH@
-Index: f-spot.git/data/desktop-files/f-spot-import.desktop.in
-===================================================================
---- f-spot.git.orig/data/desktop-files/f-spot-import.desktop.in	2010-06-16 22:02:59.069862226 +0100
-+++ f-spot.git/data/desktop-files/f-spot-import.desktop.in	2010-06-16 22:43:26.068603236 +0100
-@@ -16,3 +16,4 @@
- X-GNOME-Bugzilla-Component=General
- X-GNOME-Bugzilla-Version=0.7.0
- X-GNOME-DocPath=f-spot/f-spot.xml
-+X-GIO-NoFuse=true
-Index: f-spot.git/data/desktop-files/f-spot-import.desktop.in.in
-===================================================================
---- f-spot.git.orig/data/desktop-files/f-spot-import.desktop.in.in	2010-06-16 22:02:59.069862226 +0100
-+++ f-spot.git/data/desktop-files/f-spot-import.desktop.in.in	2010-06-16 22:43:26.068603236 +0100
-@@ -16,3 +16,4 @@
- X-GNOME-Bugzilla-Component=General
- X-GNOME-Bugzilla-Version=@VERSION@
- X-GNOME-DocPath=f-spot/f-spot.xml
-+X-GIO-NoFuse=true

-- 
f-spot