[Pkg-cli-apps-commits] [SCM] f-spot branch, gbp-test, updated. debian/0.6.1.5-3-15-g1bc486f

[Iain Lane]

The following commit has been merged in the gbp-test branch:
commit 1bc486f5f21775fa42fbacff1d5ca55bffac3ac6
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun May 23 18:00:49 2010 +0100

    Rename git_* patches to upstream_*

diff --git a/debian/changelog b/debian/changelog
index faa8224..ebc0b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,7 +50,7 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
     --view mode and add an undo/redo stack. Rebase on new upstream version.
     Thanks to Chris Halse Rogers.
   * debian/patches/ubuntu_fname_quote_percent.patch: Drop, now upstream.
-  * debian/patches/git_transition_duration.patch: Cherrypick patch from
+  * debian/patches/upstream_transition_duration.patch: Cherrypick patch from
     upstream to reduce the transition duration when entering fullscreen to
     600ms. 
   * debian/rules: Incorporate Ubuntu specific changes, and guard by a call to
diff --git a/debian/patches/series b/debian/patches/series
index 58326dd..eee3ae7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,4 +24,4 @@ ubuntu_handle_broken_uris_to_view_mode.patch
 
 ubuntu_default_view_size.patch
 ubuntu_fix_folder_export_hang.patch
-git_transition_duration.patch
+upstream_transition_duration.patch
diff --git a/debian/patches/git_transition_duration.patch b/debian/patches/upstream_transition_duration.patch
similarity index 100%
rename from debian/patches/git_transition_duration.patch
rename to debian/patches/upstream_transition_duration.patch

-- 
f-spot