[Pkg-cli-apps-commits] r3902 - /packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Tue Apr 15 22:08:51 UTC 2008


Author: diocles-guest
Date: Tue Apr 15 22:08:51 2008
New Revision: 3902

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3902
Log:
Refresh 98_autoreconf with new gtkhtml-3.14 patch changes.
(Should have been in the previous commit, but never mind.)

Modified:
    packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch

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=3902&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Tue Apr 15 22:08:51 2008
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
---- f-spot~/Makefile.in	2008-04-15 20:47:53.000000000 +0100
-+++ f-spot/Makefile.in	2008-04-15 21:09:25.000000000 +0100
+--- f-spot~/Makefile.in	2008-04-15 23:06:05.000000000 +0100
++++ f-spot/Makefile.in	2008-04-15 23:07:02.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -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 20:47:53.000000000 +0100
-+++ f-spot/Tao/Makefile.in	2008-04-15 21:09:20.000000000 +0100
+--- 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
 @@ -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 20:47:53.000000000 +0100
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in	2008-04-15 21:09:20.000000000 +0100
+--- 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
 @@ -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 20:47:53.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in	2008-04-15 21:09:21.000000000 +0100
+--- 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
 @@ -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 20:47:53.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-04-15 21:09:21.000000000 +0100
+--- 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
 @@ -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 20:47:53.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in	2008-04-15 21:09:21.000000000 +0100
+--- 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
 @@ -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 20:47:53.000000000 +0100
-+++ f-spot/aclocal.m4	2008-04-15 21:09:15.000000000 +0100
+--- f-spot~/aclocal.m4	2008-04-15 23:06:06.000000000 +0100
++++ f-spot/aclocal.m4	2008-04-15 23:06:52.000000000 +0100
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -1445,8 +1445,8 @@
  AC_DEFUN([_AM_SUBST_NOTMAKE])
  
 diff -urNad f-spot~/configure f-spot/configure
---- f-spot~/configure	2008-04-15 20:47:53.000000000 +0100
-+++ f-spot/configure	2008-04-15 21:09:19.000000000 +0100
+--- f-spot~/configure	2008-04-15 23:06:06.000000000 +0100
++++ f-spot/configure	2008-04-15 23:06:56.000000000 +0100
 @@ -847,14 +847,14 @@
  INTLTOOL_SCHEMAS_RULE
  INTLTOOL_THEME_RULE
@@ -1516,12 +1516,12 @@
  
 -# Use the tools built into the package, not the ones that are installed.
 -INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--
+ 
 -INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
 -
 -INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
 -
- 
+-
 -# Extract the first word of "perl", so it can be a program name with args.
 -set dummy perl; ac_word=$2
 +# Check the gettext tools to make sure they are GNU
@@ -1737,11 +1737,11 @@
  
 +# Use the tools built into the package, not the ones that are installed.
 +INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-+
-+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
  
 -# Extract the first word of "xgettext", so it can be a program name with args.
 -set dummy xgettext; ac_word=$2
++INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
++
 +INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
 +
 +
@@ -3513,7 +3513,15 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21908,7 +22316,7 @@
+@@ -21817,6 +22225,7 @@
+ 
+ 
+ 
++CSC_DEFINES=""
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GNOME_SHARP" >&5
+@@ -21908,7 +22317,7 @@
  and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3522,7 +3530,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21918,7 +22326,7 @@
+@@ -21918,7 +22327,7 @@
  and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3531,7 +3539,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21928,7 +22336,7 @@
+@@ -21928,7 +22337,7 @@
  echo "${ECHO_T}yes" >&6; }
  	:
  fi
