[Pkg-cli-apps-commits] r3886 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/importdialog_missing_icon.dpatch patches/svn-042-3817_importdialog-missing-icon.dpatch

[diocles-guest at users.alioth.debian.org]

Author: diocles-guest
Date: Tue Apr 15 20:26:58 2008
New Revision: 3886

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3886
Log:
Rename importdialog_missing_icon.dpatch

Added:
    packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch
      - copied, changed from r3869, packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch
Removed:
    packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3886&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Apr 15 20:26:58 2008
@@ -2,7 +2,7 @@
 
   * debian/patches/55-add-mimetype.dpatch:
     + Patch from Ubuntu for x-control/* mimetypes in .desktop file.
-  * debian/patches/importdialog_missing_icon.dpatch:
+  * debian/patches/svn-042-3817_importdialog-missing-icon.dpatch:
     + Show a 'missing icon' image in the import dialog rather than
       throwing an exception when f-spot icon is not found. (Closes: #459261)
   * debian/control:

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3886&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Apr 15 20:26:58 2008
@@ -5,7 +5,6 @@
 fix_libfspotjpegtran_linkage
 fix_cms_linkage
 link_system_libs
-importdialog_missing_icon
 
 # Bugfix for database updater
 fix_v8_db_update
@@ -31,5 +30,10 @@
 
 no_dup_apps_icons
 unlink_nunit
+
+# Patches from upstream SVN trunk.
+svn-042-3817_importdialog-missing-icon
+
+# Patches to be applied last.
 98_autoreconf
 99_ltmain_as-needed

Copied: packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch (from r3869, packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch?rev=3886&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/importdialog_missing_icon.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch Tue Apr 15 20:26:58 2008
@@ -1,9 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## importdialog_missing_icon.dpatch by Tim Retout <tim at retout.co.uk>
+## importdialog-missing-icon.dpatch by Tim Retout <tim at retout.co.uk>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Use the GtkUtil.TryLoadIcon method to stop a crash when the f-spot icon 
-## DP: is missing. Closes: #459261.
+## DP: is missing. Closes: #459261
+## DP: Applied upstream as SVN r3817.
 
 @DPATCH@