[Pkg-cli-apps-commits] r4028 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/98_autoreconf.dpatch patches/debian_link-system-flickrnet.dpatch patches/debian_unlink-nunit.dpatch patches/svn-044-4010_gio-sharp-destdir.dpatch
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Sun Jun 22 20:50:09 UTC 2008
Author: diocles-guest
Date: Sun Jun 22 20:50:08 2008
New Revision: 4028
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4028
Log:
Update patches for f-spot 0.4.4.
Added:
packages/f-spot/trunk/debian/patches/svn-044-4010_gio-sharp-destdir.dpatch
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/00list
packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch
packages/f-spot/trunk/debian/patches/debian_unlink-nunit.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=4028&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Jun 22 20:50:08 2008
@@ -3,8 +3,15 @@
* New upstream version. (Closes: #487229)
+ Includes relicenced semweb library. (Closes: #479349)
+ Add gio-sharp/* to debian/copyright.
-
- -- Tim Retout <tim at retout.co.uk> Sun, 22 Jun 2008 21:33:03 +0100
+ + Update patches for new version:
+ - debian_unlink-nunit
+ - debian_link-system-flickrnet
+ * New patches:
+ + svn-044-4010_gio-sharp-destdir: Patch from upstream (via Ubuntu) to fix
+ missing DESTDIR variables.
+ * Redo 98_autoreconf patch for Makefile.am changes.
+
+ -- Tim Retout <tim at retout.co.uk> Sun, 22 Jun 2008 21:42:20 +0100
f-spot (0.4.3.1-1) unstable; urgency=low
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=4028&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Jun 22 20:50:08 2008
@@ -1,3 +1,6 @@
+# Patches from upstream SVN
+svn-044-4010_gio-sharp-destdir
+
# Patches that haven't been applied upstream yet.
debian_fix-distclean
debian_libfspot-linkage
Modified: packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch?rev=4028&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Sun Jun 22 20:50:08 2008
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad f-spot-0.4.3.1~/Makefile.in f-spot-0.4.3.1/Makefile.in
---- f-spot-0.4.3.1~/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/Makefile.in 2008-05-02 17:22:32.000000000 +0200
+diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
+--- f-spot~/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/Makefile.in 2008-06-22 20:55:03.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19,17 +19,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -120,7 +120,9 @@
- DEPDIR = @DEPDIR@
+@@ -121,7 +121,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -169,14 +171,12 @@
+@@ -170,14 +172,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -45,7 +45,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -188,7 +188,6 @@
+@@ -189,7 +189,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -53,7 +53,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -210,13 +209,16 @@
+@@ -212,13 +211,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -70,31 +70,22 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -246,6 +248,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -304,7 +307,6 @@
- $(DIR_DBUS_GLIB)\
+@@ -310,14 +312,12 @@
+ semweb \
docs \
glitz-sharp \
- gnome-keyring-sharp \
icons \
libeog \
libjpegtran \
-@@ -312,7 +314,6 @@
+ libfspot \
libgphoto2-sharp \
- semweb \
Tao \
- mono-addins \
tools \
po \
src \
-@@ -323,7 +324,6 @@
+@@ -330,14 +330,12 @@
dbus-sharp-glib \
docs \
glitz-sharp \
@@ -102,15 +93,14 @@
icons \
libeog \
libjpegtran \
-@@ -331,7 +331,6 @@
+ libfspot \
libgphoto2-sharp \
- semweb \
Tao \
- mono-addins \
tools \
po \
src \
-@@ -369,10 +368,8 @@
+@@ -375,10 +373,8 @@
intltool-extract \
intltool-merge \
intltool-update \
@@ -121,7 +111,7 @@
UPDATE_DESKTOP = \
if [ -f $(DESTDIR)$(datadir)/applications/defaults.list ] ; then \
if which update-desktop-database>/dev/null 2>&1 ; then \
-@@ -565,8 +562,8 @@
+@@ -571,8 +567,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -132,7 +122,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -591,8 +588,8 @@
+@@ -597,8 +593,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -143,7 +133,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -602,13 +599,12 @@
+@@ -608,13 +604,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -159,7 +149,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -679,6 +675,10 @@
+@@ -685,6 +680,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -170,7 +160,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -705,6 +705,8 @@
+@@ -711,6 +710,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -179,7 +169,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -865,8 +867,8 @@
+@@ -871,8 +872,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
@@ -190,9 +180,213 @@
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install \
install-ApplicationsDATA install-am install-data \
-diff -urNad f-spot-0.4.3.1~/Tao/Makefile.in f-spot-0.4.3.1/Tao/Makefile.in
---- f-spot-0.4.3.1~/Tao/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Makefile.in 2008-05-02 17:22:30.000000000 +0200
+@@ -892,14 +893,14 @@
+ install-data-hook:
+ $(UPDATE_DESKTOP)
+ if [ "x$(DIR_GIO)" != "x" ] ; then \
+- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \
+- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \
++ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \
++ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \
+ fi
+
+ uninstall-hook:
+ $(UPDATE_DESKTOP)
+ if [ "x$(DIR_GIO)" != "x" ] ; then \
+- rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \
++ rm -f $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \
+ fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -urNad f-spot~/Tao/Makefile.in f-spot/Tao/Makefile.in
+--- f-spot~/Tao/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/Tao/Makefile.in 2008-06-22 20:55:00.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -88,7 +88,9 @@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -137,14 +139,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -156,7 +156,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -179,13 +178,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -391,8 +393,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -417,8 +419,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -428,13 +430,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/Tao/Tao.GlPostProcess/Makefile.in f-spot/Tao/Tao.GlPostProcess/Makefile.in
+--- f-spot~/Tao/Tao.GlPostProcess/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-06-22 20:55:00.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -77,7 +77,9 @@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -126,14 +128,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -145,7 +145,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -168,13 +167,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -277,13 +279,13 @@
+ DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
+ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
+ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
++LINK_KEYRING = -pkg:gnome-keyring-sharp
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/Tao/Tao.OpenGl/Makefile.in f-spot/Tao/Tao.OpenGl/Makefile.in
+--- f-spot~/Tao/Tao.OpenGl/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-06-22 20:55:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -205,9 +399,9 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -87,7 +87,9 @@
- DEPDIR = @DEPDIR@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
@@ -238,7 +432,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -177,13 +176,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -255,55 +449,27 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -213,6 +215,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -387,8 +390,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -413,8 +416,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -424,13 +427,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad f-spot-0.4.3.1~/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.3.1/Tao/Tao.GlPostProcess/Makefile.in
---- f-spot-0.4.3.1~/Tao/Tao.GlPostProcess/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.GlPostProcess/Makefile.in 2008-05-02 17:22:30.000000000 +0200
+@@ -287,13 +289,13 @@
+ DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
+ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
+ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
++LINK_KEYRING = -pkg:gnome-keyring-sharp
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
+--- f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-06-22 20:55:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -315,17 +481,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -76,7 +76,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -125,14 +127,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -341,7 +507,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -144,7 +144,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -349,7 +515,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -166,13 +165,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -366,15 +532,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -202,6 +204,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -273,13 +276,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -392,9 +550,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.3.1/Tao/Tao.OpenGl/Makefile.in
---- f-spot-0.4.3.1~/Tao/Tao.OpenGl/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.OpenGl/Makefile.in 2008-05-02 17:22:30.000000000 +0200
+diff -urNad f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in f-spot/Tao/Tao.OpenGl.Glu/Makefile.in
+--- f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-06-22 20:55:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -406,17 +564,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -432,7 +590,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -440,7 +598,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -457,15 +615,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -483,191 +633,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.3.1/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
---- f-spot-0.4.3.1~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-02 17:22:30.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-+LINK_KEYRING = -pkg:gnome-keyring-sharp
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.3.1/Tao/Tao.OpenGl.Glu/Makefile.in
---- f-spot-0.4.3.1~/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-02 17:22:30.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-+LINK_KEYRING = -pkg:gnome-keyring-sharp
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/aclocal.m4 f-spot-0.4.3.1/aclocal.m4
---- f-spot-0.4.3.1~/aclocal.m4 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/aclocal.m4 2008-05-02 17:22:27.000000000 +0200
+diff -urNad f-spot~/aclocal.m4 f-spot/aclocal.m4
+--- f-spot~/aclocal.m4 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/aclocal.m4 2008-06-22 20:54:30.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -751,156 +719,7 @@
dnl Generate list of files to be processed by xgettext which will
dnl be included in po/Makefile.
test -d po || mkdir po
-@@ -687,6 +704,148 @@
- fi])
-
-
-+dnl GNOME_COMPILE_WARNINGS
-+dnl Turn on many useful compiler warnings
-+dnl For now, only works on GCC
-+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-+ dnl ******************************
-+ dnl More compiler warnings
-+ dnl ******************************
-+
-+ AC_ARG_ENABLE(compile-warnings,
-+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-+ [Turn on compiler warnings]),,
-+ [enable_compile_warnings="m4_default([$1],[yes])"])
-+
-+ warnCFLAGS=
-+ if test "x$GCC" != xyes; then
-+ enable_compile_warnings=no
-+ fi
-+
-+ warning_flags=
-+ realsave_CFLAGS="$CFLAGS"
-+
-+ case "$enable_compile_warnings" in
-+ no)
-+ warning_flags=
-+ ;;
-+ minimum)
-+ warning_flags="-Wall"
-+ ;;
-+ yes)
-+ warning_flags="-Wall -Wmissing-prototypes"
-+ ;;
-+ maximum|error)
-+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-+ CFLAGS="$warning_flags $CFLAGS"
-+ for option in -Wno-sign-compare; do
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $option"
-+ AC_MSG_CHECKING([whether gcc understands $option])
-+ AC_TRY_COMPILE([], [],
-+ has_option=yes,
-+ has_option=no,)
-+ CFLAGS="$SAVE_CFLAGS"
-+ AC_MSG_RESULT($has_option)
-+ if test $has_option = yes; then
-+ warning_flags="$warning_flags $option"
-+ fi
-+ unset has_option
-+ unset SAVE_CFLAGS
-+ done
-+ unset option
-+ if test "$enable_compile_warnings" = "error" ; then
-+ warning_flags="$warning_flags -Werror"
-+ fi
-+ ;;
-+ *)
-+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-+ ;;
-+ esac
-+ CFLAGS="$realsave_CFLAGS"
-+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-+ AC_MSG_RESULT($warning_flags)
-+
-+ AC_ARG_ENABLE(iso-c,
-+ AC_HELP_STRING([--enable-iso-c],
-+ [Try to warn if code is not ISO C ]),,
-+ [enable_iso_c=no])
-+
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-+ complCFLAGS=
-+ if test "x$enable_iso_c" != "xno"; then
-+ if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -ansi" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCFLAGS)
-+
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+ AC_SUBST(WARN_CFLAGS)
-+])
-+
-+dnl For C++, do basically the same thing.
-+
-+AC_DEFUN([GNOME_CXX_WARNINGS],[
-+ AC_ARG_ENABLE(cxx-warnings,
-+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-+ [Turn on compiler warnings.]),,
-+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
-+
-+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-+ warnCXXFLAGS=
-+ if test "x$GXX" != xyes; then
-+ enable_cxx_warnings=no
-+ fi
-+ if test "x$enable_cxx_warnings" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-Wall[\ \ ]*) ;;
-+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-+ esac
-+
-+ ## -W is not all that useful. And it cannot be controlled
-+ ## with individual -Wno-xxx flags, unlike -Wall
-+ if test "x$enable_cxx_warnings" = "xyes"; then
-+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-+ fi
-+ fi
-+ fi
-+ AC_MSG_RESULT($warnCXXFLAGS)
-+
-+ AC_ARG_ENABLE(iso-cxx,
-+ AC_HELP_STRING([--enable-iso-cxx],
-+ [Try to warn if code is not ISO C++ ]),,
-+ [enable_iso_cxx=no])
-+
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-+ complCXXFLAGS=
-+ if test "x$enable_iso_cxx" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-+ esac
-+
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCXXFLAGS)
-+
-+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-+ AC_SUBST(WARN_CXXFLAGS)
-+])
-+
- dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
- dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
- AC_DEFUN([GNOME_DOC_DEFINES],
-@@ -715,6 +874,10 @@
+@@ -715,6 +732,10 @@
enable_scrollkeeper=yes)
AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
@@ -911,16 +730,16 @@
AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
])
-@@ -738,7 +901,7 @@
+@@ -738,7 +759,7 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
-+# serial 36 IT_PROG_INTLTOOL
++# serial 40 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -751,7 +914,7 @@
+@@ -751,17 +772,24 @@
esac
if test -n "$1"; then
@@ -928,8 +747,27 @@
+ AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-@@ -780,6 +943,7 @@
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ ]
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+ fi
+
++AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
++AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
++AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
++fi
++
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+@@ -780,6 +808,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -937,12 +775,16 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -799,6 +963,21 @@
+@@ -799,13 +828,23 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
-+
+
+-# Use the tools built into the package, not the ones that are installed.
+-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
@@ -957,9 +799,12 @@
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
- # Use the tools built into the package, not the ones that are installed.
- AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -821,19 +1000,16 @@
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
++AC_PATH_PROG(INTLTOOL_PERL, [perl])
+ if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found; required for intltool])
+ fi
+@@ -821,19 +860,16 @@
fi
fi
@@ -983,29 +828,56 @@
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
-@@ -874,10 +1050,6 @@
- for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+@@ -854,48 +890,6 @@
+
+ IT_PO_SUBDIR([po])
+
+-dnl The following is very similar to
+-dnl
+-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+-dnl
+-dnl with the following slight differences:
+-dnl - the *.in files are in ac_aux_dir,
+-dnl - if the file haven't changed upon reconfigure, it's not touched,
+-dnl - the evaluation of the third parameter enables a hack which computes
+-dnl the actual value of $libdir,
+-dnl - the user sees "executing intltool commands", instead of
+-dnl "creating intltool-extract" and such.
+-dnl
+-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+-dnl a reason for it.
+-
+-AC_CONFIG_COMMANDS([intltool], [
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
-@@ -892,9 +1064,7 @@
- ],
- [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
- prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+-],
+-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
-
+-
])
-@@ -943,7 +1113,7 @@
+
+@@ -943,7 +937,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -1014,7 +886,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1031,7 +1201,6 @@
+@@ -1031,7 +1025,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -1022,7 +894,7 @@
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -1133,6 +1302,8 @@
+@@ -1133,6 +1126,8 @@
;;
esac
@@ -1031,7 +903,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
-@@ -1212,9 +1383,80 @@
+@@ -1212,9 +1207,80 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -1113,7 +985,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
-@@ -1539,7 +1781,11 @@
+@@ -1539,7 +1605,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -1126,7 +998,7 @@
esac
;;
esac
-@@ -1632,7 +1878,7 @@
+@@ -1632,7 +1702,7 @@
$2=yes
fi
fi
@@ -1135,7 +1007,7 @@
LDFLAGS="$save_LDFLAGS"
])
-@@ -1903,7 +2149,7 @@
+@@ -1903,7 +1973,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
@@ -1144,7 +1016,7 @@
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -1911,7 +2157,7 @@
+@@ -1911,7 +1981,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -1153,7 +1025,7 @@
])
])
])
-@@ -2228,7 +2474,7 @@
+@@ -2228,7 +2298,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -1162,7 +1034,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2569,6 +2815,18 @@
+@@ -2569,6 +2639,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1181,7 +1053,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -2749,6 +3007,13 @@
+@@ -2749,6 +2831,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -1195,7 +1067,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -3248,7 +3513,7 @@
+@@ -3248,7 +3337,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -1204,7 +1076,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3343,7 +3608,7 @@
+@@ -3343,7 +3432,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1213,7 +1085,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -3684,7 +3949,7 @@
+@@ -3684,7 +3773,7 @@
fi
;;
@@ -1222,7 +1094,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -3741,6 +4006,7 @@
+@@ -3741,6 +3830,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -1230,7 +1102,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -3850,7 +4116,7 @@
+@@ -3850,7 +3940,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -1239,7 +1111,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -3863,7 +4129,7 @@
+@@ -3863,7 +3953,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -1248,7 +1120,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -4009,51 +4275,23 @@
+@@ -4009,51 +4099,23 @@
fi
;;
darwin* | rhapsody*)
@@ -1309,7 +1181,7 @@
else
case $cc_basename in
xlc*)
-@@ -4304,7 +4542,7 @@
+@@ -4304,7 +4366,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -1318,7 +1190,7 @@
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -4377,7 +4615,7 @@
+@@ -4377,7 +4439,7 @@
;;
esac
;;
@@ -1327,7 +1199,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -4739,7 +4977,8 @@
+@@ -4739,7 +4801,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -1337,7 +1209,7 @@
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
-@@ -4864,6 +5103,11 @@
+@@ -4864,6 +4927,11 @@
$rm -f confest.$objext
@@ -1349,7 +1221,7 @@
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
-@@ -4920,7 +5164,6 @@
+@@ -4920,7 +4988,6 @@
;;
esac
])
@@ -1357,7 +1229,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -5005,7 +5248,7 @@
+@@ -5005,7 +5072,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1366,7 +1238,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -5182,6 +5425,7 @@
+@@ -5182,6 +5249,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -1374,7 +1246,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -5244,7 +5488,7 @@
+@@ -5244,7 +5312,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -1383,7 +1255,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -5481,6 +5725,10 @@
+@@ -5481,6 +5549,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -1394,7 +1266,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -5830,7 +6078,7 @@
+@@ -5830,7 +5902,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -1403,7 +1275,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -5887,7 +6135,8 @@
+@@ -5887,7 +5959,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
@@ -1413,7 +1285,7 @@
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -5924,7 +6173,7 @@
+@@ -5924,7 +5997,7 @@
esac
else
case $host_os in
@@ -1422,7 +1294,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -6020,7 +6269,7 @@
+@@ -6020,7 +6093,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
@@ -1431,7 +1303,7 @@
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -6058,7 +6307,7 @@
+@@ -6058,7 +6131,7 @@
;;
esac
;;
@@ -1440,7 +1312,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6171,7 +6420,8 @@
+@@ -6171,7 +6244,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
@@ -1450,7 +1322,7 @@
;;
darwin* | rhapsody*)
-@@ -6241,7 +6491,8 @@
+@@ -6241,7 +6315,8 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
@@ -1460,7 +1332,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -6378,7 +6629,7 @@
+@@ -6378,7 +6453,7 @@
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
@@ -1469,7 +1341,7 @@
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
-@@ -6402,7 +6653,7 @@
+@@ -6402,7 +6477,7 @@
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
@@ -1478,7 +1350,7 @@
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -6418,7 +6669,7 @@
+@@ -6418,7 +6493,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -1487,7 +1359,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -6433,10 +6684,14 @@
+@@ -6433,10 +6508,14 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
@@ -1502,7 +1374,7 @@
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -6467,12 +6722,14 @@
+@@ -6467,12 +6546,14 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -1518,7 +1390,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
-@@ -6522,7 +6779,7 @@
+@@ -6522,7 +6603,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1527,7 +1399,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6638,12 +6895,13 @@
+@@ -6638,12 +6719,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -1542,7 +1414,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6741,7 +6999,7 @@
+@@ -6741,7 +6823,7 @@
fi
;;
@@ -1551,7 +1423,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -6761,7 +7019,7 @@
+@@ -6761,7 +6843,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -1560,7 +1432,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -6921,11 +7179,10 @@
+@@ -6921,11 +7003,10 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1576,7 +1448,7 @@
else
case $cc_basename in
xlc*)
-@@ -7075,7 +7332,7 @@
+@@ -7075,7 +7156,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1585,7 +1457,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -7654,7 +7911,7 @@
+@@ -7654,7 +7735,7 @@
_PKG_TEXT
@@ -1594,7 +1466,7 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7664,7 +7921,7 @@
+@@ -7664,7 +7745,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
@@ -1603,7 +1475,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7679,7 +7936,7 @@
+@@ -7679,7 +7760,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
@@ -1612,7 +1484,7 @@
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -7695,8 +7952,10 @@
+@@ -7695,8 +7776,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -1625,7 +1497,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -7968,7 +8227,7 @@
+@@ -7968,7 +8051,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -1634,7 +1506,7 @@
dirpart=`AS_DIRNAME("$mf")`
else
continue
-@@ -8028,13 +8287,13 @@
+@@ -8028,13 +8111,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -1650,7 +1522,7 @@
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
-@@ -8139,16 +8398,17 @@
+@@ -8139,16 +8222,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
@@ -1670,7 +1542,7 @@
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-@@ -8466,7 +8726,7 @@
+@@ -8466,7 +8550,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -1679,9 +1551,9 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-diff -urNad f-spot-0.4.3.1~/config.guess f-spot-0.4.3.1/config.guess
---- f-spot-0.4.3.1~/config.guess 2007-09-21 20:24:00.000000000 +0200
-+++ f-spot-0.4.3.1/config.guess 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/config.guess f-spot/config.guess
+--- f-spot~/config.guess 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/config.guess 2008-06-22 20:54:30.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -1960,9 +1832,9 @@
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
-diff -urNad f-spot-0.4.3.1~/config.h.in~ f-spot-0.4.3.1/config.h.in~
---- f-spot-0.4.3.1~/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
-+++ f-spot-0.4.3.1/config.h.in~ 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/config.h.in~ f-spot/config.h.in~
+--- f-spot~/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
++++ f-spot/config.h.in~ 2008-06-22 20:54:30.000000000 +0100
@@ -0,0 +1,82 @@
+/* config.h.in. Generated from configure.in by autoheader. */
+
@@ -2046,9 +1918,9 @@
+
+/* Version number of package */
+#undef VERSION
-diff -urNad f-spot-0.4.3.1~/config.sub f-spot-0.4.3.1/config.sub
---- f-spot-0.4.3.1~/config.sub 2007-09-21 20:24:00.000000000 +0200
-+++ f-spot-0.4.3.1/config.sub 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/config.sub f-spot/config.sub
+--- f-spot~/config.sub 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/config.sub 2008-06-22 20:54:30.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -2221,20 +2093,30 @@
mips*-cisco)
os=-elf
;;
-diff -urNad f-spot-0.4.3.1~/configure f-spot-0.4.3.1/configure
---- f-spot-0.4.3.1~/configure 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/configure 2008-05-02 17:22:29.000000000 +0200
-@@ -847,14 +847,14 @@
+diff -urNad f-spot~/configure f-spot/configure
+--- f-spot~/configure 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/configure 2008-06-22 20:54:58.000000000 +0100
+@@ -829,6 +829,9 @@
+ MAINTAINER_MODE_TRUE
+ MAINTAINER_MODE_FALSE
+ MAINT
++INTLTOOL_UPDATE
++INTLTOOL_MERGE
++INTLTOOL_EXTRACT
+ INTLTOOL_DESKTOP_RULE
+ INTLTOOL_DIRECTORY_RULE
+ INTLTOOL_KEYS_RULE
+@@ -847,14 +850,11 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
+-INTLTOOL_EXTRACT
+-INTLTOOL_MERGE
+-INTLTOOL_UPDATE
+INTLTOOL_POLICY_RULE
+XGETTEXT
+MSGMERGE
+MSGFMT
- INTLTOOL_EXTRACT
- INTLTOOL_MERGE
- INTLTOOL_UPDATE
INTLTOOL_PERL
-INTLTOOL_ICONV
-INTLTOOL_MSGFMT
@@ -2252,15 +2134,7 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -900,6 +902,7 @@
- FFLAGS
- ac_ct_F77
- LIBTOOL
-+WARN_CFLAGS
- PKG_CONFIG
- GLIB_CFLAGS
- GLIB_LIBS
-@@ -913,6 +916,7 @@
+@@ -913,6 +915,7 @@
DOC_USER_FORMATS
ENABLE_SK_TRUE
ENABLE_SK_FALSE
@@ -2268,7 +2142,7 @@
HAVE_GNOME_DOC_UTILS_TRUE
HAVE_GNOME_DOC_UTILS_FALSE
F_CFLAGS
-@@ -968,10 +972,8 @@
+@@ -972,10 +975,8 @@
ICONS_DIRECTORY
GETTEXT_PACKAGE
USE_NLS
@@ -2279,7 +2153,7 @@
CATALOGS
CATOBJEXT
GMOFILES
-@@ -981,6 +983,7 @@
+@@ -985,6 +986,7 @@
PO_IN_DATADIR_FALSE
POFILES
POSUB
@@ -2287,17 +2161,151 @@
LIBJPEG
CSC
expanded_libdir
-@@ -1618,6 +1621,9 @@
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=yes]
- --disable-libtool-lock avoid locking (might break parallel builds)
-+ --enable-compile-warnings=[no/minimum/yes/maximum/error]
-+ Turn on compiler warnings
-+ --enable-iso-c Try to warn if code is not ISO C
- --disable-glibtest do not try to compile and run a test GLIB program
- --disable-scrollkeeper do not make updates to the scrollkeeper database
- --disable-gconf build without gconf preference backend
-@@ -3858,6 +3864,7 @@
+@@ -3833,8 +3835,8 @@
+ echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+@@ -3844,6 +3846,132 @@
+ { (exit 1); exit 1; }; }
+ fi
+
++# Extract the first word of "intltool-update", so it can be a program name with args.
++set dummy intltool-update; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_UPDATE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
++if test -n "$INTLTOOL_UPDATE"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-merge", so it can be a program name with args.
++set dummy intltool-merge; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_MERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
++if test -n "$INTLTOOL_MERGE"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-extract", so it can be a program name with args.
++set dummy intltool-extract; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_EXTRACT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
++if test -n "$INTLTOOL_EXTRACT"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
++echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -3862,6 +3990,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -2305,7 +2313,7 @@
-@@ -3878,24 +3885,18 @@
+@@ -3882,24 +4011,18 @@
@@ -2336,7 +2344,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3905,7 +3906,7 @@
+@@ -3909,7 +4032,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2345,7 +2353,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -3916,49 +3917,26 @@
+@@ -3920,49 +4043,26 @@
;;
esac
fi
@@ -2404,7 +2412,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3968,7 +3946,7 @@
+@@ -3972,7 +4072,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2413,7 +2421,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -3976,14 +3954,13 @@
+@@ -3980,14 +4080,13 @@
done
IFS=$as_save_IFS
@@ -2432,7 +2440,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -3994,12 +3971,12 @@
+@@ -3998,12 +4097,12 @@
set dummy msgfmt; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
@@ -2448,7 +2456,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4009,7 +3986,7 @@
+@@ -4013,7 +4112,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2457,7 +2465,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4017,71 +3994,51 @@
+@@ -4021,71 +4120,43 @@
done
IFS=$as_save_IFS
@@ -2530,16 +2538,9 @@
+ { (exit 1); exit 1; }; }
fi
-+# Use the tools built into the package, not the ones that are installed.
-+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-
+-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-+
-+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-+
-+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -2556,7 +2557,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4091,7 +4048,7 @@
+@@ -4095,7 +4166,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2565,7 +2566,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4099,20 +4056,41 @@
+@@ -4103,20 +4174,41 @@
done
IFS=$as_save_IFS
@@ -2612,7 +2613,7 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-@@ -4131,7 +4109,7 @@
+@@ -4135,7 +4227,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
@@ -2621,7 +2622,18 @@
;
return 0;
}
-@@ -6132,7 +6110,7 @@
+@@ -4267,10 +4359,6 @@
+
+
+
+-ac_config_commands="$ac_config_commands intltool"
+-
+-
+-
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -6136,7 +6224,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -2630,7 +2642,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6227,7 +6205,7 @@
+@@ -6231,7 +6319,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -2639,16 +2651,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6347,7 +6325,7 @@
+@@ -6351,7 +6439,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6350 "configure"' > conftest.$ac_ext
-+ echo '#line 6328 "configure"' > conftest.$ac_ext
+- echo '#line 6354 "configure"' > conftest.$ac_ext
++ echo '#line 6442 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6519,7 +6497,11 @@
+@@ -6523,7 +6611,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -2661,7 +2673,7 @@
esac
;;
esac
-@@ -7711,7 +7693,6 @@
+@@ -7715,7 +7807,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -2669,7 +2681,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -8026,7 +8007,7 @@
+@@ -8030,7 +8121,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -2678,7 +2690,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -8586,6 +8567,318 @@
+@@ -8590,6 +8681,318 @@
;;
esac
@@ -2997,7 +3009,7 @@
enable_dlopen=no
enable_win32_dll=no
-@@ -8651,7 +8944,7 @@
+@@ -8655,7 +9058,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -3006,21 +3018,21 @@
-@@ -8679,11 +8972,11 @@
+@@ -8683,11 +9086,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8682: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8975: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8686: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9089: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8686: \$? = $ac_status" >&5
-+ echo "$as_me:8979: \$? = $ac_status" >&5
+- echo "$as_me:8690: \$? = $ac_status" >&5
++ echo "$as_me:9093: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8953,10 +9246,10 @@
+@@ -8957,10 +9360,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -3033,17 +3045,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -8969,27 +9262,27 @@
+@@ -8973,27 +9376,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8972: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9265: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8976: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9379: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8976: \$? = $ac_status" >&5
-+ echo "$as_me:9269: \$? = $ac_status" >&5
+- echo "$as_me:8980: \$? = $ac_status" >&5
++ echo "$as_me:9383: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -3067,7 +3079,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -9016,10 +9309,10 @@
+@@ -9020,10 +9423,10 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -3080,7 +3092,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -9032,20 +9325,20 @@
+@@ -9036,20 +9439,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -3107,21 +3119,21 @@
:
else
lt_prog_compiler_static=
-@@ -9073,11 +9366,11 @@
+@@ -9077,11 +9480,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9076: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9080: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9483: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9080: \$? = $ac_status" >&5
-+ echo "$as_me:9373: \$? = $ac_status" >&5
+- echo "$as_me:9084: \$? = $ac_status" >&5
++ echo "$as_me:9487: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9157,12 +9450,13 @@
+@@ -9161,12 +9564,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -3136,7 +3148,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -9221,7 +9515,7 @@
+@@ -9225,7 +9629,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -3145,7 +3157,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -9337,12 +9631,13 @@
+@@ -9341,12 +9745,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -3160,7 +3172,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9440,7 +9735,7 @@
+@@ -9444,7 +9849,7 @@
fi
;;
@@ -3169,7 +3181,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -9460,7 +9755,7 @@
+@@ -9464,7 +9869,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -3178,7 +3190,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -9732,11 +10027,10 @@
+@@ -9736,11 +10141,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -3194,7 +3206,7 @@
else
case $cc_basename in
xlc*)
-@@ -9886,7 +10180,7 @@
+@@ -9890,7 +10294,7 @@
link_all_deplibs=yes
;;
@@ -3203,7 +3215,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10256,7 +10550,7 @@
+@@ -10260,7 +10664,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3212,7 +3224,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10597,6 +10891,18 @@
+@@ -10601,6 +11005,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3231,7 +3243,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10778,6 +11084,21 @@
+@@ -10782,6 +11198,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3253,7 +3265,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -11097,7 +11418,7 @@
+@@ -11101,7 +11532,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -3262,7 +3274,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -11373,7 +11694,7 @@
+@@ -11377,7 +11808,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -3271,25 +3283,25 @@
fi
-@@ -11422,7 +11743,7 @@
+@@ -11426,7 +11857,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11425 "configure"
-+#line 11746 "configure"
+-#line 11429 "configure"
++#line 11860 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11522,7 +11843,7 @@
+@@ -11526,7 +11957,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11525 "configure"
-+#line 11846 "configure"
+-#line 11529 "configure"
++#line 11960 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11649,7 +11970,7 @@
+@@ -11653,7 +12084,7 @@
fi
;;
@@ -3298,7 +3310,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11705,6 +12026,7 @@
+@@ -11709,6 +12140,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -3306,7 +3318,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -11765,7 +12087,7 @@
+@@ -11769,7 +12201,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -3315,7 +3327,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12001,6 +12323,10 @@
+@@ -12005,6 +12437,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -3326,7 +3338,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -12249,6 +12575,7 @@
+@@ -12253,6 +12689,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -3334,7 +3346,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -12286,7 +12613,7 @@
+@@ -12290,7 +12727,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -3343,7 +3355,7 @@
# Allow CC to be a program name with arguments.
-@@ -12493,7 +12820,7 @@
+@@ -12497,7 +12934,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -3352,7 +3364,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -12506,7 +12833,7 @@
+@@ -12510,7 +12947,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -3361,7 +3373,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -12764,51 +13091,23 @@
+@@ -12768,51 +13205,23 @@
fi
;;
darwin* | rhapsody*)
@@ -3422,7 +3434,7 @@
else
case $cc_basename in
xlc*)
-@@ -13059,7 +13358,7 @@
+@@ -13063,7 +13472,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -3431,7 +3443,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -13132,7 +13431,7 @@
+@@ -13136,7 +13545,7 @@
;;
esac
;;
@@ -3440,7 +3452,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13466,7 +13765,6 @@
+@@ -13470,7 +13879,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -3448,7 +3460,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -13568,6 +13866,11 @@
+@@ -13572,6 +13980,11 @@
$rm -f confest.$objext
@@ -3460,7 +3472,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
-@@ -13623,7 +13926,6 @@
+@@ -13627,7 +14040,6 @@
;;
esac
@@ -3468,7 +3480,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13699,7 +14001,7 @@
+@@ -13703,7 +14115,7 @@
esac
else
case $host_os in
@@ -3477,7 +3489,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -13795,7 +14097,7 @@
+@@ -13799,7 +14211,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -3486,7 +3498,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -13833,7 +14135,7 @@
+@@ -13837,7 +14249,7 @@
;;
esac
;;
@@ -3495,7 +3507,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13926,10 +14228,10 @@
+@@ -13930,10 +14342,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -3508,17 +3520,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -13942,27 +14244,27 @@
+@@ -13946,27 +14358,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13945: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14247: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13949: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14361: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13949: \$? = $ac_status" >&5
-+ echo "$as_me:14251: \$? = $ac_status" >&5
+- echo "$as_me:13953: \$? = $ac_status" >&5
++ echo "$as_me:14365: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -3542,7 +3554,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -13989,10 +14291,10 @@
+@@ -13993,10 +14405,10 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -3555,7 +3567,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14005,20 +14307,20 @@
+@@ -14009,20 +14421,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -3582,21 +3594,21 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -14046,11 +14348,11 @@
+@@ -14050,11 +14462,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14049: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14053: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14465: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14053: \$? = $ac_status" >&5
-+ echo "$as_me:14355: \$? = $ac_status" >&5
+- echo "$as_me:14057: \$? = $ac_status" >&5
++ echo "$as_me:14469: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14103,7 +14405,7 @@
+@@ -14107,7 +14519,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -3605,7 +3617,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -14118,10 +14420,14 @@
+@@ -14122,10 +14534,14 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -3620,7 +3632,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -14223,7 +14529,7 @@
+@@ -14227,7 +14643,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3629,7 +3641,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14563,6 +14869,18 @@
+@@ -14567,6 +14983,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3648,7 +3660,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14744,6 +15062,21 @@
+@@ -14748,6 +15176,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3670,7 +3682,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -14827,6 +15160,7 @@
+@@ -14831,6 +15274,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -3678,7 +3690,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -15075,6 +15409,10 @@
+@@ -15079,6 +15523,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -3689,7 +3701,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -15289,7 +15627,7 @@
+@@ -15293,7 +15741,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -3698,7 +3710,7 @@
# Allow CC to be a program name with arguments.
-@@ -15327,7 +15665,7 @@
+@@ -15331,7 +15779,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -3707,7 +3719,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -15592,10 +15930,10 @@
+@@ -15596,10 +16044,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -3720,17 +3732,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -15608,27 +15946,27 @@
+@@ -15612,27 +16060,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15611: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15949: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15615: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16063: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15615: \$? = $ac_status" >&5
-+ echo "$as_me:15953: \$? = $ac_status" >&5
+- echo "$as_me:15619: \$? = $ac_status" >&5
++ echo "$as_me:16067: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -3754,7 +3766,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -15655,10 +15993,10 @@
+@@ -15659,10 +16107,10 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -3767,7 +3779,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -15671,20 +16009,20 @@
+@@ -15675,20 +16123,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -3794,21 +3806,21 @@
:
else
lt_prog_compiler_static_F77=
-@@ -15712,11 +16050,11 @@
+@@ -15716,11 +16164,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15715: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16053: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15719: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16167: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15719: \$? = $ac_status" >&5
-+ echo "$as_me:16057: \$? = $ac_status" >&5
+- echo "$as_me:15723: \$? = $ac_status" >&5
++ echo "$as_me:16171: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15796,12 +16134,13 @@
+@@ -15800,12 +16248,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -3823,7 +3835,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -15860,7 +16199,7 @@
+@@ -15864,7 +16313,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -3832,7 +3844,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -15976,12 +16315,13 @@
+@@ -15980,12 +16429,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -3847,7 +3859,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16079,7 +16419,7 @@
+@@ -16083,7 +16533,7 @@
fi
;;
@@ -3856,7 +3868,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -16099,7 +16439,7 @@
+@@ -16103,7 +16553,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -3865,7 +3877,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -16351,11 +16691,10 @@
+@@ -16355,11 +16805,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -3881,7 +3893,7 @@
else
case $cc_basename in
xlc*)
-@@ -16505,7 +16844,7 @@
+@@ -16509,7 +16958,7 @@
link_all_deplibs_F77=yes
;;
@@ -3890,7 +3902,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16824,7 +17163,7 @@
+@@ -16828,7 +17277,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3899,7 +3911,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17164,6 +17503,18 @@
+@@ -17168,6 +17617,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3918,7 +3930,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17345,6 +17696,21 @@
+@@ -17349,6 +17810,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3940,7 +3952,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -17428,6 +17794,7 @@
+@@ -17432,6 +17908,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -3948,7 +3960,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -17676,6 +18043,10 @@
+@@ -17680,6 +18157,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -3959,7 +3971,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -17850,7 +18221,7 @@
+@@ -17854,7 +18335,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -3968,21 +3980,21 @@
# Allow CC to be a program name with arguments.
-@@ -17899,11 +18270,11 @@
+@@ -17903,11 +18384,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17902: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18273: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17906: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18387: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17906: \$? = $ac_status" >&5
-+ echo "$as_me:18277: \$? = $ac_status" >&5
+- echo "$as_me:17910: \$? = $ac_status" >&5
++ echo "$as_me:18391: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17963,7 +18334,7 @@
+@@ -17967,7 +18448,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
@@ -3991,7 +4003,7 @@
;;
darwin* | rhapsody*)
-@@ -18033,7 +18404,7 @@
+@@ -18037,7 +18518,7 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
@@ -4000,7 +4012,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -18173,10 +18544,10 @@
+@@ -18177,10 +18658,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -4013,17 +4025,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -18189,27 +18560,27 @@
+@@ -18193,27 +18674,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18192: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18563: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18196: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18677: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18196: \$? = $ac_status" >&5
-+ echo "$as_me:18567: \$? = $ac_status" >&5
+- echo "$as_me:18200: \$? = $ac_status" >&5
++ echo "$as_me:18681: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -4047,7 +4059,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -18236,10 +18607,10 @@
+@@ -18240,10 +18721,10 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -4060,7 +4072,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -18252,20 +18623,20 @@
+@@ -18256,20 +18737,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -4087,21 +4099,21 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -18293,11 +18664,11 @@
+@@ -18297,11 +18778,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18296: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18667: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18300: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18781: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18300: \$? = $ac_status" >&5
-+ echo "$as_me:18671: \$? = $ac_status" >&5
+- echo "$as_me:18304: \$? = $ac_status" >&5
++ echo "$as_me:18785: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18377,12 +18748,13 @@
+@@ -18381,12 +18862,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -4116,7 +4128,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -18441,7 +18813,7 @@
+@@ -18445,7 +18927,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -4125,7 +4137,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -18557,12 +18929,13 @@
+@@ -18561,12 +19043,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -4140,7 +4152,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18660,7 +19033,7 @@
+@@ -18664,7 +19147,7 @@
fi
;;
@@ -4149,7 +4161,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -18680,7 +19053,7 @@
+@@ -18684,7 +19167,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -4158,7 +4170,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -18952,11 +19325,10 @@
+@@ -18956,11 +19439,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -4174,7 +4186,7 @@
else
case $cc_basename in
xlc*)
-@@ -19106,7 +19478,7 @@
+@@ -19110,7 +19592,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -4183,7 +4195,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19425,7 +19797,7 @@
+@@ -19429,7 +19911,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -4192,7 +4204,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19765,6 +20137,18 @@
+@@ -19769,6 +20251,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4211,7 +4223,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19946,6 +20330,21 @@
+@@ -19950,6 +20444,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -4233,7 +4245,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -20029,6 +20428,7 @@
+@@ -20033,6 +20542,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -4241,7 +4253,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -20277,6 +20677,10 @@
+@@ -20281,6 +20791,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -4252,7 +4264,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -20450,7 +20854,7 @@
+@@ -20454,7 +20968,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -4261,7 +4273,7 @@
# Allow CC to be a program name with arguments.
-@@ -20510,6 +20914,7 @@
+@@ -20514,6 +21028,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -4269,7 +4281,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -20758,6 +21163,10 @@
+@@ -20762,6 +21277,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -4280,147 +4292,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -20946,7 +21355,138 @@
-
-
-
--GNOME_COMPILE_WARNINGS
-+
-+
-+ # Check whether --enable-compile-warnings was given.
-+if test "${enable_compile_warnings+set}" = set; then
-+ enableval=$enable_compile_warnings;
-+else
-+ enable_compile_warnings="yes"
-+fi
-+
-+
-+ warnCFLAGS=
-+ if test "x$GCC" != xyes; then
-+ enable_compile_warnings=no
-+ fi
-+
-+ warning_flags=
-+ realsave_CFLAGS="$CFLAGS"
-+
-+ case "$enable_compile_warnings" in
-+ no)
-+ warning_flags=
-+ ;;
-+ minimum)
-+ warning_flags="-Wall"
-+ ;;
-+ yes)
-+ warning_flags="-Wall -Wmissing-prototypes"
-+ ;;
-+ maximum|error)
-+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-+ CFLAGS="$warning_flags $CFLAGS"
-+ for option in -Wno-sign-compare; do
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $option"
-+ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ has_option=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ has_option=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ CFLAGS="$SAVE_CFLAGS"
-+ { echo "$as_me:$LINENO: result: $has_option" >&5
-+echo "${ECHO_T}$has_option" >&6; }
-+ if test $has_option = yes; then
-+ warning_flags="$warning_flags $option"
-+ fi
-+ unset has_option
-+ unset SAVE_CFLAGS
-+ done
-+ unset option
-+ if test "$enable_compile_warnings" = "error" ; then
-+ warning_flags="$warning_flags -Werror"
-+ fi
-+ ;;
-+ *)
-+ { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-+echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ esac
-+ CFLAGS="$realsave_CFLAGS"
-+ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $warning_flags" >&5
-+echo "${ECHO_T}$warning_flags" >&6; }
-+
-+ # Check whether --enable-iso-c was given.
-+if test "${enable_iso_c+set}" = set; then
-+ enableval=$enable_iso_c;
-+else
-+ enable_iso_c=no
-+fi
-+
-+
-+ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
-+ complCFLAGS=
-+ if test "x$enable_iso_c" != "xno"; then
-+ if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *\ \ -ansi\ \ *) ;;
-+ *) complCFLAGS="$complCFLAGS -ansi" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *\ \ -pedantic\ \ *) ;;
-+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+echo "${ECHO_T}$complCFLAGS" >&6; }
-+
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+
-+
- # Check whether --enable-glibtest was given.
- if test "${enable_glibtest+set}" = set; then
- enableval=$enable_glibtest;
-@@ -20971,6 +21511,9 @@
+@@ -20975,6 +21494,9 @@
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
@@ -4430,7 +4302,7 @@
esac
done
-@@ -21081,7 +21624,7 @@
+@@ -21085,7 +21607,7 @@
fi
if test -n "$PKG_CONFIG"; then
@@ -4439,7 +4311,7 @@
{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-@@ -21513,6 +22056,9 @@
+@@ -21517,6 +22039,9 @@
fi
@@ -4449,7 +4321,7 @@
if test "$gdu_cv_have_gdu" = "yes"; then
HAVE_GNOME_DOC_UTILS_TRUE=
HAVE_GNOME_DOC_UTILS_FALSE='#'
-@@ -21656,7 +22202,7 @@
+@@ -21660,7 +22185,7 @@
and F_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4458,7 +4330,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21666,7 +22212,7 @@
+@@ -21670,7 +22195,7 @@
and F_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4467,7 +4339,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21771,7 +22317,7 @@
+@@ -21775,7 +22300,7 @@
and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4476,7 +4348,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21781,7 +22327,7 @@
+@@ -21785,7 +22310,7 @@
and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4485,7 +4357,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21883,7 +22429,7 @@
+@@ -21887,7 +22412,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4494,7 +4366,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21893,7 +22439,7 @@
+@@ -21897,7 +22422,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4503,7 +4375,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21997,7 +22543,7 @@
+@@ -22001,7 +22526,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4512,7 +4384,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22007,7 +22553,7 @@
+@@ -22011,7 +22536,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4521,7 +4393,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22144,7 +22690,7 @@
+@@ -22176,7 +22701,7 @@
and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4530,7 +4402,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22154,7 +22700,7 @@
+@@ -22186,7 +22711,7 @@
and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4539,7 +4411,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23795,7 +24341,7 @@
+@@ -23830,7 +24355,7 @@
and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4548,7 +4420,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23805,7 +24351,7 @@
+@@ -23840,7 +24365,7 @@
and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4557,7 +4429,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23909,7 +24455,7 @@
+@@ -23944,7 +24469,7 @@
and EXIF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4566,7 +4438,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23919,7 +24465,7 @@
+@@ -23954,7 +24479,7 @@
and EXIF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4575,7 +4447,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24264,7 +24810,7 @@
+@@ -24321,7 +24846,7 @@
fi
fi
@@ -4584,7 +4456,7 @@
gt_cv_have_gettext=no
-@@ -25556,6 +26102,15 @@
+@@ -25613,6 +26138,15 @@
fi
fi
@@ -4600,7 +4472,7 @@
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -25593,7 +26148,7 @@
+@@ -25650,7 +26184,7 @@
GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
@@ -4609,18 +4481,27 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -26225,9 +26780,7 @@
+@@ -26280,11 +26814,6 @@
+ # INIT-COMMANDS
+ #
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
- prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
_ACEOF
-@@ -26254,10 +26807,6 @@
+@@ -26297,7 +26826,6 @@
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "src/f-spot") CONFIG_FILES="$CONFIG_FILES src/f-spot" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+@@ -26311,10 +26839,6 @@
"libjpegtran/Makefile") CONFIG_FILES="$CONFIG_FILES libjpegtran/Makefile" ;;
"libfspot/Makefile") CONFIG_FILES="$CONFIG_FILES libfspot/Makefile" ;;
"libgphoto2-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES libgphoto2-sharp/Makefile" ;;
@@ -4631,7 +4512,7 @@
"semweb/Makefile") CONFIG_FILES="$CONFIG_FILES semweb/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-@@ -26277,7 +26826,6 @@
+@@ -26334,7 +26858,6 @@
"extensions/CDExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/CDExport/Makefile" ;;
"extensions/DefaultExporters/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/DefaultExporters/Makefile" ;;
"extensions/FlickrExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/FlickrExport/Makefile" ;;
@@ -4639,17 +4520,27 @@
"extensions/GalleryExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/GalleryExport/Makefile" ;;
"extensions/FolderExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/FolderExport/Makefile" ;;
"extensions/SmugMugExport/SmugMugNet/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/SmugMugExport/SmugMugNet/Makefile" ;;
-@@ -26432,14 +26980,14 @@
+@@ -26471,6 +26994,9 @@
+ MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+ MAINT!$MAINT$ac_delim
++INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
++INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
++INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+ INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+ INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+ INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
+@@ -26489,14 +27015,11 @@
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+MSGFMT!$MSGFMT$ac_delim
- INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
- INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
- INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
@@ -4658,7 +4549,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
-@@ -26515,6 +27063,8 @@
+@@ -26572,6 +27095,8 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -4667,15 +4558,7 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26526,6 +27076,7 @@
- FFLAGS!$FFLAGS$ac_delim
- ac_ct_F77!$ac_ct_F77$ac_delim
- LIBTOOL!$LIBTOOL$ac_delim
-+WARN_CFLAGS!$WARN_CFLAGS$ac_delim
- PKG_CONFIG!$PKG_CONFIG$ac_delim
- GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
- GLIB_LIBS!$GLIB_LIBS$ac_delim
-@@ -26539,6 +27090,7 @@
+@@ -26596,6 +27121,7 @@
DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
@@ -4683,29 +4566,27 @@
HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
F_CFLAGS!$F_CFLAGS$ac_delim
-@@ -26583,10 +27135,6 @@
- LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
- EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
- EXIF_LIBS!$EXIF_LIBS$ac_delim
--LIBEXIF_VERSION_CHECK_CFLAGS!$LIBEXIF_VERSION_CHECK_CFLAGS$ac_delim
--LIBEXIF_VERSION_CHECK_LIBS!$LIBEXIF_VERSION_CHECK_LIBS$ac_delim
--EXIF_SOVERSION!$EXIF_SOVERSION$ac_delim
--WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
+@@ -26641,9 +27167,6 @@
+ LCMS_CFLAGS!$LCMS_CFLAGS$ac_delim
+ LCMS_LIBS!$LCMS_LIBS$ac_delim
+ LIBGPHOTO2_CFLAGS!$LIBGPHOTO2_CFLAGS$ac_delim
+-LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
+-EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
+-EXIF_LIBS!$EXIF_LIBS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26628,6 +27176,10 @@
+@@ -26685,6 +27208,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+LIBEXIF_VERSION_CHECK_CFLAGS!$LIBEXIF_VERSION_CHECK_CFLAGS$ac_delim
-+LIBEXIF_VERSION_CHECK_LIBS!$LIBEXIF_VERSION_CHECK_LIBS$ac_delim
-+EXIF_SOVERSION!$EXIF_SOVERSION$ac_delim
-+WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
- WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
- TURTLEDIR!$TURTLEDIR$ac_delim
- GNOME_SCREENSAVER_SAVERDIR!$GNOME_SCREENSAVER_SAVERDIR$ac_delim
-@@ -26635,10 +27187,8 @@
++LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
++EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
++EXIF_LIBS!$EXIF_LIBS$ac_delim
+ LIBEXIF_VERSION_CHECK_CFLAGS!$LIBEXIF_VERSION_CHECK_CFLAGS$ac_delim
+ LIBEXIF_VERSION_CHECK_LIBS!$LIBEXIF_VERSION_CHECK_LIBS$ac_delim
+ EXIF_SOVERSION!$EXIF_SOVERSION$ac_delim
+@@ -26696,10 +27222,8 @@
ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
@@ -4716,7 +4597,7 @@
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
-@@ -26648,6 +27198,7 @@
+@@ -26709,6 +27233,7 @@
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
@@ -4724,16 +4605,16 @@
LIBJPEG!$LIBJPEG$ac_delim
CSC!$CSC$ac_delim
expanded_libdir!$expanded_libdir$ac_delim
-@@ -26656,7 +27207,7 @@
+@@ -26717,7 +27242,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -27057,21 +27608,22 @@
+@@ -27118,21 +27643,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -4763,7 +4644,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27108,7 +27660,7 @@
+@@ -27169,7 +27695,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -4772,20 +4653,37 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -27227,10 +27779,6 @@
- for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+@@ -27283,27 +27809,6 @@
+ done
+ done
+ ;;
+- "intltool":C)
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
-diff -urNad f-spot-0.4.3.1~/dbus-sharp/Makefile.in f-spot-0.4.3.1/dbus-sharp/Makefile.in
---- f-spot-0.4.3.1~/dbus-sharp/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/dbus-sharp/Makefile.in 2008-05-02 17:22:30.000000000 +0200
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+- ;;
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac ;;
+diff -urNad f-spot~/dbus-sharp/Makefile.in f-spot/dbus-sharp/Makefile.in
+--- f-spot~/dbus-sharp/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/dbus-sharp/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4797,17 +4695,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4823,7 +4721,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4831,7 +4729,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -4848,15 +4746,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -4874,9 +4764,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/dbus-sharp-glib/Makefile.in f-spot-0.4.3.1/dbus-sharp-glib/Makefile.in
---- f-spot-0.4.3.1~/dbus-sharp-glib/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/dbus-sharp-glib/Makefile.in 2008-05-02 17:22:30.000000000 +0200
+diff -urNad f-spot~/dbus-sharp-glib/Makefile.in f-spot/dbus-sharp-glib/Makefile.in
+--- f-spot~/dbus-sharp-glib/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/dbus-sharp-glib/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4888,17 +4778,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4914,7 +4804,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4922,7 +4812,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -4939,15 +4829,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -4965,9 +4847,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/docs/Makefile.in f-spot-0.4.3.1/docs/Makefile.in
---- f-spot-0.4.3.1~/docs/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/docs/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/docs/Makefile.in f-spot/docs/Makefile.in
+--- f-spot~/docs/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/docs/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4979,17 +4861,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -100,7 +100,9 @@
- DEPDIR = @DEPDIR@
+@@ -101,7 +101,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -149,14 +151,12 @@
+@@ -150,14 +152,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5005,7 +4887,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -168,7 +168,6 @@
+@@ -169,7 +169,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5013,7 +4895,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -190,13 +189,16 @@
+@@ -192,13 +191,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -5030,17 +4912,9 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -226,6 +228,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad f-spot-0.4.3.1~/extensions/CDExport/Makefile.in f-spot-0.4.3.1/extensions/CDExport/Makefile.in
---- f-spot-0.4.3.1~/extensions/CDExport/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/CDExport/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/CDExport/Makefile.in f-spot/extensions/CDExport/Makefile.in
+--- f-spot~/extensions/CDExport/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/CDExport/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5052,17 +4926,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5078,7 +4952,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5086,7 +4960,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -5103,15 +4977,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -5129,9 +4995,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/extensions/DefaultExporters/Makefile.in f-spot-0.4.3.1/extensions/DefaultExporters/Makefile.in
---- f-spot-0.4.3.1~/extensions/DefaultExporters/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/DefaultExporters/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/DefaultExporters/Makefile.in f-spot/extensions/DefaultExporters/Makefile.in
+--- f-spot~/extensions/DefaultExporters/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/DefaultExporters/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5143,17 +5009,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5169,7 +5035,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5177,7 +5043,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -5194,15 +5060,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -5220,9 +5078,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/extensions/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.3.1/extensions/FlickrExport/FlickrNet/Makefile.in
---- f-spot-0.4.3.1~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in f-spot/extensions/FlickrExport/FlickrNet/Makefile.in
+--- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-06-22 20:54:30.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5234,17 +5092,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +136,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5260,7 +5108,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +153,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5268,7 +5116,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +175,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -5285,7 +5133,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -287,9 +289,9 @@
+@@ -291,9 +291,9 @@
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -5298,9 +5146,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/extensions/FlickrExport/Makefile.in f-spot-0.4.3.1/extensions/FlickrExport/Makefile.in
---- f-spot-0.4.3.1~/extensions/FlickrExport/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/FlickrExport/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/FlickrExport/Makefile.in f-spot/extensions/FlickrExport/Makefile.in
+--- f-spot~/extensions/FlickrExport/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/FlickrExport/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5338,17 +5186,17 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-@@ -98,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -99,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -147,14 +137,12 @@
+@@ -148,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5364,7 +5212,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -166,7 +154,6 @@
+@@ -167,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5372,7 +5220,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -188,13 +175,16 @@
+@@ -190,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -5389,15 +5237,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -224,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -295,13 +286,13 @@
+@@ -299,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -5415,10 +5255,10 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-@@ -325,16 +316,13 @@
+@@ -329,16 +319,13 @@
-r:../../src/FSpot.Core.dll \
-r:../../src/FSpot.Utils.dll \
- -r:../../semweb/SemWeb.dll \
+ $(LINK_SEMWEB) \
- -r:FlickrNet/FlickrNet.dll \
-r:Mono.Posix
@@ -5433,7 +5273,7 @@
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
-resource:$(srcdir)/$(PLUGIN_NAME).glade
-@@ -353,7 +341,7 @@
+@@ -357,7 +344,7 @@
$(PLUGIN_ASSEMBLY).mdb \
*.mpack
@@ -5442,7 +5282,7 @@
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
-@@ -408,137 +396,12 @@
+@@ -412,137 +399,12 @@
echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
rm -f "$(DESTDIR)$(plugindir)/$$f"; \
done
@@ -5582,7 +5422,7 @@
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-@@ -566,40 +429,22 @@
+@@ -570,40 +432,22 @@
|| exit 1; \
fi; \
done
@@ -5630,7 +5470,7 @@
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-@@ -616,21 +461,21 @@
+@@ -620,21 +464,21 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@@ -5658,7 +5498,7 @@
info-am:
-@@ -638,57 +483,53 @@
+@@ -642,57 +486,53 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -5736,7 +5576,7 @@
all: $(PLUGIN_ASSEMBLY)
-@@ -697,7 +538,6 @@
+@@ -701,7 +541,6 @@
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
@@ -5744,9 +5584,9 @@
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
install-data-hook:
-diff -urNad f-spot-0.4.3.1~/extensions/FolderExport/Makefile.in f-spot-0.4.3.1/extensions/FolderExport/Makefile.in
---- f-spot-0.4.3.1~/extensions/FolderExport/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/FolderExport/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/FolderExport/Makefile.in f-spot/extensions/FolderExport/Makefile.in
+--- f-spot~/extensions/FolderExport/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/FolderExport/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5758,17 +5598,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5784,7 +5624,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5792,7 +5632,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -5809,15 +5649,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -5835,9 +5667,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/extensions/GalleryExport/Makefile.in f-spot-0.4.3.1/extensions/GalleryExport/Makefile.in
---- f-spot-0.4.3.1~/extensions/GalleryExport/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/GalleryExport/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/GalleryExport/Makefile.in f-spot/extensions/GalleryExport/Makefile.in
+--- f-spot~/extensions/GalleryExport/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/GalleryExport/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5849,17 +5681,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5875,7 +5707,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5883,7 +5715,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -5900,15 +5732,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -5926,120 +5750,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/extensions/Makefile.in f-spot-0.4.3.1/extensions/Makefile.in
---- f-spot-0.4.3.1~/extensions/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/Makefile.in 2008-05-02 17:22:31.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -97,7 +97,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -146,14 +148,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -165,7 +165,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -187,13 +186,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -223,6 +225,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -419,8 +422,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -445,8 +448,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -456,13 +459,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad f-spot-0.4.3.1~/extensions/PicasaWebExport/Makefile.in f-spot-0.4.3.1/extensions/PicasaWebExport/Makefile.in
---- f-spot-0.4.3.1~/extensions/PicasaWebExport/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/PicasaWebExport/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/Makefile.in f-spot/extensions/Makefile.in
+--- f-spot~/extensions/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/Makefile.in 2008-06-22 20:55:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6052,9 +5765,9 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -98,7 +98,9 @@
- DEPDIR = @DEPDIR@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
@@ -6085,7 +5798,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -188,13 +187,16 @@
+@@ -189,13 +188,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -6102,33 +5815,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -224,6 +226,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -295,13 +298,13 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-+LINK_KEYRING = -pkg:gnome-keyring-sharp
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-@@ -486,8 +489,8 @@
+@@ -423,8 +425,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6139,7 +5826,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -512,8 +515,8 @@
+@@ -449,8 +451,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6150,7 +5837,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -523,13 +526,12 @@
+@@ -460,13 +462,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6166,9 +5853,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot-0.4.3.1~/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.3.1/extensions/PicasaWebExport/google-sharp/Makefile.in
---- f-spot-0.4.3.1~/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/PicasaWebExport/Makefile.in f-spot/extensions/PicasaWebExport/Makefile.in
+--- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-06-22 20:55:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6180,17 +5867,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -99,7 +99,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -148,14 +150,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6206,7 +5893,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -167,7 +167,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6214,7 +5901,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -190,13 +189,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -6231,15 +5918,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -299,13 +301,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -6257,98 +5936,7 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/extensions/SmugMugExport/Makefile.in f-spot-0.4.3.1/extensions/SmugMugExport/Makefile.in
---- f-spot-0.4.3.1~/extensions/SmugMugExport/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/SmugMugExport/Makefile.in 2008-05-02 17:22:31.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,7 +98,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -147,14 +149,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -166,7 +166,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -188,13 +187,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -224,6 +226,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -295,13 +298,13 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-+LINK_KEYRING = -pkg:gnome-keyring-sharp
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-@@ -484,8 +487,8 @@
+@@ -490,8 +492,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6359,7 +5947,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -510,8 +513,8 @@
+@@ -516,8 +518,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6370,7 +5958,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -521,13 +524,12 @@
+@@ -527,13 +529,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6386,100 +5974,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot-0.4.3.1~/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.3.1/extensions/SmugMugExport/SmugMugNet/Makefile.in
---- f-spot-0.4.3.1~/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-02 17:22:31.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-+LINK_KEYRING = -pkg:gnome-keyring-sharp
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/glitz-sharp/Makefile.in f-spot-0.4.3.1/glitz-sharp/Makefile.in
---- f-spot-0.4.3.1~/glitz-sharp/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/glitz-sharp/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in
+--- f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-06-22 20:55:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6492,9 +5989,9 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -87,7 +87,9 @@
- DEPDIR = @DEPDIR@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
@@ -6525,7 +6022,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -177,13 +176,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -6542,55 +6039,27 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -213,6 +215,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -382,8 +385,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -408,8 +411,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -419,13 +422,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad f-spot-0.4.3.1~/glitz-sharp/src/Makefile.in f-spot-0.4.3.1/glitz-sharp/src/Makefile.in
---- f-spot-0.4.3.1~/glitz-sharp/src/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/glitz-sharp/src/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+@@ -287,13 +289,13 @@
+ DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
+ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
+ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
++LINK_KEYRING = -pkg:gnome-keyring-sharp
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/extensions/SmugMugExport/Makefile.in f-spot/extensions/SmugMugExport/Makefile.in
+--- f-spot~/extensions/SmugMugExport/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/SmugMugExport/Makefile.in 2008-06-22 20:55:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6602,17 +6071,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -99,7 +99,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -148,14 +150,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6628,7 +6097,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -167,7 +167,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6636,7 +6105,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -190,13 +189,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -6653,15 +6122,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -299,13 +301,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -6679,9 +6140,47 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/gnome-keyring-sharp/Makefile.in f-spot-0.4.3.1/gnome-keyring-sharp/Makefile.in
---- f-spot-0.4.3.1~/gnome-keyring-sharp/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/gnome-keyring-sharp/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+@@ -488,8 +490,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -514,8 +516,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -525,13 +527,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in
+--- f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-06-22 20:55:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6693,17 +6192,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6719,7 +6218,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6727,7 +6226,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -6744,15 +6243,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -6770,9 +6261,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/icons/Makefile.in f-spot-0.4.3.1/icons/Makefile.in
---- f-spot-0.4.3.1~/icons/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/icons/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/gio-sharp/Makefile.in f-spot/gio-sharp/Makefile.in
+--- f-spot~/gio-sharp/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/gio-sharp/Makefile.in 2008-06-22 20:54:57.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6784,17 +6275,281 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,7 +75,9 @@
- DEPDIR = @DEPDIR@
+@@ -269,8 +269,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -295,8 +295,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -306,13 +306,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -383,6 +382,10 @@
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
++dist-lzma: distdir
++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++ $(am__remove_distdir)
++
+ dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+@@ -409,6 +412,8 @@
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ *.tar.lzma*) \
++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+@@ -559,7 +564,7 @@
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+- dist-shar dist-tarZ dist-zip distcheck distclean \
++ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+diff -urNad f-spot~/gio-sharp/aclocal.m4 f-spot/gio-sharp/aclocal.m4
+--- f-spot~/gio-sharp/aclocal.m4 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/gio-sharp/aclocal.m4 2008-06-22 20:54:30.000000000 +0100
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,10 +11,13 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+-m4_if(m4_PACKAGE_VERSION, [2.61],,
+-[m4_fatal([this file was generated for autoconf 2.61.
+-You have another version of autoconf. If you want to use that,
+-you should regenerate the build system entirely.], [63])])
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
++You have another version of autoconf. It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+ #
+@@ -164,7 +167,7 @@
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+@@ -174,7 +177,7 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -189,7 +192,7 @@
+ [am__api_version='1.10'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.10], [],
++m4_if([$1], [1.10.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -205,8 +208,10 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.10])dnl
+-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+@@ -299,13 +304,13 @@
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 12
++# serial 13
+
+ # This macro actually does too much. Some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+@@ -410,16 +415,17 @@
+ # our stamp files there.
+ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+ [# Compute $1's index in $config_headers.
++_am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $1 | $1:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+ # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ #
+@@ -668,7 +674,7 @@
+
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+ # This macro is traced by Automake.
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+diff -urNad f-spot~/gio-sharp/configure f-spot/gio-sharp/configure
+--- f-spot~/gio-sharp/configure 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/gio-sharp/configure 2008-06-22 20:54:55.000000000 +0100
+@@ -2856,7 +2856,7 @@
+ and GLIB_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -2866,7 +2866,7 @@
+ and GLIB_SHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -2970,7 +2970,7 @@
+ and GAPI_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -2980,7 +2980,7 @@
+ and GAPI_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+diff -urNad f-spot~/gio-sharp/gio/Makefile.in f-spot/gio-sharp/gio/Makefile.in
+--- f-spot~/gio-sharp/gio/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/gio-sharp/gio/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+diff -urNad f-spot~/gio-sharp/sample/Makefile.in f-spot/gio-sharp/sample/Makefile.in
+--- f-spot~/gio-sharp/sample/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/gio-sharp/sample/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+diff -urNad f-spot~/glitz-sharp/Makefile.in f-spot/glitz-sharp/Makefile.in
+--- f-spot~/glitz-sharp/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/glitz-sharp/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -88,7 +88,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -124,14 +126,12 @@
+@@ -137,14 +139,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6810,7 +6565,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -143,7 +143,6 @@
+@@ -156,7 +156,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6818,7 +6573,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -165,13 +164,16 @@
+@@ -179,13 +178,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -6835,15 +6590,276 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -201,6 +203,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -312,11 +315,6 @@
+@@ -386,8 +388,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -412,8 +414,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -423,13 +425,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/glitz-sharp/src/Makefile.in f-spot/glitz-sharp/src/Makefile.in
+--- f-spot~/glitz-sharp/src/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/glitz-sharp/src/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -87,7 +87,9 @@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -136,14 +138,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +155,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -178,13 +177,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -287,13 +289,13 @@
+ DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
+ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
+ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
++LINK_KEYRING = -pkg:gnome-keyring-sharp
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/gnome-keyring-sharp/Makefile.in f-spot/gnome-keyring-sharp/Makefile.in
+--- f-spot~/gnome-keyring-sharp/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/gnome-keyring-sharp/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -87,7 +87,9 @@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -136,14 +138,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +155,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -178,13 +177,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -287,13 +289,13 @@
+ DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
+ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
+ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
++LINK_KEYRING = -pkg:gnome-keyring-sharp
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/icons/Makefile.in f-spot/icons/Makefile.in
+--- f-spot~/icons/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/icons/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -76,7 +76,9 @@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -125,14 +127,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -144,7 +144,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -167,13 +166,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -316,11 +318,6 @@
actions,view-restore-22.png \
actions,view-restore-24.png \
actions,view-restore-32.png \
@@ -6855,9 +6871,9 @@
devices,camera-photo-16.png \
devices,camera-photo-22.png \
devices,camera-photo-24.png \
-diff -urNad f-spot-0.4.3.1~/install-sh f-spot-0.4.3.1/install-sh
---- f-spot-0.4.3.1~/install-sh 2007-09-21 21:03:07.000000000 +0200
-+++ f-spot-0.4.3.1/install-sh 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/install-sh f-spot/install-sh
+--- f-spot~/install-sh 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/install-sh 2008-06-22 20:54:31.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -7214,9 +7230,9 @@
trap '' 0
fi
-diff -urNad f-spot-0.4.3.1~/intltool-extract.in f-spot-0.4.3.1/intltool-extract.in
---- f-spot-0.4.3.1~/intltool-extract.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/intltool-extract.in 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/intltool-extract.in f-spot/intltool-extract.in
+--- f-spot~/intltool-extract.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/intltool-extract.in 2008-06-22 20:54:31.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -7274,9 +7290,9 @@
sub type_glade {
### For translatable Glade XML files ###
-diff -urNad f-spot-0.4.3.1~/intltool-merge.in f-spot-0.4.3.1/intltool-merge.in
---- f-spot-0.4.3.1~/intltool-merge.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/intltool-merge.in 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
+--- f-spot~/intltool-merge.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/intltool-merge.in 2008-06-22 20:54:31.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -7587,9 +7603,9 @@
print OUTPUT;
}
close OUTPUT;
-diff -urNad f-spot-0.4.3.1~/intltool-update.in f-spot-0.4.3.1/intltool-update.in
---- f-spot-0.4.3.1~/intltool-update.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/intltool-update.in 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
+--- f-spot~/intltool-update.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/intltool-update.in 2008-06-22 20:54:31.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -7847,9 +7863,9 @@
$keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
return $keywords;
-diff -urNad f-spot-0.4.3.1~/libeog/Makefile.in f-spot-0.4.3.1/libeog/Makefile.in
---- f-spot-0.4.3.1~/libeog/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/libeog/Makefile.in 2008-05-02 17:22:31.000000000 +0200
+diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
+--- f-spot~/libeog/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/libeog/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7880,17 +7896,17 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -116,7 +118,9 @@
- DEPDIR = @DEPDIR@
+@@ -117,7 +119,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -165,14 +169,12 @@
+@@ -166,14 +170,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7906,7 +7922,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -184,7 +186,6 @@
+@@ -185,7 +187,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7914,7 +7930,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -206,13 +207,16 @@
+@@ -208,13 +209,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -7931,15 +7947,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -242,6 +246,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -335,6 +340,7 @@
+@@ -339,6 +343,7 @@
zoom.h
libfspoteog_la_SOURCES = $(libfspoteog_files)
@@ -7947,7 +7955,7 @@
MARSHAL_GENERATED = libeog-marshal.c libeog-marshal.h
BUILT_SOURCES = $(MARSHAL_GENERATED)
EXTRA_DIST = libeog-marshal.list
-@@ -378,8 +384,8 @@
+@@ -382,8 +387,8 @@
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -7958,7 +7966,7 @@
else :; fi; \
done
-@@ -387,8 +393,8 @@
+@@ -391,8 +396,8 @@
@$(NORMAL_UNINSTALL)
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -7969,7 +7977,7 @@
done
clean-fspotlibLTLIBRARIES:
-@@ -523,8 +529,8 @@
+@@ -527,8 +532,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7980,7 +7988,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -549,8 +555,8 @@
+@@ -553,8 +558,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -7991,7 +7999,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -560,13 +566,12 @@
+@@ -564,13 +569,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -8007,9 +8015,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot-0.4.3.1~/libeog/cursors/Makefile.in f-spot-0.4.3.1/libeog/cursors/Makefile.in
---- f-spot-0.4.3.1~/libeog/cursors/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/libeog/cursors/Makefile.in 2008-05-02 17:22:32.000000000 +0200
+diff -urNad f-spot~/libeog/cursors/Makefile.in f-spot/libeog/cursors/Makefile.in
+--- f-spot~/libeog/cursors/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/libeog/cursors/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8021,17 +8029,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,7 +75,9 @@
- DEPDIR = @DEPDIR@
+@@ -76,7 +76,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -124,14 +126,12 @@
+@@ -125,14 +127,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8047,7 +8055,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -143,7 +143,6 @@
+@@ -144,7 +144,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8055,7 +8063,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -165,13 +164,16 @@
+@@ -167,13 +166,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -8072,17 +8080,9 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -201,6 +203,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad f-spot-0.4.3.1~/libfspot/Makefile.in f-spot-0.4.3.1/libfspot/Makefile.in
---- f-spot-0.4.3.1~/libfspot/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/libfspot/Makefile.in 2008-05-02 17:22:32.000000000 +0200
+diff -urNad f-spot~/libfspot/Makefile.in f-spot/libfspot/Makefile.in
+--- f-spot~/libfspot/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/libfspot/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8110,17 +8110,17 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -107,7 +108,9 @@
- DEPDIR = @DEPDIR@
+@@ -108,7 +109,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,14 +159,12 @@
+@@ -157,14 +160,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8136,7 +8136,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -175,7 +176,6 @@
+@@ -176,7 +177,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8144,7 +8144,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -197,13 +197,16 @@
+@@ -199,13 +199,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -8161,15 +8161,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -233,6 +236,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -317,6 +321,8 @@
+@@ -321,6 +324,8 @@
f-utils.h
libfspot_la_LIBADD = \
@@ -8178,7 +8170,7 @@
$(LCMS_LIBS) \
$(EXIF_LIBS) \
$(top_builddir)/libjpegtran/libfspotjpegtran.la \
-@@ -369,8 +375,8 @@
+@@ -373,8 +378,8 @@
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -8189,7 +8181,7 @@
else :; fi; \
done
-@@ -378,8 +384,8 @@
+@@ -382,8 +387,8 @@
@$(NORMAL_UNINSTALL)
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -8200,7 +8192,7 @@
done
clean-fspotlibLTLIBRARIES:
-@@ -441,8 +447,8 @@
+@@ -445,8 +450,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8211,7 +8203,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -454,8 +460,8 @@
+@@ -458,8 +463,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8222,7 +8214,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -465,13 +471,12 @@
+@@ -469,13 +474,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -8238,9 +8230,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot-0.4.3.1~/libgphoto2-sharp/Makefile.in f-spot-0.4.3.1/libgphoto2-sharp/Makefile.in
---- f-spot-0.4.3.1~/libgphoto2-sharp/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/libgphoto2-sharp/Makefile.in 2008-05-02 17:22:32.000000000 +0200
+diff -urNad f-spot~/libgphoto2-sharp/Makefile.in f-spot/libgphoto2-sharp/Makefile.in
+--- f-spot~/libgphoto2-sharp/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/libgphoto2-sharp/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8252,17 +8244,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -87,7 +87,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8278,7 +8270,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8286,7 +8278,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -8303,15 +8295,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
+@@ -287,13 +289,13 @@
DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
@@ -8329,9 +8313,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/libjpegtran/Makefile.in f-spot-0.4.3.1/libjpegtran/Makefile.in
---- f-spot-0.4.3.1~/libjpegtran/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/libjpegtran/Makefile.in 2008-05-02 17:22:32.000000000 +0200
+diff -urNad f-spot~/libjpegtran/Makefile.in f-spot/libjpegtran/Makefile.in
+--- f-spot~/libjpegtran/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/libjpegtran/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8358,17 +8342,17 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -103,7 +104,9 @@
- DEPDIR = @DEPDIR@
+@@ -104,7 +105,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -152,14 +155,12 @@
+@@ -153,14 +156,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8384,7 +8368,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +172,6 @@
+@@ -172,7 +173,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8392,7 +8376,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -193,13 +193,16 @@
+@@ -195,13 +195,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -8409,15 +8393,7 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -229,6 +232,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -301,6 +305,7 @@
+@@ -305,6 +308,7 @@
libfspotjpegtran_la_SOURCES = \
$(libfspotjpegtran_files)
@@ -8425,7 +8401,7 @@
EXTRA_DIST = README
all: all-am
-@@ -341,8 +346,8 @@
+@@ -345,8 +349,8 @@
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -8436,7 +8412,7 @@
else :; fi; \
done
-@@ -350,8 +355,8 @@
+@@ -354,8 +358,8 @@
@$(NORMAL_UNINSTALL)
@list='$(fspotlib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -8447,7 +8423,7 @@
done
clean-fspotlibLTLIBRARIES:
-@@ -408,8 +413,8 @@
+@@ -412,8 +416,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8458,7 +8434,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -421,8 +426,8 @@
+@@ -425,8 +429,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8469,7 +8445,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -432,13 +437,12 @@
+@@ -436,13 +440,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -8485,9 +8461,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot-0.4.3.1~/ltmain.sh f-spot-0.4.3.1/ltmain.sh
---- f-spot-0.4.3.1~/ltmain.sh 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/ltmain.sh 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/ltmain.sh f-spot/ltmain.sh
+--- f-spot~/ltmain.sh 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/ltmain.sh 2008-06-22 20:54:31.000000000 +0100
@@ -2,7 +2,7 @@
# NOTE: Changing this file will not affect anything until you rerun configure.
#
@@ -8681,9 +8657,341 @@
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
-diff -urNad f-spot-0.4.3.1~/mono-addins/Makefile.in f-spot-0.4.3.1/mono-addins/Makefile.in
---- f-spot-0.4.3.1~/mono-addins/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Makefile.in 2008-05-02 17:22:22.000000000 +0200
+diff -urNad f-spot~/mono-addins/Makefile.in f-spot/mono-addins/Makefile.in
+--- f-spot~/mono-addins/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/mono-addins/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -137,14 +137,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -156,7 +154,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -179,13 +176,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -389,8 +389,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -415,8 +415,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -426,13 +426,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -urNad f-spot~/mono-addins/Mono.Addins/Makefile.in f-spot/mono-addins/Mono.Addins/Makefile.in
+--- f-spot~/mono-addins/Mono.Addins/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -136,14 +136,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +153,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -178,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -291,9 +291,9 @@
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in f-spot/mono-addins/Mono.Addins.Gui/Makefile.in
+--- f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -136,14 +136,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +153,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -178,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -291,9 +291,9 @@
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in f-spot/mono-addins/Mono.Addins.Setup/Makefile.in
+--- f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -136,14 +136,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -155,7 +153,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -178,13 +175,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -291,9 +291,9 @@
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/po/Makefile.in.in f-spot/po/Makefile.in.in
+--- f-spot~/po/Makefile.in.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/po/Makefile.in.in 2008-06-22 20:54:31.000000000 +0100
+@@ -1,10 +1,10 @@
+ # Makefile for program source directory in GNU NLS utilities package.
+ # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
++# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
+ #
+-# This file file be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
++# This file may be copied and used freely without restrictions. It may
++# be used in projects which are not available under a GNU Public License,
+ # but which still want to provide support for the GNU gettext functionality.
+-# Please note that the actual code is *not* freely available.
+ #
+ # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+ # instead of PACKAGE and to look for po2tbl in ./ not in intl/
+@@ -12,7 +12,7 @@
+ # - Modified by jacob berkman <jacob at ximian.com> to install
+ # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+ #
+-# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
++# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
+ #
+ # We have the following line for use by intltoolize:
+ # INTLTOOL_MAKEFILE
+@@ -133,7 +133,7 @@
+ dvi info tags TAGS ID:
+
+ # Define this as empty until I found a useful application.
+-installcheck:
++install-exec installcheck:
+
+ uninstall:
+ linguas="$(USE_LINGUAS)"; \
+diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
+--- f-spot~/semweb/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/semweb/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8696,9 +9004,9 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -87,7 +87,9 @@
- DEPDIR = @DEPDIR@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
@@ -8729,7 +9037,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -177,13 +176,16 @@
+@@ -178,13 +177,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -8746,47 +9054,27 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -385,8 +387,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -411,8 +413,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -422,13 +424,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad f-spot-0.4.3.1~/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.3.1/mono-addins/Mono.Addins/Makefile.in
---- f-spot-0.4.3.1~/mono-addins/Mono.Addins/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Mono.Addins/Makefile.in 2008-05-02 17:22:22.000000000 +0200
+@@ -287,13 +289,13 @@
+ DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
+ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
+ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
++LINK_KEYRING = -pkg:gnome-keyring-sharp
+ 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
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
+
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urNad f-spot~/src/Makefile.in f-spot/src/Makefile.in
+--- f-spot~/src/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/src/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8798,17 +9086,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -93,7 +93,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -142,14 +144,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8824,7 +9112,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
+@@ -161,7 +161,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8832,7 +9120,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
+@@ -184,13 +183,16 @@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MKDIR_P = @MKDIR_P@
@@ -8849,7 +9137,12 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -287,9 +289,9 @@
+@@ -293,13 +295,13 @@
+ DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
+ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
+ DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
++LINK_KEYRING = -pkg:gnome-keyring-sharp
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_MONO_ADDINS = \
@@ -8862,9 +9155,34 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.3.1/mono-addins/Mono.Addins.Gui/Makefile.in
---- f-spot-0.4.3.1~/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-02 17:22:22.000000000 +0200
+@@ -313,7 +315,7 @@
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+ UNSAFE = -unsafe
+ NOWARN = -nowarn:0169 -nowarn:0612 -nowarn:0414
+-EXTRAFLAGS = -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
++EXTRAFLAGS = -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
+ CMS_CSDISTFILES = \
+ $(srcdir)/Cms/CctTable.cs \
+ $(srcdir)/Cms/ColorCIELab.cs \
+@@ -561,7 +563,6 @@
+
+ @NOGCONF_FALSE at GCONF_PKG = -pkg:gconf-sharp-2.0
+ CMS_ASSEMBLIES = \
+- $(NUNIT_PKG) \
+ -pkg:gtk-sharp-2.0
+
+ CORE_ASSEMBLIES = \
+@@ -617,7 +618,6 @@
+ -r:FSpot.JobScheduler.dll \
+ -r:FSpot.Widgets.dll \
+ -r:Cms.dll \
+- $(NUNIT_PKG) \
+ $(GCONF_PKG) \
+ $(GTKHTML_SHARP_PKG) \
+ -pkg:glade-sharp-2.0 \
+diff -urNad f-spot~/tools/Makefile.in f-spot/tools/Makefile.in
+--- f-spot~/tools/Makefile.in 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/tools/Makefile.in 2008-06-22 20:54:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8876,17 +9194,17 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
+@@ -91,7 +91,9 @@
DIR_DBUS = @DIR_DBUS@
DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
+ DIR_GIO = @DIR_GIO@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
+@@ -140,14 +142,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8902,289 +9220,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -287,9 +289,9 @@
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.3.1/mono-addins/Mono.Addins.Setup/Makefile.in
---- f-spot-0.4.3.1~/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-02 17:22:22.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -287,9 +289,9 @@
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/po/Makefile.in.in f-spot-0.4.3.1/po/Makefile.in.in
---- f-spot-0.4.3.1~/po/Makefile.in.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/po/Makefile.in.in 2008-05-02 17:22:22.000000000 +0200
-@@ -1,10 +1,10 @@
- # Makefile for program source directory in GNU NLS utilities package.
- # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
- #
--# This file file be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
-+# This file may be copied and used freely without restrictions. It may
-+# be used in projects which are not available under a GNU Public License,
- # but which still want to provide support for the GNU gettext functionality.
--# Please note that the actual code is *not* freely available.
- #
- # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
- # instead of PACKAGE and to look for po2tbl in ./ not in intl/
-@@ -12,7 +12,7 @@
- # - Modified by jacob berkman <jacob at ximian.com> to install
- # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
- #
--# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
-+# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
- #
- # We have the following line for use by intltoolize:
- # INTLTOOL_MAKEFILE
-@@ -133,7 +133,7 @@
- dvi info tags TAGS ID:
-
- # Define this as empty until I found a useful application.
--installcheck:
-+install-exec installcheck:
-
- uninstall:
- linguas="$(USE_LINGUAS)"; \
-diff -urNad f-spot-0.4.3.1~/semweb/Makefile.in f-spot-0.4.3.1/semweb/Makefile.in
---- f-spot-0.4.3.1~/semweb/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/semweb/Makefile.in 2008-05-02 17:22:32.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -135,14 +137,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +154,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -176,13 +175,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -212,6 +214,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -283,13 +286,13 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-+LINK_KEYRING = -pkg:gnome-keyring-sharp
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-diff -urNad f-spot-0.4.3.1~/src/Makefile.in f-spot-0.4.3.1/src/Makefile.in
---- f-spot-0.4.3.1~/src/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/src/Makefile.in 2008-05-02 17:22:32.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,7 +92,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -141,14 +143,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +160,6 @@
+@@ -159,7 +159,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -9209,127 +9245,3 @@
NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -218,6 +220,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -289,13 +292,13 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
-+LINK_KEYRING = -pkg:gnome-keyring-sharp
- 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
-+ -pkg:mono-addins \
-+ -pkg:mono-addins-setup \
-+ -pkg:mono-addins-gui
-
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-@@ -307,7 +310,7 @@
- CSC_LIB = gmcs $(CSC_FLAGS) -target:library
- MONO_DEBUGFLAGS = --debug
- RUNTIME = mono $(MONO_DEBUGFLAGS)
--EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
-+EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
- CMS_CSDISTFILES = \
- $(srcdir)/Cms/Cms.cs \
- $(srcdir)/Cms/CctTable.cs
-@@ -578,7 +581,6 @@
-
- @NOGCONF_FALSE at GCONF_PKG = -pkg:gconf-sharp-2.0
- CMS_ASSEMBLIES = \
-- $(NUNIT_PKG) \
- -pkg:gtk-sharp-2.0
-
- CORE_ASSEMBLIES = \
-@@ -622,7 +624,6 @@
- -r:FSpot.Query.dll \
- -r:FSpot.Utils.dll \
- -r:Cms.dll \
-- $(NUNIT_PKG) \
- $(GCONF_PKG) \
- $(GTKHTML_SHARP_PKG) \
- -pkg:glade-sharp-2.0 \
-diff -urNad f-spot-0.4.3.1~/tools/Makefile.in f-spot-0.4.3.1/tools/Makefile.in
---- f-spot-0.4.3.1~/tools/Makefile.in 2008-05-02 17:15:38.000000000 +0200
-+++ f-spot-0.4.3.1/tools/Makefile.in 2008-05-02 17:22:32.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,7 +90,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -139,14 +141,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -158,7 +158,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -180,13 +179,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -216,6 +218,7 @@
- TURTLEDIR = @TURTLEDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WARN_CFLAGS = @WARN_CFLAGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
Modified: packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch?rev=4028&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch Sun Jun 22 20:50:08 2008
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad f-spot~/configure.in f-spot/configure.in
---- f-spot~/configure.in 2008-05-01 02:14:09.000000000 +0100
-+++ f-spot/configure.in 2008-05-01 02:14:10.000000000 +0100
-@@ -309,7 +309,6 @@
+--- f-spot~/configure.in 2008-06-22 20:53:44.000000000 +0100
++++ f-spot/configure.in 2008-06-22 20:53:46.000000000 +0100
+@@ -353,7 +353,6 @@
extensions/CDExport/Makefile
extensions/DefaultExporters/Makefile
extensions/FlickrExport/Makefile
@@ -17,12 +17,12 @@
extensions/FolderExport/Makefile
extensions/SmugMugExport/SmugMugNet/Makefile
diff -urNad f-spot~/extensions/FlickrExport/Makefile.am f-spot/extensions/FlickrExport/Makefile.am
---- f-spot~/extensions/FlickrExport/Makefile.am 2008-05-01 02:13:04.000000000 +0100
-+++ f-spot/extensions/FlickrExport/Makefile.am 2008-05-01 02:14:23.000000000 +0100
+--- f-spot~/extensions/FlickrExport/Makefile.am 2008-06-22 20:53:35.000000000 +0100
++++ f-spot/extensions/FlickrExport/Makefile.am 2008-06-22 20:54:04.000000000 +0100
@@ -15,16 +15,13 @@
-r:../../src/FSpot.Core.dll \
-r:../../src/FSpot.Utils.dll \
- -r:../../semweb/SemWeb.dll \
+ $(LINK_SEMWEB) \
- -r:FlickrNet/FlickrNet.dll \
-r:Mono.Posix
Modified: packages/f-spot/trunk/debian/patches/debian_unlink-nunit.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_unlink-nunit.dpatch?rev=4028&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_unlink-nunit.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/debian_unlink-nunit.dpatch Sun Jun 22 20:50:08 2008
@@ -6,16 +6,18 @@
@DPATCH@
diff -urNad f-spot~/src/Makefile.am f-spot/src/Makefile.am
---- f-spot~/src/Makefile.am 2008-03-08 17:24:56.000000000 +0000
-+++ f-spot/src/Makefile.am 2008-03-08 22:24:44.000000000 +0000
-@@ -1,5 +1,5 @@
+--- f-spot~/src/Makefile.am 2008-06-22 19:06:29.000000000 +0100
++++ f-spot/src/Makefile.am 2008-06-22 19:08:38.000000000 +0100
+@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.include
--EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
-+EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
+ UNSAFE = -unsafe
+ NOWARN = -nowarn:0169 -nowarn:0612 -nowarn:0414
+-EXTRAFLAGS = -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
++EXTRAFLAGS = -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
CMS_CSDISTFILES = \
- $(srcdir)/Cms/Cms.cs \
-@@ -270,7 +270,6 @@
+ $(srcdir)/Cms/CctTable.cs \
+@@ -253,7 +253,6 @@
endif
CMS_ASSEMBLIES = \
@@ -23,9 +25,9 @@
-pkg:gtk-sharp-2.0
CORE_ASSEMBLIES = \
-@@ -312,7 +311,6 @@
- -r:FSpot.Query.dll \
- -r:FSpot.Utils.dll \
+@@ -309,7 +308,6 @@
+ -r:FSpot.JobScheduler.dll \
+ -r:FSpot.Widgets.dll \
-r:Cms.dll \
- $(NUNIT_PKG) \
$(GCONF_PKG) \
Added: packages/f-spot/trunk/debian/patches/svn-044-4010_gio-sharp-destdir.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-044-4010_gio-sharp-destdir.dpatch?rev=4028&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/svn-044-4010_gio-sharp-destdir.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/svn-044-4010_gio-sharp-destdir.dpatch Sun Jun 22 20:50:08 2008
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian_from-svn-gio-sharp-destdir.dpatch by Matvey Kozhev <sikon at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add DESTDIR to gio-sharp install hook. (upstream SVN 4010)
+
+ at DPATCH@
+
+--- f-spot-0.4.4/Makefile.am 2008-05-29 02:37:22.000000000 +0700
++++ f-spot-0.4.4_/Makefile.am 2008-06-20 20:38:28.000000000 +0700
+@@ -89,12 +89,12 @@
+ install-data-hook:
+ $(UPDATE_DESKTOP)
+ if [ "x$(DIR_GIO)" != "x" ] ; then \
+- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \
+- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \
++ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \
++ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \
+ fi
+
+ uninstall-hook:
+ $(UPDATE_DESKTOP)
+ if [ "x$(DIR_GIO)" != "x" ] ; then \
+- rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \
++ rm -f $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \
+ fi
More information about the Pkg-cli-apps-commits
mailing list