@@ -3540,7 +3548,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for GTKHTML_SHARP" >&5
-@@ -22020,7 +22428,7 @@
+@@ -22020,7 +22429,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3549,7 +3557,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22030,7 +22438,7 @@
+@@ -22030,7 +22439,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3558,7 +3566,17 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -22133,7 +22541,7 @@
+@@ -22040,7 +22449,8 @@
+ echo "${ECHO_T}yes" >&6; }
+ 	:
+ fi
+-	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14"
++ 	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14 -pkg:gnome-sharp-2.0"
++ 	CSC_DEFINES="$CSC_DEFINES -d:GTKHTML_3_14"
+ else
+ 
+ pkg_failed=no
+@@ -22133,7 +22543,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3567,7 +3585,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22143,7 +22551,7 @@
+@@ -22143,7 +22553,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3576,7 +3594,22 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -22274,7 +22682,7 @@
+@@ -22157,12 +22567,11 @@
+ fi
+ 
+ 
+-CSC_DEFINES=""
+ if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
+-   CSC_DEFINES="-d:GTK_2_10"
++   CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10"
+ fi
+ if pkg-config --atleast-version=2.11 gtk-sharp-2.0; then
+-   CSC_DEFINES="-d:GTK_2_11"
++   CSC_DEFINES="$CSC_DEFINES -d:GTK_2_11"
+ fi
+ 
+ # Check whether --enable-gconf was given.
+@@ -22274,7 +22683,7 @@
  and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3585,7 +3618,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22284,7 +22692,7 @@
+@@ -22284,7 +22693,7 @@
  and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3594,7 +3627,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -23925,7 +24333,7 @@
+@@ -23925,7 +24334,7 @@
  and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3603,7 +3636,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23935,7 +24343,7 @@
+@@ -23935,7 +24344,7 @@
  and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3612,7 +3645,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -24039,7 +24447,7 @@
+@@ -24039,7 +24448,7 @@
  and EXIF_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3621,7 +3654,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24049,7 +24457,7 @@
+@@ -24049,7 +24458,7 @@
  and EXIF_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3630,7 +3663,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -25686,6 +26094,15 @@
+@@ -25686,6 +26095,15 @@
       fi
     fi
  
@@ -3646,7 +3679,7 @@
           test -d po || mkdir po
     if test "x$srcdir" != "x."; then
       if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -25723,7 +26140,7 @@
+@@ -25723,7 +26141,7 @@
  GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
  
  
@@ -3655,7 +3688,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -26355,9 +26772,7 @@
+@@ -26355,9 +26773,7 @@
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
  prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -3666,7 +3699,7 @@
  
  
  _ACEOF
-@@ -26394,6 +26809,7 @@
+@@ -26394,6 +26810,7 @@
      "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" ;;
@@ -3674,7 +3707,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 +26833,7 @@
+@@ -26417,6 +26834,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" ;;
@@ -3682,7 +3715,7 @@
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-@@ -26560,14 +26977,14 @@
+@@ -26560,14 +26978,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
@@ -3701,7 +3734,7 @@
  ALL_LINGUAS!$ALL_LINGUAS$ac_delim
  CC!$CC$ac_delim
  CFLAGS!$CFLAGS$ac_delim
-@@ -26643,6 +27060,8 @@
+@@ -26643,6 +27061,8 @@
  ECHO!$ECHO$ac_delim
  AR!$AR$ac_delim
  RANLIB!$RANLIB$ac_delim
@@ -3710,7 +3743,7 @@
  CXX!$CXX$ac_delim
  CXXFLAGS!$CXXFLAGS$ac_delim
  ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26668,6 +27087,7 @@
+@@ -26668,6 +27088,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
@@ -3718,7 +3751,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 +27132,6 @@
+@@ -26712,9 +27133,6 @@
  LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
  EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
  EXIF_LIBS!$EXIF_LIBS$ac_delim
@@ -3728,7 +3761,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26756,6 +27173,9 @@
+@@ -26756,6 +27174,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -3738,7 +3771,7 @@
  WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
  WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
  TURTLEDIR!$TURTLEDIR$ac_delim
-@@ -26764,10 +27184,8 @@
+@@ -26764,10 +27185,8 @@
  ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
  GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
  USE_NLS!$USE_NLS$ac_delim
@@ -3749,7 +3782,7 @@
  CATALOGS!$CATALOGS$ac_delim
  CATOBJEXT!$CATOBJEXT$ac_delim
  GMOFILES!$GMOFILES$ac_delim
