diff -Nru deja-dup-20.0/debian/changelog deja-dup-20.0/debian/changelog --- deja-dup-20.0/debian/changelog 2011-09-26 20:57:54.000000000 +0000 +++ deja-dup-20.0/debian/changelog 2011-09-27 07:26:04.000000000 +0000 @@ -1,3 +1,11 @@ +deja-dup (20.0-0ubuntu3) oneiric; urgency=low + + * debian/patches/escape_globs.patch: + - Remove vala portion of patch, keeping C version. Else we trigger regenerating + C code with valac. Fixes FTBFS. + + -- Michael Terry Tue, 27 Sep 2011 03:25:29 -0400 + deja-dup (20.0-0ubuntu2) oneiric; urgency=low * debian/patches/escape_globs.patch: diff -Nru deja-dup-20.0/debian/patches/escape_globs.patch deja-dup-20.0/debian/patches/escape_globs.patch --- deja-dup-20.0/debian/patches/escape_globs.patch 2011-09-26 20:56:52.000000000 +0000 +++ deja-dup-20.0/debian/patches/escape_globs.patch 2011-09-27 07:25:24.000000000 +0000 @@ -325,47 +325,3 @@ if (_inner_error_ != NULL) { __g_list_free__g_free0_0 (envp); __g_list_free__g_free0_0 (argv); -Index: deja-dup-20.0/common/Duplicity.vala -=================================================================== ---- deja-dup-20.0.orig/common/Duplicity.vala 2011-09-26 16:55:09.906386092 -0400 -+++ deja-dup-20.0/common/Duplicity.vala 2011-09-26 16:56:50.234387156 -0400 -@@ -286,6 +286,19 @@ - expand_links_in_file(file, ref all, include); - } - -+ string escape_duplicity_path(string path) -+ { -+ // Duplicity paths are actually shell globs. So we want to escape anything -+ // that might fool duplicity into thinking this isn't the real path. -+ // Specifically, anything in '[?*'. Duplicity does not have escape -+ // characters, so we surround each with brackets. -+ string rv; -+ rv = path.replace("[", "[[]"); -+ rv = rv.replace("?", "[?]"); -+ rv = rv.replace("*", "[*]"); -+ return rv; -+ } -+ - void process_include_excludes() - { - expand_links_in_list(ref includes, true); -@@ -301,16 +314,16 @@ - var excludes2 = excludes.copy(); - foreach (File e in excludes2) { - if (e.has_prefix(i)) { -- saved_argv.append("--exclude=" + e.get_path()); -+ saved_argv.append("--exclude=" + escape_duplicity_path(e.get_path())); - excludes.remove(e); - } - } -- saved_argv.append("--include=" + i.get_path()); -+ saved_argv.append("--include=" + escape_duplicity_path(i.get_path())); - //if (!i.has_prefix(slash_home_me)) - // needs_root = true; - } - foreach (File e in excludes) { -- saved_argv.append("--exclude=" + e.get_path()); -+ saved_argv.append("--exclude=" + escape_duplicity_path(e.get_path())); - } - - saved_argv.append("--exclude=**");