[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.1.5-3-14-g486a410

[Iain Lane]

The following commit has been merged in the master branch:
commit 4eff2f4437ae35bfb26bdd2a6c66fc509563005e
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed May 19 13:30:38 2010 +0100

    ubuntu_fname_quote_percent.patch: Drop, now upstream.

diff --git a/debian/changelog b/debian/changelog
index 9aac17f..290e027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
   * debian/patches/*: Refresh to apply to new upstream version 
   * debian/rules: Pass include directories to autoreconf to have the correct
     macros in scope for the new build system 
+  * debian/patches/ubuntu_fname_quote_percent.patch: Drop, now upstream.
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 17 May 2010 11:59:58 +0100
 
diff --git a/debian/patches/ubuntu_fname_quote_percent.patch b/debian/patches/ubuntu_fname_quote_percent.patch
deleted file mode 100644
index 85fbefa..0000000
--- a/debian/patches/ubuntu_fname_quote_percent.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ubuntu_fname_quote_percent.dpatch by  <martin.pitt at ubuntu.com>
-##
-## DP: Escape '%' in file names.
-## DP: http://bugzilla.gnome.org/show_bug.cgi?id=433829,
-## DP: https://launchpad.net/bugs/258083
-
- at DPATCH@
-Index: f-spot.git/src/Utils/UriUtils.cs
-===================================================================
---- f-spot.git.orig/src/Utils/UriUtils.cs	2009-10-29 14:18:29.150757347 +0000
-+++ f-spot.git/src/Utils/UriUtils.cs	2009-10-29 14:19:08.265757117 +0000
-@@ -45,7 +45,7 @@
- 			return new Uri (builder.ToString ());
- 		}
- 
--		static char[] CharsToQuote = { ';', '?', ':', '@', '&', '=', '$', ',', '#' };
-+		static char[] CharsToQuote = { ';', '?', ':', '@', '&', '=', '$', ',', '#', '%' };
- 		// NOTE: this was copied from mono's System.Uri where it is internal.
- 		public static string EscapeString (string str, bool escapeReserved, bool escapeHex, bool escapeBrackets) 
- 		{

-- 
f-spot