-@@ -26777,6 +27195,7 @@
+@@ -26777,6 +27196,7 @@
  PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
  POFILES!$POFILES$ac_delim
  POSUB!$POSUB$ac_delim
@@ -3757,7 +3790,7 @@
  LIBJPEG!$LIBJPEG$ac_delim
  CSC!$CSC$ac_delim
  expanded_libdir!$expanded_libdir$ac_delim
-@@ -26785,7 +27204,7 @@
+@@ -26785,7 +27205,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -3766,7 +3799,7 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -27186,21 +27605,22 @@
+@@ -27186,21 +27606,22 @@
    fi
    rm -f "$tmp/out12"
  # Compute $ac_file's index in $config_headers.
@@ -3796,7 +3829,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -27237,7 +27657,7 @@
+@@ -27237,7 +27658,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.
@@ -3805,7 +3838,7 @@
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \
-@@ -27356,10 +27776,6 @@
+@@ -27356,10 +27777,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" \
@@ -3817,8 +3850,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 20:47:53.000000000 +0100
-+++ f-spot/dbus-sharp/Makefile.in	2008-04-15 21:09:21.000000000 +0100
+--- 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
 @@ -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.
@@ -3895,8 +3928,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 20:47:53.000000000 +0100
-+++ f-spot/dbus-sharp-glib/Makefile.in	2008-04-15 21:09:21.000000000 +0100
+--- 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
 @@ -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.
@@ -3973,8 +4006,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 20:47:53.000000000 +0100
-+++ f-spot/docs/Makefile.in	2008-04-15 21:09:21.000000000 +0100
+--- 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
 @@ -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.
@@ -4038,8 +4071,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 20:47:53.000000000 +0100
-+++ f-spot/extensions/CDExport/Makefile.in	2008-04-15 21:09:21.000000000 +0100
+--- 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
 @@ -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.
@@ -4116,8 +4149,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 20:47:53.000000000 +0100
-+++ f-spot/extensions/DefaultExporters/Makefile.in	2008-04-15 21:09:22.000000000 +0100
+--- 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
 @@ -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.
@@ -4194,8 +4227,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 20:47:53.000000000 +0100
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in	2008-04-15 21:09:22.000000000 +0100
+--- 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
 @@ -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.
@@ -4272,8 +4305,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 20:47:53.000000000 +0100
-+++ f-spot/extensions/FlickrExport/Makefile.in	2008-04-15 21:09:22.000000000 +0100
+--- 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
 @@ -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,8 +4730,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 20:47:54.000000000 +0100
-+++ f-spot/extensions/FolderExport/Makefile.in	2008-04-15 21:09:22.000000000 +0100
+--- 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
 @@ -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.
@@ -4775,8 +4808,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 20:47:54.000000000 +0100
-+++ f-spot/extensions/GalleryExport/Makefile.in	2008-04-15 21:09:22.000000000 +0100
+--- 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
 @@ -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.
@@ -4862,8 +4895,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 20:47:54.000000000 +0100
-+++ f-spot/extensions/Makefile.in	2008-04-15 21:09:22.000000000 +0100
+--- 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
 @@ -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.
@@ -4965,8 +4998,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 20:47:54.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/Makefile.in	2008-04-15 21:09:23.000000000 +0100
+--- 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
 @@ -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.
@@ -5081,8 +5114,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 20:47:54.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in	2008-04-15 21:09:23.000000000 +0100
+--- 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
 @@ -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.
@@ -5159,8 +5192,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 20:47:54.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/Makefile.in	2008-04-15 21:09:23.000000000 +0100
+--- 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
 @@ -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.
@@ -5275,8 +5308,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 20:47:54.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in	2008-04-15 21:09:23.000000000 +0100
+--- 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
 @@ -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.
@@ -5353,8 +5386,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 20:47:54.000000000 +0100
-+++ f-spot/glitz-sharp/Makefile.in	2008-04-15 21:09:23.000000000 +0100
+--- 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
 @@ -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.
@@ -5456,8 +5489,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 20:47:54.000000000 +0100
-+++ f-spot/glitz-sharp/src/Makefile.in	2008-04-15 21:09:23.000000000 +0100
+--- 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
 @@ -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.
