[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.0-1-16-g75c0894

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit dc409ac6b3b26b140d976b470f28bc0b0c318386
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Jul 14 12:14:02 2010 +0100

    Drop libfspot-linkage patch: Applied upstream

diff --git a/debian/patches/debian_libfspot-linkage.patch b/debian/patches/debian_libfspot-linkage.patch
deleted file mode 100644
index b68953d..0000000
--- a/debian/patches/debian_libfspot-linkage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_libfspot_linkage.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/lib/libfspot/Makefile.am
-===================================================================
---- f-spot.git.orig/lib/libfspot/Makefile.am	2009-10-21 16:01:21.000000000 +0100
-+++ f-spot.git/lib/libfspot/Makefile.am	2010-05-17 16:33:14.856720436 +0100
-@@ -31,6 +31,8 @@
- 	f-utils.h
- 
- libfspot_la_LIBADD = 					\
-+	-lX11						\
-+	$(F_LIBS)					\
- 	$(LCMS_LIBS)					\
- 	$(EXIF_LIBS)					\
- 	$(GIO_LIBS)					\
diff --git a/debian/patches/series b/debian/patches/series
index 999e49f..5ee1526 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Patches that haven't been applied upstream yet.
-debian_libfspot-linkage.patch
 debian_libfspotjpegtran-linkage.patch
 
 # Patches from Ubuntu

-- 
f-spot