[Pkg-cli-apps-commits] r3924 - in /packages/f-spot/trunk/debian: changelog control patches/00list patches/98_autoreconf.dpatch patches/debian_fix-distclean.dpatch patches/debian_link-system-gnome-keyring.dpatch patches/debian_optional-beagle.dpatch
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Fri May 2 15:31:41 UTC 2008
Author: meebey
Date: Fri May 2 15:31:40 2008
New Revision: 3924
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3924
Log:
* debian/control:
+ Added libgnome-keyring1.0-cil to build-dependencies.
* debian/patches/debian_link-system-gnome-keyring.dpatch:
+ Link with the libgnome-keyring1.0-cil package.
* debian/patches/debian_fix-distclean.dpatch:
+ "make distclean" should not remove gnome-doc-utils.make
Added:
packages/f-spot/trunk/debian/patches/debian_fix-distclean.dpatch (with props)
packages/f-spot/trunk/debian/patches/debian_link-system-gnome-keyring.dpatch (with props)
packages/f-spot/trunk/debian/patches/debian_optional-beagle.dpatch (with props)
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/control
packages/f-spot/trunk/debian/patches/00list
packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3924&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Fri May 2 15:31:40 2008
@@ -1,5 +1,6 @@
f-spot (0.4.3.1-1) unstable; urgency=low
+ [ Tim Retout ]
* New upstream version.
+ Shows a 'missing icon' image in the import dialog rather than
throwing an exception when f-spot icon is not found. (Closes: #459261)
@@ -21,7 +22,17 @@
+ Add line breaks to Build-Depends.
* debian/update_src_to_use_system_libs.sh: Remove unused script.
- -- Tim Retout <tim at retout.co.uk> Thu, 01 May 2008 02:08:17 +0100
+ [ Mirco Bauer ]
+ * debian/control:
+ + Added libgnome-keyring1.0-cil to build-dependencies.
+ * debian/patches/debian_link-system-gnome-keyring.dpatch:
+ + Link with the libgnome-keyring1.0-cil package.
+ * debian/patches/debian_fix-distclean.dpatch:
+ + "make distclean" should not remove gnome-doc-utils.make
+ * debian/patches/98_autoreconf.dpatch:
+ + Updated
+
+ -- Mirco Bauer <meebey at debian.org> Fri, 02 May 2008 16:10:21 +0200
f-spot (0.4.2-1) unstable; urgency=low
Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=3924&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Fri May 2 15:31:40 2008
@@ -3,18 +3,41 @@
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Tim Retout <tim at retout.co.uk>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cli-common-dev (>= 0.4.4), cdbs, dpatch,
- mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler, libgtk2.0-cil (>= 2.8),
- libgtkhtml3.16-cil (>= 2.20), libgtk2.0-dev (>= 2.6),
- libgnome2.0-cil (>= 2.20), libgnome2-dev (>= 2.2), libxml-parser-perl,
- libmono-dev (>= 1.1.7), libgnomeui-dev (>= 2.2), libexif-dev (>= 0.5.7),
- libsqlite3-dev, libgphoto2-2-dev (>= 2.1.4), liblcms1-dev,
- libmono-sqlite2.0-cil, libmono-system-runtime2.0-cil, libmono-cairo2.0-cil,
- libusb-dev, gnome-doc-utils (>= 0.3.2), libgl1-mesa-dev | libgl-dev,
- libndesk-dbus1.0-cil (>= 0.4.2), libndesk-dbus-glib1.0-cil (>= 0.3.0),
- libgconf2.0-cil, libglade2.0-cil, libgnome-vfs2.0-cil,
- libflickrnet2.1.5-cil (>= 25277-5), libmono-addins0.2-cil,
- libmono-addins-gui0.2-cil, beagle-dev (>= 0.3), gnome-screensaver, docbook-xml
+Build-Depends: debhelper (>= 5.0.0),
+ cli-common-dev (>= 0.5.4),
+ cdbs,
+ dpatch,
+ mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler,
+ libgtk2.0-dev (>= 2.6),
+ libgtk2.0-cil (>= 2.8),
+ libgnome2-dev (>= 2.2),
+ libgnome2.0-cil (>= 2.20),
+ libgtkhtml3.16-cil (>= 2.20),
+ libmono-dev (>= 1.1.7),
+ libmono-sqlite2.0-cil,
+ libmono-system-runtime2.0-cil,
+ libmono-cairo2.0-cil,
+ libmono-addins0.2-cil,
+ libmono-addins-gui0.2-cil,
+ libndesk-dbus1.0-cil (>= 0.4.2),
+ libndesk-dbus-glib1.0-cil (>= 0.3.0),
+ libgconf2.0-cil,
+ libglade2.0-cil,
+ libgnome-vfs2.0-cil,
+ libflickrnet2.1.5-cil (>= 25277-5),
+ libgnome-keyring1.0-cil,
+ liblcms1-dev,
+ libgnomeui-dev (>= 2.2),
+ libexif-dev (>= 0.5.7),
+ libusb-dev,
+ libsqlite3-dev,
+ libgphoto2-2-dev (>= 2.1.4),
+ libgl1-mesa-dev | libgl-dev,
+ libxml-parser-perl,
+ beagle-dev (>= 0.3),
+ gnome-screensaver,
+ gnome-doc-utils (>= 0.3.2),
+ docbook-xml
Standards-Version: 3.7.3
Homepage: http://www.f-spot.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/f-spot/trunk/
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=3924&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Fri May 2 15:31:40 2008
@@ -1,4 +1,5 @@
# Patches that haven't been applied upstream yet.
+debian_fix-distclean
debian_libfspot-linkage
debian_libfspoteog-linkage
debian_libfspotjpegtran-linkage
@@ -6,6 +7,7 @@
debian_no-dup-app-icons
debian_link-system-mono-addins
debian_link-system-flickrnet
+debian_link-system-gnome-keyring
debian_flickrnet-2.1.5-port
# Patches to be applied last.
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=3924&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Fri May 2 15:31:40 2008
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
---- f-spot~/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -78,7 +78,15 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -312,7 +315,6 @@
+@@ -304,7 +307,6 @@
+ $(DIR_DBUS_GLIB)\
+ docs \
+ glitz-sharp \
+- gnome-keyring-sharp \
+ icons \
+ libeog \
+ libjpegtran \
+@@ -312,7 +314,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -86,7 +94,15 @@
tools \
po \
src \
-@@ -331,7 +333,6 @@
+@@ -323,7 +324,6 @@
+ dbus-sharp-glib \
+ docs \
+ glitz-sharp \
+- gnome-keyring-sharp \
+ icons \
+ libeog \
+ libjpegtran \
+@@ -331,7 +331,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -94,15 +110,18 @@
tools \
po \
src \
-@@ -372,7 +373,6 @@
- gnome-doc-utils.make \
+@@ -369,10 +368,8 @@
+ intltool-extract \
+ intltool-merge \
+ intltool-update \
+- gnome-doc-utils.make \
$(desktop_files)
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
UPDATE_DESKTOP = \
if [ -f $(DESTDIR)$(datadir)/applications/defaults.list ] ; then \
if which update-desktop-database>/dev/null 2>&1 ; then \
-@@ -565,8 +565,8 @@
+@@ -565,8 +562,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -113,7 +132,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -591,8 +591,8 @@
+@@ -591,8 +588,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -124,7 +143,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -602,13 +602,12 @@
+@@ -602,13 +599,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -140,7 +159,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -679,6 +678,10 @@
+@@ -679,6 +675,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -151,7 +170,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -705,6 +708,8 @@
+@@ -705,6 +705,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -160,7 +179,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -865,8 +870,8 @@
+@@ -865,8 +867,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 \
@@ -171,9 +190,9 @@
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~/Tao/Makefile.in f-spot/Tao/Makefile.in
---- f-spot~/Tao/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/Tao/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -282,9 +301,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -355,7 +374,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -277,9 +280,9 @@
+@@ -273,13 +276,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 = \
@@ -368,9 +392,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -441,7 +465,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -454,9 +483,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -527,7 +556,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -540,9 +574,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-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-05-01 02:15:55.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -613,7 +647,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -626,9 +665,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/aclocal.m4 f-spot/aclocal.m4
---- f-spot~/aclocal.m4 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/aclocal.m4 2008-05-01 02:16:49.000000000 +0100
+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
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -971,7 +1010,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1640,9 +1679,551 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-diff -urNad f-spot~/configure f-spot/configure
---- f-spot~/configure 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/configure 2008-05-01 02:16:49.000000000 +0100
+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
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-# Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
+
+-timestamp='2006-07-02'
++timestamp='2008-01-23'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,8 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -139,16 +139,6 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-case "${UNAME_MACHINE}" in
+- i?86)
+- test -z "$VENDOR" && VENDOR=pc
+- ;;
+- *)
+- test -z "$VENDOR" && VENDOR=unknown
+- ;;
+-esac
+-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -171,6 +161,7 @@
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
++ sh5el) machine=sh5le-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+@@ -339,7 +330,7 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:SunOS:5.*:*)
++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+@@ -541,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[45])
++ *:AIX:*:[456])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -790,7 +781,7 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+- i*:MINGW*:*)
++ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+@@ -800,12 +791,18 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- x86:Interix*:[3456]*)
+- echo i586-pc-interix${UNAME_RELEASE}
+- exit ;;
+- EM64T:Interix*:[3456]*)
+- echo x86_64-unknown-interix${UNAME_RELEASE}
+- exit ;;
++ *:Interix*:[3456]*)
++ case ${UNAME_MACHINE} in
++ x86)
++ echo i586-pc-interix${UNAME_RELEASE}
++ exit ;;
++ EM64T | authenticamd)
++ echo x86_64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ IA64)
++ echo ia64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
+@@ -839,7 +836,14 @@
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ arm*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ eval $set_cc_for_build
++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_EABI__
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ fi
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -851,16 +855,16 @@
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-${VENDOR}-linux-gnu
++ echo frv-unknown-linux-gnu
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+@@ -883,7 +887,7 @@
+ s: ::g
+ p
+ }'`"
+- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -906,16 +910,16 @@
+ s: ::g
+ p
+ }'`"
+- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-${VENDOR}-linux-gnu
++ echo or32-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-${VENDOR}-linux-gnu
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-${VENDOR}-linux-gnu
++ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -929,36 +933,39 @@
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+- *) echo hppa-${VENDOR}-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-gnu ;;
++ PA8*) echo hppa2.0-unknown-linux-gnu ;;
++ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-${VENDOR}-linux-gnu
++ echo hppa64-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-${VENDOR}-linux-gnu
++ echo x86_64-unknown-linux-gnu
++ exit ;;
++ xtensa*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+@@ -973,18 +980,18 @@
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ a.out-i386-linux)
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
++ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
+ coff-i386)
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
++ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
++ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+@@ -1018,7 +1025,7 @@
+ p
+ }'`"
+ test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+@@ -1218,6 +1225,15 @@
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
++ SX-7:SUPER-UX:*:*)
++ echo sx7-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8:SUPER-UX:*:*)
++ echo sx8-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8R:SUPER-UX:*:*)
++ echo sx8r-nec-superux${UNAME_RELEASE}
++ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit ;;
+@@ -1468,9 +1484,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+ 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
+@@ -0,0 +1,82 @@
++/* config.h.in. Generated from configure.in by autoheader. */
++
++/* always defined to indicate that i18n is enabled */
++#undef ENABLE_NLS
++
++/* Gettext package */
++#undef GETTEXT_PACKAGE
++
++/* Define to 1 if you have the `bind_textdomain_codeset' function. */
++#undef HAVE_BIND_TEXTDOMAIN_CODESET
++
++/* Define to 1 if you have the `dcgettext' function. */
++#undef HAVE_DCGETTEXT
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H
++
++/* Define if the GNU gettext() function is already present or preinstalled. */
++#undef HAVE_GETTEXT
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H
++
++/* Define if your <locale.h> file defines LC_MESSAGES. */
++#undef HAVE_LC_MESSAGES
++
++/* Define to 1 if you have the `jpeg' library (-ljpeg). */
++#undef HAVE_LIBJPEG
++
++/* Define to 1 if you have the `lcms' library (-llcms). */
++#undef HAVE_LIBLCMS
++
++/* Define to 1 if you have the <locale.h> header file. */
++#undef HAVE_LOCALE_H
++
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H
++
++/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H
++
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* 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
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-# Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
+
+-timestamp='2006-09-20'
++timestamp='2008-01-16'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -72,8 +72,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -245,12 +245,12 @@
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | fr30 | frv \
++ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore \
++ | maxq | mb | microblaze | mcore | mep \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+@@ -324,7 +324,7 @@
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+@@ -369,10 +369,14 @@
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+- | xstormy16-* | xtensa-* \
++ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
++ # Recognize the basic CPU types without company name, with glob match.
++ xtensa*)
++ basic_machine=$basic_machine-unknown
++ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+@@ -443,6 +447,14 @@
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
++ blackfin)
++ basic_machine=bfin-unknown
++ os=-linux
++ ;;
++ blackfin-*)
++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+@@ -475,8 +487,8 @@
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16c)
+- basic_machine=cr16c-unknown
++ cr16)
++ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+@@ -668,6 +680,14 @@
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
++ m68knommu)
++ basic_machine=m68k-unknown
++ os=-linux
++ ;;
++ m68knommu-*)
++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+@@ -683,6 +703,10 @@
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
++ mingw32ce)
++ basic_machine=arm-unknown
++ os=-mingw32ce
++ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+@@ -809,6 +833,14 @@
+ basic_machine=i860-intel
+ os=-osf
+ ;;
++ parisc)
++ basic_machine=hppa-unknown
++ os=-linux
++ ;;
++ parisc-*)
++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+@@ -925,6 +957,9 @@
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
++ sh5el)
++ basic_machine=sh5le-unknown
++ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+@@ -1014,6 +1049,10 @@
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ tile*)
++ basic_machine=tile-unknown
++ os=-linux-gnu
++ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+@@ -1219,7 +1258,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1414,6 +1453,9 @@
+ m68*-cisco)
+ os=-aout
+ ;;
++ mep-*)
++ os=-elf
++ ;;
+ 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 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
@@ -4202,9 +4783,9 @@
-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~/dbus-sharp/Makefile.in f-spot/dbus-sharp/Makefile.in
---- f-spot~/dbus-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/dbus-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -4275,7 +4856,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -4288,9 +4874,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/dbus-sharp-glib/Makefile.in f-spot/dbus-sharp-glib/Makefile.in
---- f-spot~/dbus-sharp-glib/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/dbus-sharp-glib/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -4361,7 +4947,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -4374,9 +4965,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/docs/Makefile.in f-spot/docs/Makefile.in
---- f-spot~/docs/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/docs/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -4447,9 +5038,9 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-diff -urNad f-spot~/extensions/CDExport/Makefile.in f-spot/extensions/CDExport/Makefile.in
---- f-spot~/extensions/CDExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/CDExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -4520,7 +5111,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -4533,9 +5129,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/extensions/DefaultExporters/Makefile.in f-spot/extensions/DefaultExporters/Makefile.in
---- f-spot~/extensions/DefaultExporters/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/DefaultExporters/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -4606,7 +5202,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -4619,9 +5220,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in f-spot/extensions/FlickrExport/FlickrNet/Makefile.in
---- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -4697,9 +5298,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/extensions/FlickrExport/Makefile.in f-spot/extensions/FlickrExport/Makefile.in
---- f-spot~/extensions/FlickrExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/FlickrExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -4796,7 +5397,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -299,9 +290,9 @@
+@@ -295,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 = \
@@ -5138,9 +5744,9 @@
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
install-data-hook:
-diff -urNad f-spot~/extensions/FolderExport/Makefile.in f-spot/extensions/FolderExport/Makefile.in
---- f-spot~/extensions/FolderExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/FolderExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -5211,7 +5817,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -5224,9 +5835,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/extensions/GalleryExport/Makefile.in f-spot/extensions/GalleryExport/Makefile.in
---- f-spot~/extensions/GalleryExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/GalleryExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -5297,7 +5908,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -5310,9 +5926,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/extensions/Makefile.in f-spot/extensions/Makefile.in
---- f-spot~/extensions/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -5421,9 +6037,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot~/extensions/PicasaWebExport/Makefile.in f-spot/extensions/PicasaWebExport/Makefile.in
---- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -5494,7 +6110,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -299,9 +302,9 @@
+@@ -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 = \
@@ -5545,9 +6166,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-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-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -5618,7 +6239,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -5631,9 +6257,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -5704,7 +6330,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -299,9 +302,9 @@
+@@ -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 = \
@@ -5755,9 +6386,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -5828,7 +6459,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -5841,9 +6477,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/glitz-sharp/Makefile.in f-spot/glitz-sharp/Makefile.in
---- f-spot~/glitz-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/glitz-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -5952,9 +6588,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/glitz-sharp/src/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -6025,7 +6661,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -6038,9 +6679,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/gnome-keyring-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -6111,7 +6752,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -6124,9 +6770,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/icons/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -6209,9 +6855,368 @@
devices,camera-photo-16.png \
devices,camera-photo-22.png \
devices,camera-photo-24.png \
-diff -urNad f-spot~/intltool-extract.in f-spot/intltool-extract.in
---- f-spot~/intltool-extract.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/intltool-extract.in 2008-05-01 02:16:49.000000000 +0100
+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
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2006-10-14.15
++scriptversion=2006-12-25.00
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -48,7 +48,7 @@
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
++doit=${DOITPROG-}
+ if test -z "$doit"; then
+ doit_exec=exec
+ else
+@@ -58,34 +58,49 @@
+ # Put in absolute file names if you don't have them in your path;
+ # or use environment vars.
+
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
++chgrpprog=${CHGRPPROG-chgrp}
++chmodprog=${CHMODPROG-chmod}
++chownprog=${CHOWNPROG-chown}
++cmpprog=${CMPPROG-cmp}
++cpprog=${CPPROG-cp}
++mkdirprog=${MKDIRPROG-mkdir}
++mvprog=${MVPROG-mv}
++rmprog=${RMPROG-rm}
++stripprog=${STRIPPROG-strip}
++
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
+
+-posix_glob=
+ posix_mkdir=
+
+ # Desired mode of installed file.
+ mode=0755
+
++chgrpcmd=
+ chmodcmd=$chmodprog
+ chowncmd=
+-chgrpcmd=
+-stripcmd=
++mvcmd=$mvprog
+ rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
++stripcmd=
++
+ src=
+ dst=
+ dir_arg=
+-dstarg=
++dst_arg=
++
++copy_on_change=false
+ no_target_directory=
+
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+@@ -95,65 +110,55 @@
+ In the 4th, create DIRECTORIES.
+
+ Options:
+--c (ignored)
+--d create directories instead of installing files.
+--g GROUP $chgrpprog installed files to GROUP.
+--m MODE $chmodprog installed files to MODE.
+--o USER $chownprog installed files to USER.
+--s $stripprog installed files.
+--t DIRECTORY install into DIRECTORY.
+--T report an error if DSTFILE is a directory.
+---help display this help and exit.
+---version display version info and exit.
++ --help display this help and exit.
++ --version display version info and exit.
++
++ -c (ignored)
++ -C install only if different (preserve the last data modification time)
++ -d create directories instead of installing files.
++ -g GROUP $chgrpprog installed files to GROUP.
++ -m MODE $chmodprog installed files to MODE.
++ -o USER $chownprog installed files to USER.
++ -s $stripprog installed files.
++ -t DIRECTORY install into DIRECTORY.
++ -T report an error if DSTFILE is a directory.
+
+ Environment variables override the default commands:
+- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++ RMPROG STRIPPROG
+ "
+
+ while test $# -ne 0; do
+ case $1 in
+- -c) shift
+- continue;;
++ -c) ;;
+
+- -d) dir_arg=true
+- shift
+- continue;;
++ -C) copy_on_change=true;;
++
++ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
++ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+- shift
+- shift
+ case $mode in
+ *' '* | *' '* | *'
+ '* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+- continue;;
++ shift;;
+
+ -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
++ shift;;
+
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
++ -s) stripcmd=$stripprog;;
+
+- -t) dstarg=$2
+- shift
+- shift
+- continue;;
++ -t) dst_arg=$2
++ shift;;
+
+- -T) no_target_directory=true
+- shift
+- continue;;
++ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+@@ -165,21 +170,22 @@
+
+ *) break;;
+ esac
++ shift
+ done
+
+-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+- if test -n "$dstarg"; then
++ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+- set fnord "$@" "$dstarg"
++ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+- dstarg=$arg
++ dst_arg=$arg
+ done
+ fi
+
+@@ -224,7 +230,7 @@
+ do
+ # Protect names starting with `-'.
+ case $src in
+- -*) src=./$src ;;
++ -*) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+@@ -242,22 +248,22 @@
+ exit 1
+ fi
+
+- if test -z "$dstarg"; then
++ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+- dst=$dstarg
++ dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+- -*) dst=./$dst ;;
++ -*) dst=./$dst;;
+ esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+- echo "$0: $dstarg: Is a directory" >&2
++ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+@@ -378,26 +384,19 @@
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+- /*) prefix=/ ;;
+- -*) prefix=./ ;;
+- *) prefix= ;;
++ /*) prefix='/';;
++ -*) prefix='./';;
++ *) prefix='';;
+ esac
+
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
++ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+- $posix_glob && set -f
++ $posix_glob set -f
+ set fnord $dstdir
+ shift
+- $posix_glob && set +f
++ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+@@ -459,41 +458,54 @@
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+- # Now rename the file to the real destination.
+- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+- || {
+- # The rename failed, perhaps because mv can't rename something else
+- # to itself, or perhaps because mv is so ancient that it does not
+- # support -f.
++ # If -C, don't bother to copy if it wouldn't change the file.
++ if $copy_on_change &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+- # Now remove or move aside any old file at destination location.
+- # We try this two ways since rm can't unlink itself on some
+- # systems and the destination file might be busy for other
+- # reasons. In this case, the final cleanup might fail but the new
+- # file should still install successfully.
+- {
+- if test -f "$dst"; then
+- $doit $rmcmd -f "$dst" 2>/dev/null \
+- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+- || {
+- echo "$0: cannot unlink or rename $dst" >&2
+- (exit 1); exit 1
+- }
+- else
+- :
+- fi
+- } &&
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
++ set X $old && old=:$2:$4:$5:$6 &&
++ set X $new && new=:$2:$4:$5:$6 &&
++ $posix_glob set +f &&
+
+- # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
+- }
+- } || exit 1
++ test "$old" = "$new" &&
++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
++ then
++ rm -f "$dsttmp"
++ else
++ # Rename the file to the real destination.
++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
++
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++ {
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $doit $rmcmd -f "$dst" 2>/dev/null ||
++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ } ||
++ { echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
++ }
++ fi || exit 1
+
+ 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
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -6269,9 +7274,9 @@
sub type_glade {
### For translatable Glade XML files ###
-diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
---- f-spot~/intltool-merge.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/intltool-merge.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -6582,9 +7587,9 @@
print OUTPUT;
}
close OUTPUT;
-diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
---- f-spot~/intltool-update.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/intltool-update.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -30,7 +30,7 @@
## Release information
@@ -6842,9 +7847,9 @@
$keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
return $keywords;
-diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
---- f-spot~/libeog/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/libeog/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -7002,9 +8007,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot~/libeog/cursors/Makefile.in f-spot/libeog/cursors/Makefile.in
---- f-spot~/libeog/cursors/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/libeog/cursors/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -7075,9 +8080,9 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-diff -urNad f-spot~/libfspot/Makefile.in f-spot/libfspot/Makefile.in
---- f-spot~/libfspot/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/libfspot/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -7233,9 +8238,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot~/libgphoto2-sharp/Makefile.in f-spot/libgphoto2-sharp/Makefile.in
---- f-spot~/libgphoto2-sharp/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/libgphoto2-sharp/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -7306,7 +8311,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -7319,9 +8329,9 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-diff -urNad f-spot~/libjpegtran/Makefile.in f-spot/libjpegtran/Makefile.in
---- f-spot~/libjpegtran/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/libjpegtran/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -7475,9 +8485,205 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad f-spot~/mono-addins/Makefile.in f-spot/mono-addins/Makefile.in
---- f-spot~/mono-addins/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/mono-addins/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
+@@ -2,7 +2,7 @@
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+-# 2007 Free Software Foundation, Inc.
++# 2007, 2008 Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -43,8 +43,8 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=1.5.24
+-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
++VERSION="1.5.26 Debian 1.5.26-4"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -113,15 +113,21 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++lt_env=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
++ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+ $lt_var=C
+ export $lt_var
+ fi"
+ done
+
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
++fi
++
+ # Make sure IFS has a sensible default
+ lt_nl='
+ '
+@@ -485,7 +491,7 @@
+ echo "\
+ $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+-Copyright (C) 2007 Free Software Foundation, Inc.
++Copyright (C) 2008 Free Software Foundation, Inc.
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ exit $?
+@@ -788,6 +794,7 @@
+ *.for) xform=for ;;
+ *.java) xform=java ;;
+ *.obj) xform=obj ;;
++ *.sx) xform=sx ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -956,7 +963,7 @@
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+ exit $EXIT_FAILURE
+@@ -1028,7 +1035,7 @@
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+@@ -1161,6 +1168,7 @@
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
++ single_module="${wl}-single_module"
+
+ func_infer_tag $base_compile
+
+@@ -1646,6 +1654,11 @@
+ continue
+ ;;
+
++ -multi_module)
++ single_module="${wl}-multi_module"
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue
+@@ -2122,7 +2135,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -2149,7 +2165,12 @@
+ continue
+ fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
++ if test "$linkmode" = lib; then
++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++ else
++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++ fi
++ for searchdir in $searchdirs; do
+ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+@@ -2945,12 +2966,18 @@
+ # we do not want to link against static libs,
+ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
++ else
++ # Can't find it, oh well...
++ depdepl=
+ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+@@ -3098,9 +3125,10 @@
+
+ case $linkmode in
+ oldlib)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+@@ -3244,6 +3272,11 @@
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
++ ;;
+ esac
+ ;;
+ no)
+@@ -4237,9 +4270,10 @@
+ ;;
+
+ obj)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+@@ -6478,7 +6512,7 @@
+ fi
+
+ # Restore saved environment variables
+- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ 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
@@ -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.
@@ -7578,9 +8784,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -7656,9 +8862,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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
@@ -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.
@@ -7734,9 +8940,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -7812,9 +9018,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/po/Makefile.in.in 2008-05-01 02:16:49.000000000 +0100
+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>
@@ -7847,9 +9053,9 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
-diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
---- f-spot~/semweb/Makefile.in 2008-05-01 02:15:55.000000000 +0100
-+++ f-spot/semweb/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -7920,7 +9126,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -287,9 +290,9 @@
+@@ -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 = \
@@ -7933,9 +9144,9 @@
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-05-01 02:15:55.000000000 +0100
-+++ f-spot/src/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
@@ -8006,7 +9217,12 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -293,9 +296,9 @@
+@@ -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 = \
@@ -8044,9 +9260,9 @@
$(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-05-01 02:15:55.000000000 +0100
-+++ f-spot/tools/Makefile.in 2008-05-01 02:16:49.000000000 +0100
+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.
Added: packages/f-spot/trunk/debian/patches/debian_fix-distclean.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_fix-distclean.dpatch?rev=3924&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_fix-distclean.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/debian_fix-distclean.dpatch Fri May 2 15:31:40 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_distclean.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.3.1~/Makefile.am f-spot-0.4.3.1/Makefile.am
+--- f-spot-0.4.3.1~/Makefile.am 2008-05-02 17:15:38.000000000 +0200
++++ f-spot-0.4.3.1/Makefile.am 2008-05-02 17:20:17.000000000 +0200
+@@ -72,7 +72,6 @@
+ intltool-extract \
+ intltool-merge \
+ intltool-update \
+- gnome-doc-utils.make \
+ $(desktop_files)
+
+ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
Propchange: packages/f-spot/trunk/debian/patches/debian_fix-distclean.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/f-spot/trunk/debian/patches/debian_link-system-gnome-keyring.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_link-system-gnome-keyring.dpatch?rev=3924&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_link-system-gnome-keyring.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/debian_link-system-gnome-keyring.dpatch Fri May 2 15:31:40 2008
@@ -1,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian_link-system-gnome-keyring.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.3.1~/Makefile.am f-spot-0.4.3.1/Makefile.am
+--- f-spot-0.4.3.1~/Makefile.am 2008-05-02 17:05:24.000000000 +0200
++++ f-spot-0.4.3.1/Makefile.am 2008-05-02 17:09:34.000000000 +0200
+@@ -3,7 +3,6 @@
+ $(DIR_DBUS_GLIB)\
+ docs \
+ glitz-sharp \
+- gnome-keyring-sharp \
+ icons \
+ libeog \
+ libjpegtran \
+@@ -21,7 +20,6 @@
+ dbus-sharp-glib \
+ docs \
+ glitz-sharp \
+- gnome-keyring-sharp \
+ icons \
+ libeog \
+ libjpegtran \
+diff -urNad f-spot-0.4.3.1~/Makefile.include f-spot-0.4.3.1/Makefile.include
+--- f-spot-0.4.3.1~/Makefile.include 2008-05-02 17:05:24.000000000 +0200
++++ f-spot-0.4.3.1/Makefile.include 2008-05-02 17:09:09.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ ## Links
+
+-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 = \
Propchange: packages/f-spot/trunk/debian/patches/debian_link-system-gnome-keyring.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/f-spot/trunk/debian/patches/debian_optional-beagle.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_optional-beagle.dpatch?rev=3924&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_optional-beagle.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/debian_optional-beagle.dpatch Fri May 2 15:31:40 2008
@@ -1,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## optional_beagle.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.3.1~/src/BeagleNotifier.cs f-spot-0.4.3.1/src/BeagleNotifier.cs
+--- f-spot-0.4.3.1~/src/BeagleNotifier.cs 2008-05-02 16:50:23.000000000 +0200
++++ f-spot-0.4.3.1/src/BeagleNotifier.cs 2008-05-02 16:57:12.000000000 +0200
+@@ -3,8 +3,33 @@
+
+ namespace FSpot {
+ public static class BeagleNotifier {
++ static bool BeagleSupport;
++
++ static BeagleNotifier () {
++ try {
++ if (System.Reflection.Assembly.Load ("Beagle") != null) {
++ BeagleSupport = true;
++ return;
++ }
++ } catch (System.Exception) {
++ }
++
++ BeagleSupport = false;
++ System.Console.WriteLine ("Beagle.dll not found, disabled beagle support.");
++ }
++
+ public static void SendUpdate (IBrowsableItem item)
+ {
++ if (!BeagleSupport) {
++ return;
++ }
++
++ SendBeagleUpdate (item);
++ }
++
++ static void SendBeagleUpdate (IBrowsableItem item)
++ {
++
+ Indexable indexable = new Indexable (item.DefaultVersionUri);
+ indexable.Type = IndexableType.PropertyChange;
+ Beagle.Property prop;
Propchange: packages/f-spot/trunk/debian/patches/debian_optional-beagle.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-apps-commits
mailing list