@@ -5534,8 +5567,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 20:47:54.000000000 +0100
-+++ f-spot/gnome-keyring-sharp/Makefile.in	2008-04-15 21:09:23.000000000 +0100
+--- 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
 @@ -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.
@@ -5612,8 +5645,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 20:47:54.000000000 +0100
-+++ f-spot/icons/Makefile.in	2008-04-15 21:09:24.000000000 +0100
+--- 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
 @@ -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.
@@ -5689,8 +5722,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 20:47:54.000000000 +0100
-+++ f-spot/intltool-extract.in	2008-04-15 21:08:53.000000000 +0100
+--- 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
 @@ -32,7 +32,7 @@
  ## Release information
  my $PROGRAM      = "intltool-extract";
@@ -5749,8 +5782,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 20:47:54.000000000 +0100
-+++ f-spot/intltool-merge.in	2008-04-15 21:08:53.000000000 +0100
+--- 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
 @@ -35,7 +35,7 @@
  ## Release information
  my $PROGRAM = "intltool-merge";
@@ -6062,8 +6095,8 @@
          }
          close OUTPUT;
 diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
---- f-spot~/intltool-update.in	2008-04-15 20:47:54.000000000 +0100
-+++ f-spot/intltool-update.in	2008-04-15 21:08:53.000000000 +0100
+--- 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
 @@ -30,7 +30,7 @@
  
  ## Release information
@@ -6322,8 +6355,8 @@
      
      return $keywords;
 diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
---- f-spot~/libeog/Makefile.in	2008-04-15 20:47:54.000000000 +0100
-+++ f-spot/libeog/Makefile.in	2008-04-15 21:09:24.000000000 +0100
+--- 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
 @@ -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.
@@ -6474,8 +6507,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 20:47:54.000000000 +0100
-+++ f-spot/libeog/cursors/Makefile.in	2008-04-15 21:09:24.000000000 +0100
+--- 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
 @@ -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.
@@ -6539,8 +6572,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 20:47:54.000000000 +0100
-+++ f-spot/libfspot/Makefile.in	2008-04-15 21:09:24.000000000 +0100
+--- 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
 @@ -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.
@@ -6689,8 +6722,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 20:47:54.000000000 +0100
-+++ f-spot/libgphoto2-sharp/Makefile.in	2008-04-15 21:09:24.000000000 +0100
+--- 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
 @@ -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.
@@ -6767,8 +6800,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 20:47:54.000000000 +0100
-+++ f-spot/libjpegtran/Makefile.in	2008-04-15 21:09:24.000000000 +0100
+--- 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
 @@ -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.
@@ -6915,8 +6948,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 20:47:54.000000000 +0100
-+++ f-spot/mono-addins/Makefile.in	2008-04-15 21:09:24.000000000 +0100
+--- 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
 @@ -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.
@@ -7018,8 +7051,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 20:47:54.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in	2008-04-15 21:09:25.000000000 +0100
+--- 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
 @@ -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.
@@ -7096,8 +7129,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 20:47:54.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in	2008-04-15 21:09:25.000000000 +0100
+--- 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
 @@ -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.
@@ -7174,8 +7207,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 20:47:54.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in	2008-04-15 21:09:25.000000000 +0100
+--- 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
 @@ -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.
@@ -7252,8 +7285,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 20:47:54.000000000 +0100
-+++ f-spot/po/Makefile.in.in	2008-04-15 21:08:53.000000000 +0100
+--- 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
 @@ -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>
@@ -7287,8 +7320,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 20:47:54.000000000 +0100
-+++ f-spot/semweb/Makefile.in	2008-04-15 21:09:25.000000000 +0100
+--- 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
 @@ -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.
@@ -7365,8 +7398,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 20:47:55.000000000 +0100
-+++ f-spot/src/Makefile.in	2008-04-15 21:09:25.000000000 +0100
+--- 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
 @@ -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.
@@ -7520,8 +7553,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 20:47:55.000000000 +0100
-+++ f-spot/tools/Makefile.in	2008-04-15 21:09:25.000000000 +0100
+--- 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
 @@ -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