[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.2-1-3-g67e1f8a

[Iain Lane]

The following commit has been merged in the master branch:
commit 67e1f8a98fa3f1588da44a1df875ba50a0ebf1eb
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed May 26 22:31:43 2010 +0100

    Drop debian/patches/debian_fix_f-spot.exe.config.patch

diff --git a/debian/changelog b/debian/changelog
index 49e7305..9f6cb37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ f-spot (0.6.2-2) UNRELEASED; urgency=low
   * debian/rules: Don't run dh_makeshilbs as we don't ship any shared
     libraries. There are some private ones though, which get picked up and
     result in a useless postinst/postrm call to ldconfig. Thanks, lintian.
-  * debian/patches/debian_fix-distclean.patch:
+  * debian/patches/debian_fix-distclean.patch,
+    debian/patches/debian_fix_f-spot.exe.config.patch:
     Clean up obsolete patches which are no longer necessary 
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 24 May 2010 10:35:57 +0100
diff --git a/debian/patches/debian_fix_f-spot.exe.config.patch b/debian/patches/debian_fix_f-spot.exe.config.patch
deleted file mode 100644
index 933d533..0000000
--- a/debian/patches/debian_fix_f-spot.exe.config.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debian_fix_f-spot.exe.config.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: f-spot.git/src/f-spot.exe.config.in
-===================================================================
---- f-spot.git.orig/src/f-spot.exe.config.in	2009-10-29 14:18:29.266756878 +0000
-+++ f-spot.git/src/f-spot.exe.config.in	2009-10-29 14:19:07.621765182 +0000
-@@ -13,4 +13,5 @@
-   <dllmap dll="libXcomposite.dll" target="libXcomposite.so.1"/>
-   <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-   <dllmap dll="libexif.dll" target="libexif.so. at EXIF_SOVERSION@"/>
-+  <dllmap dll="cairo" target="libcairo.so.2"/>
- </configuration>

-- 
f-spot