[Pkg-cli-apps-commits] r3907 - in /packages/f-spot/trunk/debian: changelog patches/98_autoreconf.dpatch patches/debian_link-system-mono-addins.dpatch
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Wed Apr 16 21:20:20 UTC 2008
Author: diocles-guest
Date: Wed Apr 16 21:20:20 2008
New Revision: 3907
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3907
Log:
debian_link-system-mono-addins.dpatch: Remove configure.in entries.
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
packages/f-spot/trunk/debian/patches/debian_link-system-mono-addins.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3907&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Wed Apr 16 21:20:20 2008
@@ -1,7 +1,12 @@
f-spot (0.4.2-2) unstable; urgency=low
+ * Rename patches to have different prefixes depending on their upstream
+ status; svn-042-* are on upstream SVN trunk, stable-042-* are from the
+ upstream stable SVN branch, and debian_* patches are not upstream.
* debian/patches/debian_x-content-mimetype.dpatch:
+ Patch from upstream bugzilla for x-content mimetype .desktop file.
+ * debian/patches/debian_link-system-mono-addins.dpatch:
+ + Remove configure.in entries so that Makefiles aren't generated.
* debian/patches/svn-042-3817_importdialog-missing-icon.dpatch:
+ Show a 'missing icon' image in the import dialog rather than
throwing an exception when f-spot icon is not found. (Closes: #459261)
@@ -21,11 +26,8 @@
* debian/control:
+ Add line breaks to Build-Depends.
* debian/update_src_to_use_system_libs.sh: Remove unused script.
- * Rename patches to have different prefixes depending on their upstream
- status; svn-042-* are on upstream SVN trunk, stable-042-* are from the
- upstream stable SVN branch, and debian_* patches are not upstream.
-
- -- Tim Retout <tim at retout.co.uk> Wed, 16 Apr 2008 00:57:58 +0100
+
+ -- Tim Retout <tim at retout.co.uk> Wed, 16 Apr 2008 22:11:46 +0100
f-spot (0.4.2-1) unstable; urgency=low
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=3907&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Wed Apr 16 21:20:20 2008
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
---- f-spot~/Makefile.in 2008-04-15 23:06:05.000000000 +0100
-+++ f-spot/Makefile.in 2008-04-15 23:07:02.000000000 +0100
+--- f-spot~/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/Makefile.in 2008-04-16 22:10:46.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -201,8 +201,8 @@
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-04-15 23:06:05.000000000 +0100
-+++ f-spot/Tao/Makefile.in 2008-04-15 23:06:57.000000000 +0100
+--- f-spot~/Tao/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/Tao/Makefile.in 2008-04-16 22:10:40.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -304,8 +304,8 @@
|| $(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-04-15 23:06:05.000000000 +0100
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-04-15 23:06:57.000000000 +0100
+--- f-spot~/Tao/Tao.GlPostProcess/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-04-16 22:10:40.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -382,8 +382,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-04-15 23:06:58.000000000 +0100
+--- f-spot~/Tao/Tao.OpenGl/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-04-16 22:10:40.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -460,8 +460,8 @@
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-04-15 23:06:05.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-15 23:06:57.000000000 +0100
+--- f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-16 22:10:40.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -538,8 +538,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-15 23:06:58.000000000 +0100
+--- f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-16 22:10:40.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -616,8 +616,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/aclocal.m4 f-spot/aclocal.m4
---- f-spot~/aclocal.m4 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/aclocal.m4 2008-04-15 23:06:52.000000000 +0100
+--- f-spot~/aclocal.m4 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/aclocal.m4 2008-04-16 22:10:32.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -775,7 +775,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-2 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1445,8 +1445,8 @@
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urNad f-spot~/configure f-spot/configure
---- f-spot~/configure 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/configure 2008-04-15 23:06:56.000000000 +0100
+--- f-spot~/configure 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/configure 2008-04-16 22:10:38.000000000 +0100
@@ -847,14 +847,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
@@ -3684,7 +3684,7 @@
-ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile mono-addins/Makefile mono-addins/Mono.Addins/Makefile mono-addins/Mono.Addins.Gui/Makefile mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/FlickrExport/FlickrNet/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in"
-+ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile mono-addins/Makefile mono-addins/Mono.Addins/Makefile mono-addins/Mono.Addins.Gui/Makefile mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/FlickrExport/FlickrNet/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
++ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/FlickrExport/FlickrNet/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3699,7 +3699,17 @@
_ACEOF
-@@ -26394,6 +26810,7 @@
+@@ -26384,16 +26800,13 @@
+ "libjpegtran/Makefile") CONFIG_FILES="$CONFIG_FILES libjpegtran/Makefile" ;;
+ "libfspot/Makefile") CONFIG_FILES="$CONFIG_FILES libfspot/Makefile" ;;
+ "libgphoto2-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES libgphoto2-sharp/Makefile" ;;
+- "mono-addins/Makefile") CONFIG_FILES="$CONFIG_FILES mono-addins/Makefile" ;;
+- "mono-addins/Mono.Addins/Makefile") CONFIG_FILES="$CONFIG_FILES mono-addins/Mono.Addins/Makefile" ;;
+- "mono-addins/Mono.Addins.Gui/Makefile") CONFIG_FILES="$CONFIG_FILES mono-addins/Mono.Addins.Gui/Makefile" ;;
+- "mono-addins/Mono.Addins.Setup/Makefile") CONFIG_FILES="$CONFIG_FILES mono-addins/Mono.Addins.Setup/Makefile" ;;
+ "semweb/Makefile") CONFIG_FILES="$CONFIG_FILES semweb/Makefile" ;;
+ "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"src/Core/Defines.cs") CONFIG_FILES="$CONFIG_FILES src/Core/Defines.cs" ;;
"src/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES src/AssemblyInfo.cs" ;;
"src/f-spot.exe.config") CONFIG_FILES="$CONFIG_FILES src/f-spot.exe.config" ;;
@@ -3707,7 +3717,7 @@
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"glitz-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES glitz-sharp/Makefile" ;;
"glitz-sharp/src/Makefile") CONFIG_FILES="$CONFIG_FILES glitz-sharp/src/Makefile" ;;
-@@ -26417,6 +26834,7 @@
+@@ -26417,6 +26830,7 @@
"f-spot.spec") CONFIG_FILES="$CONFIG_FILES f-spot.spec" ;;
"f-spot.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot.desktop.in" ;;
"f-spot-view.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot-view.desktop.in" ;;
@@ -3715,7 +3725,7 @@
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-@@ -26560,14 +26978,14 @@
+@@ -26560,14 +26974,14 @@
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
@@ -3734,7 +3744,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
-@@ -26643,6 +27061,8 @@
+@@ -26643,6 +27057,8 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -3743,7 +3753,7 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26668,6 +27088,7 @@
+@@ -26668,6 +27084,7 @@
DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
@@ -3751,7 +3761,7 @@
HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
F_CFLAGS!$F_CFLAGS$ac_delim
-@@ -26712,9 +27133,6 @@
+@@ -26712,9 +27129,6 @@
LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
EXIF_LIBS!$EXIF_LIBS$ac_delim
@@ -3761,7 +3771,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26756,6 +27174,9 @@
+@@ -26756,6 +27170,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -3771,7 +3781,7 @@
WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
TURTLEDIR!$TURTLEDIR$ac_delim
-@@ -26764,10 +27185,8 @@
+@@ -26764,10 +27181,8 @@
ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
@@ -3782,7 +3792,7 @@
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
-@@ -26777,6 +27196,7 @@
+@@ -26777,6 +27192,7 @@
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
@@ -3790,7 +3800,7 @@
LIBJPEG!$LIBJPEG$ac_delim
CSC!$CSC$ac_delim
expanded_libdir!$expanded_libdir$ac_delim
-@@ -26785,7 +27205,7 @@
+@@ -26785,7 +27201,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -3799,7 +3809,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -27186,21 +27606,22 @@
+@@ -27186,21 +27602,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -3829,7 +3839,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27237,7 +27658,7 @@
+@@ -27237,7 +27654,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -3838,7 +3848,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -27356,10 +27777,6 @@
+@@ -27356,10 +27773,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -3850,8 +3860,8 @@
< ${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-04-15 23:06:06.000000000 +0100
-+++ f-spot/dbus-sharp/Makefile.in 2008-04-15 23:06:58.000000000 +0100
+--- f-spot~/dbus-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/dbus-sharp/Makefile.in 2008-04-16 22:10:41.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3928,8 +3938,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/dbus-sharp-glib/Makefile.in 2008-04-15 23:06:58.000000000 +0100
+--- f-spot~/dbus-sharp-glib/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/dbus-sharp-glib/Makefile.in 2008-04-16 22:10:41.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4006,8 +4016,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/docs/Makefile.in 2008-04-15 23:06:58.000000000 +0100
+--- f-spot~/docs/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/docs/Makefile.in 2008-04-16 22:10:41.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4071,8 +4081,8 @@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff -urNad f-spot~/extensions/CDExport/Makefile.in f-spot/extensions/CDExport/Makefile.in
---- f-spot~/extensions/CDExport/Makefile.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/CDExport/Makefile.in 2008-04-15 23:06:58.000000000 +0100
+--- f-spot~/extensions/CDExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/CDExport/Makefile.in 2008-04-16 22:10:41.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4149,8 +4159,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/DefaultExporters/Makefile.in 2008-04-15 23:06:58.000000000 +0100
+--- f-spot~/extensions/DefaultExporters/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/DefaultExporters/Makefile.in 2008-04-16 22:10:41.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4227,8 +4237,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-15 23:06:59.000000000 +0100
+--- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-16 22:10:42.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4305,8 +4315,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/FlickrExport/Makefile.in 2008-04-15 23:06:59.000000000 +0100
+--- f-spot~/extensions/FlickrExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/FlickrExport/Makefile.in 2008-04-16 22:10:42.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4730,8 +4740,8 @@
all: $(PLUGIN_ASSEMBLY)
diff -urNad f-spot~/extensions/FolderExport/Makefile.in f-spot/extensions/FolderExport/Makefile.in
---- f-spot~/extensions/FolderExport/Makefile.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/FolderExport/Makefile.in 2008-04-15 23:06:59.000000000 +0100
+--- f-spot~/extensions/FolderExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/FolderExport/Makefile.in 2008-04-16 22:10:42.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4808,8 +4818,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/GalleryExport/Makefile.in 2008-04-15 23:06:59.000000000 +0100
+--- f-spot~/extensions/GalleryExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/GalleryExport/Makefile.in 2008-04-16 22:10:42.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4895,8 +4905,8 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urNad f-spot~/extensions/Makefile.in f-spot/extensions/Makefile.in
---- f-spot~/extensions/Makefile.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/Makefile.in 2008-04-15 23:06:59.000000000 +0100
+--- f-spot~/extensions/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/Makefile.in 2008-04-16 22:10:42.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4998,8 +5008,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-04-15 23:06:59.000000000 +0100
+--- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-04-16 22:10:43.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5114,8 +5124,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-15 23:06:59.000000000 +0100
+--- f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-16 22:10:43.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5192,8 +5202,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/extensions/SmugMugExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/SmugMugExport/Makefile.in 2008-04-16 22:10:43.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5308,8 +5318,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-16 22:10:43.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5386,8 +5396,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/glitz-sharp/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/glitz-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/glitz-sharp/Makefile.in 2008-04-16 22:10:43.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5489,8 +5499,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/glitz-sharp/src/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/glitz-sharp/src/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/glitz-sharp/src/Makefile.in 2008-04-16 22:10:44.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5567,8 +5577,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/gnome-keyring-sharp/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/gnome-keyring-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/gnome-keyring-sharp/Makefile.in 2008-04-16 22:10:44.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5645,8 +5655,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/icons/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/icons/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/icons/Makefile.in 2008-04-16 22:10:44.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5722,8 +5732,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/intltool-extract.in 2008-04-15 23:06:35.000000000 +0100
+--- f-spot~/intltool-extract.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/intltool-extract.in 2008-04-16 22:10:17.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -5782,8 +5792,8 @@
### For translatable Glade XML files ###
diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
---- f-spot~/intltool-merge.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/intltool-merge.in 2008-04-15 23:06:35.000000000 +0100
+--- f-spot~/intltool-merge.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/intltool-merge.in 2008-04-16 22:10:17.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -6095,8 +6105,8 @@
}
close OUTPUT;
diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
---- f-spot~/intltool-update.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/intltool-update.in 2008-04-15 23:06:35.000000000 +0100
+--- f-spot~/intltool-update.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/intltool-update.in 2008-04-16 22:10:17.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -6355,8 +6365,8 @@
return $keywords;
diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
---- f-spot~/libeog/Makefile.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/libeog/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/libeog/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/libeog/Makefile.in 2008-04-16 22:10:44.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6507,8 +6517,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/libeog/cursors/Makefile.in 2008-04-15 23:07:00.000000000 +0100
+--- f-spot~/libeog/cursors/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/libeog/cursors/Makefile.in 2008-04-16 22:10:44.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6572,8 +6582,8 @@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff -urNad f-spot~/libfspot/Makefile.in f-spot/libfspot/Makefile.in
---- f-spot~/libfspot/Makefile.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/libfspot/Makefile.in 2008-04-15 23:07:01.000000000 +0100
+--- f-spot~/libfspot/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/libfspot/Makefile.in 2008-04-16 22:10:45.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6722,8 +6732,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/libgphoto2-sharp/Makefile.in 2008-04-15 23:07:01.000000000 +0100
+--- f-spot~/libgphoto2-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/libgphoto2-sharp/Makefile.in 2008-04-16 22:10:45.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6800,8 +6810,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/libjpegtran/Makefile.in 2008-04-15 23:07:01.000000000 +0100
+--- f-spot~/libjpegtran/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/libjpegtran/Makefile.in 2008-04-16 22:10:45.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6948,8 +6958,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/mono-addins/Makefile.in 2008-04-15 23:07:01.000000000 +0100
+--- f-spot~/mono-addins/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/mono-addins/Makefile.in 2008-04-16 22:10:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7051,8 +7061,8 @@
|| $(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-04-15 23:06:06.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-04-15 23:07:01.000000000 +0100
+--- f-spot~/mono-addins/Mono.Addins/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-04-16 22:10:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7129,8 +7139,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-15 23:07:01.000000000 +0100
+--- f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-16 22:10:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7207,8 +7217,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-15 23:07:01.000000000 +0100
+--- f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-16 22:10:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7285,8 +7295,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/po/Makefile.in.in 2008-04-15 23:06:36.000000000 +0100
+--- f-spot~/po/Makefile.in.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/po/Makefile.in.in 2008-04-16 22:10:17.000000000 +0100
@@ -1,10 +1,10 @@
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -7320,8 +7330,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
---- f-spot~/semweb/Makefile.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/semweb/Makefile.in 2008-04-15 23:07:02.000000000 +0100
+--- f-spot~/semweb/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/semweb/Makefile.in 2008-04-16 22:10:45.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7398,8 +7408,8 @@
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-04-15 23:06:06.000000000 +0100
-+++ f-spot/src/Makefile.in 2008-04-15 23:07:02.000000000 +0100
+--- f-spot~/src/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/src/Makefile.in 2008-04-16 22:10:45.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7553,8 +7563,8 @@
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
diff -urNad f-spot~/tools/Makefile.in f-spot/tools/Makefile.in
---- f-spot~/tools/Makefile.in 2008-04-15 23:06:06.000000000 +0100
-+++ f-spot/tools/Makefile.in 2008-04-15 23:07:02.000000000 +0100
+--- f-spot~/tools/Makefile.in 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/tools/Makefile.in 2008-04-16 22:10:46.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
Modified: packages/f-spot/trunk/debian/patches/debian_link-system-mono-addins.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_link-system-mono-addins.dpatch?rev=3907&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_link-system-mono-addins.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/debian_link-system-mono-addins.dpatch Wed Apr 16 21:20:20 2008
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad f-spot~/Makefile.am f-spot/Makefile.am
---- f-spot~/Makefile.am 2008-03-08 21:55:32.000000000 +0000
-+++ f-spot/Makefile.am 2008-03-08 22:11:23.000000000 +0000
+--- f-spot~/Makefile.am 2008-04-16 22:08:41.000000000 +0100
++++ f-spot/Makefile.am 2008-04-16 22:08:42.000000000 +0100
@@ -11,7 +11,6 @@
libgphoto2-sharp \
semweb \
@@ -26,8 +26,8 @@
po \
src \
diff -urNad f-spot~/Makefile.include f-spot/Makefile.include
---- f-spot~/Makefile.include 2008-03-08 21:50:45.000000000 +0000
-+++ f-spot/Makefile.include 2008-03-08 22:11:23.000000000 +0000
+--- f-spot~/Makefile.include 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/Makefile.include 2008-04-16 22:08:42.000000000 +0100
@@ -27,10 +27,10 @@
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
@@ -43,3 +43,17 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
+diff -urNad f-spot~/configure.in f-spot/configure.in
+--- f-spot~/configure.in 2008-04-16 22:08:41.000000000 +0100
++++ f-spot/configure.in 2008-04-16 22:09:09.000000000 +0100
+@@ -283,10 +283,6 @@
+ libjpegtran/Makefile
+ libfspot/Makefile
+ libgphoto2-sharp/Makefile
+-mono-addins/Makefile
+-mono-addins/Mono.Addins/Makefile
+-mono-addins/Mono.Addins.Gui/Makefile
+-mono-addins/Mono.Addins.Setup/Makefile
+ semweb/Makefile
+ tools/Makefile
+ po/Makefile.in
More information about the Pkg-cli-apps-commits
mailing list