[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 d16f327ff6789d3ddfed3b4bcbb2f732d03252fd
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Jul 14 12:16:20 2010 +0100

    Drop jpegtran-linkage patch: Obsolete
    
    No more debian originated patches remain. Yay!

diff --git a/debian/patches/debian_libfspotjpegtran-linkage.patch b/debian/patches/debian_libfspotjpegtran-linkage.patch
deleted file mode 100644
index 99139bf..0000000
--- a/debian/patches/debian_libfspotjpegtran-linkage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_libfspotjpegtran_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/libjpegtran/Makefile.am
-===================================================================
---- f-spot.git.orig/lib/libjpegtran/Makefile.am	2009-10-21 16:01:21.000000000 +0100
-+++ f-spot.git/lib/libjpegtran/Makefile.am	2010-05-17 16:33:20.006711137 +0100
-@@ -18,5 +18,6 @@
- libfspotjpegtran_la_SOURCES =			\
- 	$(libfspotjpegtran_files)
- 
-+libfspotjpegtran_la_LIBADD = $(F_LIBS)
- 
- EXTRA_DIST = README
diff --git a/debian/patches/series b/debian/patches/series
index 5ee1526..c35e68f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-# Patches that haven't been applied upstream yet.
-debian_libfspotjpegtran-linkage.patch
-
 # Patches from Ubuntu
 
 # ubuntu_importer-targetdir-selector.patch

-- 
f-spot