[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.1.5-3-8-g9d2d7df

[Iain Lane]

The following commit has been merged in the master branch:
commit 4669e9d03c5241072d38bf52100c798c5e0ab4f0
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon May 17 17:05:08 2010 +0100

    Drop debian_link-system-mono-addins patch as it is now upstream
    
    * debian/patches/debian_link-system-mono-addins.patch: Drop, now upstream

diff --git a/debian/changelog b/debian/changelog
index 5ae75e7..ddef66b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
     configure requirements.
   * debian/control: Add build-dependency on libunique-dev to build new
     unique-sharp bindings which f-spot now uses to handle activation.
+  * debian/patches/debian_link-system-mono-addins.patch: Drop, now upstream 
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 17 May 2010 11:59:58 +0100
 
diff --git a/debian/patches/debian_link-system-mono-addins.patch b/debian/patches/debian_link-system-mono-addins.patch
deleted file mode 100644
index 46f9b1e..0000000
--- a/debian/patches/debian_link-system-mono-addins.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## link_system_libs.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link against system libraries in preference to versions bundled in the
-## DP: f-spot tarball.
-
-Index: f-spot.git/Makefile.include
-===================================================================
---- f-spot.git.orig/Makefile.include	2009-10-29 14:18:29.542756809 +0000
-+++ f-spot.git/Makefile.include	2009-10-29 14:19:05.509756682 +0000
-@@ -3,9 +3,6 @@
- 
- ## Directories
- 
--DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
--DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
--DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
- DIR_DOCS = $(top_builddir)/docs
- DIR_EXTENSIONS = $(top_builddir)/extensions
- DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-@@ -24,10 +21,10 @@
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
- LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
--LINK_MONO_ADDINS =					\
--	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
--	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
--	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+LINK_MONO_ADDINS =			\
-+	-pkg:mono-addins		\
-+	-pkg:mono-addins-setup		\
-+	-pkg:mono-addins-gui
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
- LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
-Index: f-spot.git/configure.ac
-===================================================================
---- f-spot.git.orig/configure.ac	2009-10-29 14:18:29.578756336 +0000
-+++ f-spot.git/configure.ac	2009-10-29 14:19:05.509756682 +0000
-@@ -308,10 +308,6 @@
- lib/libgphoto2-sharp/Makefile
- lib/libjpegtran/Makefile
- lib/Makefile
--lib/mono-addins/Makefile
--lib/mono-addins/Mono.Addins.Gui/Makefile
--lib/mono-addins/Mono.Addins/Makefile
--lib/mono-addins/Mono.Addins.Setup/Makefile
- lib/semweb/Makefile
- docs/Makefile
- icons/Makefile
-Index: f-spot.git/lib/Makefile.am
-===================================================================
---- f-spot.git.orig/lib/Makefile.am	2009-10-29 14:18:29.562758733 +0000
-+++ f-spot.git/lib/Makefile.am	2009-10-29 14:19:05.509756682 +0000
-@@ -10,7 +10,6 @@
- 	libjpegtran			\
- 	libfspot			\
- 	libgphoto2-sharp	\
--	mono-addins			\
- 	semweb
- 
- # Depending on whether the packaged ndesk-dbus is used, we might not want to
diff --git a/debian/patches/series b/debian/patches/series
index 9a722cb..654e0db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 debian_fix-distclean.patch
 debian_libfspot-linkage.patch
 debian_libfspotjpegtran-linkage.patch
-debian_link-system-mono-addins.patch
 debian_link-system-flickrnet.patch
 debian_link-system-gnome-keyring.patch
 debian_disable-unit-tests

-- 
f-spot