[Pkg-cli-apps-commits] r4024 - in /packages/f-spot/trunk/debian: changelog control patches/00list patches/98_autoreconf.dpatch patches/debian_link-system-semweb.dpatch
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Sun Jun 22 17:51:42 UTC 2008
Author: diocles-guest
Date: Sun Jun 22 17:51:41 2008
New Revision: 4024
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4024
Log:
Revert previous commit by meebey - we don't want to link against semweb
for f-spot 0.4.4, unfortunately. F-Spot gives runtime errors when
writing metadata to files is enabled.
Removed:
packages/f-spot/trunk/debian/patches/debian_link-system-semweb.dpatch
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=4024&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Jun 22 17:51:41 2008
@@ -1,13 +1,3 @@
-f-spot (0.4.3.1-2~pre1) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
- * debian/control:
- + Added libsemweb1.0-cil build-dependencies.
- * debian/patches/debian_link-system-semweb.dpatch:
- + Link with the libsemweb1.0-cil package.
-
- -- Mirco Bauer <meebey at debian.org> Fri, 02 May 2008 17:42:07 +0200
-
f-spot (0.4.3.1-1) unstable; urgency=low
[ Tim Retout ]
Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=4024&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Sun Jun 22 17:51:41 2008
@@ -26,7 +26,6 @@
libgnome-vfs2.0-cil,
libflickrnet2.1.5-cil (>= 25277-5),
libgnome-keyring1.0-cil,
- libsemweb1.0-cil,
liblcms1-dev,
libgnomeui-dev (>= 2.2),
libexif-dev (>= 0.5.7),
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=4024&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Jun 22 17:51:41 2008
@@ -8,7 +8,6 @@
debian_link-system-mono-addins
debian_link-system-flickrnet
debian_link-system-gnome-keyring
-debian_link-system-semweb
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=4024&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Sun Jun 22 17:51:41 2008
@@ -6,8 +6,8 @@
@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-04-30 14:51:10.000000000 +0200
-+++ f-spot-0.4.3.1/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -304,15 +307,12 @@
+@@ -304,7 +307,6 @@
$(DIR_DBUS_GLIB)\
docs \
glitz-sharp \
@@ -86,15 +86,15 @@
icons \
libeog \
libjpegtran \
- libfspot \
+@@ -312,7 +314,6 @@
libgphoto2-sharp \
-- semweb \
+ semweb \
Tao \
- mono-addins \
tools \
po \
src \
-@@ -323,15 +323,12 @@
+@@ -323,7 +324,6 @@
dbus-sharp-glib \
docs \
glitz-sharp \
@@ -102,15 +102,15 @@
icons \
libeog \
libjpegtran \
- libfspot \
+@@ -331,7 +331,6 @@
libgphoto2-sharp \
-- semweb \
+ semweb \
Tao \
- mono-addins \
tools \
po \
src \
-@@ -369,10 +366,8 @@
+@@ -369,10 +368,8 @@
intltool-extract \
intltool-merge \
intltool-update \
@@ -121,7 +121,7 @@
UPDATE_DESKTOP = \
if [ -f $(DESTDIR)$(datadir)/applications/defaults.list ] ; then \
if which update-desktop-database>/dev/null 2>&1 ; then \
-@@ -565,8 +560,8 @@
+@@ -565,8 +562,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -132,7 +132,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -591,8 +586,8 @@
+@@ -591,8 +588,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -143,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 +597,12 @@
+@@ -602,13 +599,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -159,7 +159,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -679,6 +673,10 @@
+@@ -679,6 +675,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -170,7 +170,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -705,6 +703,8 @@
+@@ -705,6 +705,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -179,7 +179,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -865,8 +865,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 \
@@ -191,8 +191,8 @@
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-04-30 14:51:05.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Makefile.in 2008-05-04 17:48:55.000000000 +0200
+--- 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.
@@ -302,8 +302,8 @@
|| $(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-04-30 14:51:05.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.GlPostProcess/Makefile.in 2008-05-04 17:48:55.000000000 +0200
+--- 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.
@@ -374,7 +374,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -273,15 +276,15 @@
+@@ -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
@@ -390,14 +390,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:05.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.OpenGl/Makefile.in 2008-05-04 17:48:55.000000000 +0200
+--- 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.
@@ -468,7 +465,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -484,14 +481,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:05.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-05-04 17:48:55.000000000 +0200
+--- 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.
@@ -562,7 +556,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -578,14 +572,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:05.000000000 +0200
-+++ f-spot-0.4.3.1/Tao/Tao.OpenGl.Glu/Makefile.in 2008-05-04 17:48:55.000000000 +0200
+--- 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.
@@ -656,7 +647,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -672,14 +663,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:02.000000000 +0200
-+++ f-spot-0.4.3.1/aclocal.m4 2008-05-04 17:48:52.000000000 +0200
+--- 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 -*-
@@ -1693,7 +1681,7 @@
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-04 17:48:46.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.
@@ -1974,7 +1962,7 @@
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-04 17:48:46.000000000 +0200
++++ 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. */
+
@@ -2060,7 +2048,7 @@
+#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-04 17:48:46.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.
@@ -2234,8 +2222,8 @@
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-04-30 14:51:11.000000000 +0200
-+++ f-spot-0.4.3.1/configure 2008-05-04 17:48:54.000000000 +0200
+--- 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
@@ -4796,8 +4784,8 @@
< ${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-04-30 14:51:06.000000000 +0200
-+++ f-spot-0.4.3.1/dbus-sharp/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -4868,7 +4856,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -4884,14 +4872,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:05.000000000 +0200
-+++ f-spot-0.4.3.1/dbus-sharp-glib/Makefile.in 2008-05-04 17:48:55.000000000 +0200
+--- 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.
@@ -4962,7 +4947,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -4978,14 +4963,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:06.000000000 +0200
-+++ f-spot-0.4.3.1/docs/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -5057,8 +5039,8 @@
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-04-30 14:51:06.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/CDExport/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -5129,7 +5111,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -5145,22 +5127,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
-@@ -311,7 +314,6 @@
- -r:../../src/f-spot.exe \
- -r:../../src/FSpot.Core.dll \
- -r:../../src/FSpot.Utils.dll \
-- -r:../../semweb/SemWeb.dll \
- -r:Mono.Posix
-
- PKGS = \
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-04-30 14:51:06.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/DefaultExporters/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -5231,7 +5202,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -5247,14 +5218,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:06.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/FlickrExport/FlickrNet/Makefile.in 2008-05-04 17:48:47.000000000 +0200
+--- 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.
@@ -5331,8 +5299,8 @@
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-04-30 14:51:06.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/FlickrExport/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -5429,7 +5397,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -295,15 +286,15 @@
+@@ -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
@@ -5445,16 +5413,12 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
-@@ -324,17 +315,13 @@
- -r:../../src/f-spot.exe \
+@@ -325,16 +316,13 @@
-r:../../src/FSpot.Core.dll \
-r:../../src/FSpot.Utils.dll \
-- -r:../../semweb/SemWeb.dll \
+ -r:../../semweb/SemWeb.dll \
- -r:FlickrNet/FlickrNet.dll \
-r:Mono.Posix
@@ -5469,7 +5433,7 @@
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
-resource:$(srcdir)/$(PLUGIN_NAME).glade
-@@ -353,7 +340,7 @@
+@@ -353,7 +341,7 @@
$(PLUGIN_ASSEMBLY).mdb \
*.mpack
@@ -5478,7 +5442,7 @@
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.include $(am__configure_deps)
-@@ -408,137 +395,12 @@
+@@ -408,137 +396,12 @@
echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
rm -f "$(DESTDIR)$(plugindir)/$$f"; \
done
@@ -5618,7 +5582,7 @@
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-@@ -566,40 +428,22 @@
+@@ -566,40 +429,22 @@
|| exit 1; \
fi; \
done
@@ -5666,7 +5630,7 @@
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-@@ -616,21 +460,21 @@
+@@ -616,21 +461,21 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@@ -5694,7 +5658,7 @@
info-am:
-@@ -638,57 +482,53 @@
+@@ -638,57 +483,53 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -5772,7 +5736,7 @@
all: $(PLUGIN_ASSEMBLY)
-@@ -697,7 +537,6 @@
+@@ -697,7 +538,6 @@
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
@@ -5781,8 +5745,8 @@
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-04-30 14:51:06.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/FolderExport/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -5853,7 +5817,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -5869,22 +5833,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
-@@ -311,7 +314,6 @@
- -r:../../src/f-spot.exe \
- -r:../../src/FSpot.Core.dll \
- -r:../../src/FSpot.Utils.dll \
-- -r:../../semweb/SemWeb.dll \
- -r:System.Web \
- -r:ICSharpCode.SharpZipLib \
- -r:Mono.Posix
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-04-30 14:51:07.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/GalleryExport/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -5955,7 +5908,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -5971,22 +5924,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
-@@ -312,7 +315,6 @@
- -r:../../src/f-spot.exe \
- -r:../../src/FSpot.Core.dll \
- -r:../../src/FSpot.Utils.dll \
-- -r:../../semweb/SemWeb.dll \
- -r:Mono.Posix
-
- PKGS = \
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-04-30 14:51:07.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6096,8 +6038,8 @@
|| $(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-04-30 14:51:07.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/PicasaWebExport/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6168,7 +6110,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -295,15 +298,15 @@
+@@ -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
@@ -6184,20 +6126,9 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
-@@ -323,7 +326,6 @@
- -r:../../src/f-spot.exe \
- -r:../../src/FSpot.Core.dll \
- -r:../../src/FSpot.Utils.dll \
-- -r:../../semweb/SemWeb.dll \
- -r:google-sharp/Mono.Google.dll \
- $(LINK_KEYRING) \
- -r:System.Web \
-@@ -486,8 +488,8 @@
+@@ -486,8 +489,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6208,7 +6139,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -512,8 +514,8 @@
+@@ -512,8 +515,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6219,7 +6150,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -523,13 +525,12 @@
+@@ -523,13 +526,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6236,8 +6167,8 @@
|| $(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-04-30 14:51:07.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6308,7 +6239,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -6324,14 +6255,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:07.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/SmugMugExport/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6402,7 +6330,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -295,15 +298,15 @@
+@@ -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
@@ -6418,20 +6346,9 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
-@@ -323,7 +326,6 @@
- -r:../../src/f-spot.exe \
- -r:../../src/FSpot.Core.dll \
- -r:../../src/FSpot.Utils.dll \
-- -r:../../semweb/SemWeb.dll \
- -r:SmugMugNet/SmugMugNet.dll \
- $(LINK_KEYRING) \
- -r:Mono.Posix
-@@ -484,8 +486,8 @@
+@@ -484,8 +487,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6442,7 +6359,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -510,8 +512,8 @@
+@@ -510,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -6453,7 +6370,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -521,13 +523,12 @@
+@@ -521,13 +524,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -6470,8 +6387,8 @@
|| $(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-04-30 14:51:07.000000000 +0200
-+++ f-spot-0.4.3.1/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6542,7 +6459,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -6558,14 +6475,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:08.000000000 +0200
-+++ f-spot-0.4.3.1/glitz-sharp/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6675,8 +6589,8 @@
|| $(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-04-30 14:51:08.000000000 +0200
-+++ f-spot-0.4.3.1/glitz-sharp/src/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6747,7 +6661,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -6763,14 +6677,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:08.000000000 +0200
-+++ f-spot-0.4.3.1/gnome-keyring-sharp/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6841,7 +6752,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -6857,14 +6768,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:08.000000000 +0200
-+++ f-spot-0.4.3.1/icons/Makefile.in 2008-05-04 17:48:56.000000000 +0200
+--- 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.
@@ -6949,7 +6857,7 @@
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-04 17:48:47.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
@@ -7307,8 +7215,8 @@
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-04-30 14:50:58.000000000 +0200
-+++ f-spot-0.4.3.1/intltool-extract.in 2008-05-04 17:48:47.000000000 +0200
+--- 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";
@@ -7367,8 +7275,8 @@
### 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-04-30 14:50:58.000000000 +0200
-+++ f-spot-0.4.3.1/intltool-merge.in 2008-05-04 17:48:47.000000000 +0200
+--- 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";
@@ -7680,8 +7588,8 @@
}
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-04-30 14:50:58.000000000 +0200
-+++ f-spot-0.4.3.1/intltool-update.in 2008-05-04 17:48:47.000000000 +0200
+--- 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
@@ -7940,8 +7848,8 @@
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-04-30 14:51:08.000000000 +0200
-+++ f-spot-0.4.3.1/libeog/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
@@ -8100,8 +8008,8 @@
|| $(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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/libeog/cursors/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
@@ -8173,8 +8081,8 @@
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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/libfspot/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
@@ -8331,8 +8239,8 @@
|| $(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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/libgphoto2-sharp/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
@@ -8403,7 +8311,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -8419,14 +8327,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/libjpegtran/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
@@ -8581,8 +8486,8 @@
|| $(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 2007-09-21 20:24:00.000000000 +0200
-+++ f-spot-0.4.3.1/ltmain.sh 2008-05-04 17:48:47.000000000 +0200
+--- 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.
#
@@ -8777,8 +8682,8 @@
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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Makefile.in 2008-05-04 17:48:47.000000000 +0200
+--- 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.
@@ -8880,8 +8785,8 @@
|| $(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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Mono.Addins/Makefile.in 2008-05-04 17:48:47.000000000 +0200
+--- 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.
@@ -8958,8 +8863,8 @@
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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Mono.Addins.Gui/Makefile.in 2008-05-04 17:48:47.000000000 +0200
+--- 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.
@@ -9036,8 +8941,8 @@
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-04-30 14:51:09.000000000 +0200
-+++ f-spot-0.4.3.1/mono-addins/Mono.Addins.Setup/Makefile.in 2008-05-04 17:48:47.000000000 +0200
+--- 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.
@@ -9114,8 +9019,8 @@
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-04-30 14:50:58.000000000 +0200
-+++ f-spot-0.4.3.1/po/Makefile.in.in 2008-05-04 17:48:47.000000000 +0200
+--- 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>
@@ -9149,8 +9054,8 @@
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-04-30 14:51:10.000000000 +0200
-+++ f-spot-0.4.3.1/semweb/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
@@ -9221,7 +9126,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -283,15 +286,15 @@
+@@ -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
@@ -9237,14 +9142,11 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
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-04-30 14:51:10.000000000 +0200
-+++ f-spot-0.4.3.1/src/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
@@ -9315,7 +9217,7 @@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -289,15 +292,15 @@
+@@ -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
@@ -9331,11 +9233,8 @@
+ -pkg:mono-addins-setup \
+ -pkg:mono-addins-gui
--LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
-+LINK_SEMWEB = -pkg:semweb
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
- -r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll \
@@ -307,7 +310,7 @@
CSC_LIB = gmcs $(CSC_FLAGS) -target:library
MONO_DEBUGFLAGS = --debug
@@ -9362,8 +9261,8 @@
$(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-04-30 14:51:10.000000000 +0200
-+++ f-spot-0.4.3.1/tools/Makefile.in 2008-05-04 17:48:57.000000000 +0200
+--- 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.
More information about the Pkg-cli-apps-commits
mailing list