[Pkg-cli-apps-commits] r3788 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/98_autoreconf.dpatch patches/fix_cms_linkage.dpatch

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Sun Mar 9 11:34:04 UTC 2008 

Author: diocles-guest
Date: Sun Mar  9 11:34:03 2008
New Revision: 3788

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3788
Log:
Fix linking Cms.dll against libfspot.

Added:
    packages/f-spot/trunk/debian/patches/fix_cms_linkage.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    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=3788&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Mar  9 11:34:03 2008
@@ -21,11 +21,14 @@
     + debian/patches/fix_deleting_1000_photos.dpatch:
       - Fix from upstream bug tracker for deleting >1000 photos.
         (Closes: #462798)
+    + debian/patches/fix_cms_linkage.dpatch:
+      - Fix from upstream stable SVN branch for linking Cms.dll against
+        libfspot.
     + debian/patches/98_autoreconf.dpatch:
       - Move all generated changes from other patches into single patch,
-        for easier maintenance.
-
- -- Tim Retout <tim at retout.co.uk>  Sun, 09 Mar 2008 03:12:25 +0000
+        for easier maintenance. 
+
+ -- Tim Retout <tim at retout.co.uk>  Sun, 09 Mar 2008 11:26:04 +0000
 
 f-spot (0.4.1-4) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3788&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Mar  9 11:34:03 2008
@@ -2,6 +2,7 @@
 fix_libfspot_linkage
 fix_libfspoteog_linkage
 fix_libfspotjpegtran_linkage
+fix_cms_linkage
 link_system_libs
 
 # Bugfix for bashisms (#464652)

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=3788&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Sun Mar  9 11:34:03 2008
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
---- f-spot~/Makefile.in	2008-03-09 00:21:03.000000000 +0000
-+++ f-spot/Makefile.in	2008-03-09 00:24:06.000000000 +0000
+--- f-spot~/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/Makefile.in	2008-03-09 11:25:05.000000000 +0000
 @@ -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.
@@ -164,8 +164,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/Tao/Makefile.in	2008-03-09 00:24:01.000000000 +0000
+--- f-spot~/Tao/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/Tao/Makefile.in	2008-03-09 11:25:00.000000000 +0000
 @@ -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.
@@ -267,8 +267,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in	2008-03-09 00:24:01.000000000 +0000
+--- f-spot~/Tao/Tao.GlPostProcess/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/Tao/Tao.GlPostProcess/Makefile.in	2008-03-09 11:25:00.000000000 +0000
 @@ -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.
@@ -345,8 +345,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in	2008-03-09 00:24:01.000000000 +0000
+--- f-spot~/Tao/Tao.OpenGl/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl/Makefile.in	2008-03-09 11:25:00.000000000 +0000
 @@ -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.
@@ -423,8 +423,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-03-09 00:24:01.000000000 +0000
+--- f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-03-09 11:25:00.000000000 +0000
 @@ -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.
@@ -501,8 +501,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in	2008-03-09 00:24:01.000000000 +0000
+--- f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in	2008-03-09 11:25:00.000000000 +0000
 @@ -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.
@@ -579,8 +579,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/aclocal.m4	2008-03-09 00:23:48.000000000 +0000
+--- f-spot~/aclocal.m4	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/aclocal.m4	2008-03-09 11:24:55.000000000 +0000
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -1439,8 +1439,8 @@
  AC_DEFUN([_AM_SUBST_NOTMAKE])
  
 diff -urNad f-spot~/configure f-spot/configure
---- f-spot~/configure	2008-03-09 00:21:03.000000000 +0000
-+++ f-spot/configure	2008-03-09 00:23:48.000000000 +0000
+--- f-spot~/configure	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/configure	2008-03-09 11:24:59.000000000 +0000
 @@ -847,14 +847,14 @@
  INTLTOOL_SCHEMAS_RULE
  INTLTOOL_THEME_RULE
@@ -1510,12 +1510,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
@@ -3650,6 +3650,15 @@
           test -d po || mkdir po
     if test "x$srcdir" != "x."; then
       if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+@@ -25723,7 +26137,7 @@
+ GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
+ 
+ 
+-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"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
 @@ -26355,9 +26769,7 @@
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
@@ -3661,7 +3670,15 @@
  
  
  _ACEOF
-@@ -26560,14 +26972,14 @@
+@@ -26394,6 +26806,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" ;;
++    "src/Cms.dll.config") CONFIG_FILES="$CONFIG_FILES src/Cms.dll.config" ;;
+     "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" ;;
+@@ -26560,14 +26973,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
@@ -3680,7 +3697,7 @@
  ALL_LINGUAS!$ALL_LINGUAS$ac_delim
  CC!$CC$ac_delim
  CFLAGS!$CFLAGS$ac_delim
-@@ -26643,6 +27055,8 @@
+@@ -26643,6 +27056,8 @@
  ECHO!$ECHO$ac_delim
  AR!$AR$ac_delim
  RANLIB!$RANLIB$ac_delim
@@ -3689,7 +3706,7 @@
  CXX!$CXX$ac_delim
  CXXFLAGS!$CXXFLAGS$ac_delim
  ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26668,6 +27082,7 @@
+@@ -26668,6 +27083,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
@@ -3697,7 +3714,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 +27127,6 @@
+@@ -26712,9 +27128,6 @@
  LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
  EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
  EXIF_LIBS!$EXIF_LIBS$ac_delim
@@ -3707,7 +3724,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26756,6 +27168,9 @@
+@@ -26756,6 +27169,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -3717,7 +3734,7 @@
  WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
  WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
  TURTLEDIR!$TURTLEDIR$ac_delim
-@@ -26764,10 +27179,8 @@
+@@ -26764,10 +27180,8 @@
  ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
  GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
  USE_NLS!$USE_NLS$ac_delim
@@ -3728,7 +3745,7 @@
  CATALOGS!$CATALOGS$ac_delim
  CATOBJEXT!$CATOBJEXT$ac_delim
  GMOFILES!$GMOFILES$ac_delim
-@@ -26777,6 +27190,7 @@
+@@ -26777,6 +27191,7 @@
  PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
  POFILES!$POFILES$ac_delim
  POSUB!$POSUB$ac_delim
@@ -3736,7 +3753,7 @@
  LIBJPEG!$LIBJPEG$ac_delim
  CSC!$CSC$ac_delim
  expanded_libdir!$expanded_libdir$ac_delim
-@@ -26785,7 +27199,7 @@
+@@ -26785,7 +27200,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -3745,7 +3762,7 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -27186,21 +27600,22 @@
+@@ -27186,21 +27601,22 @@
    fi
    rm -f "$tmp/out12"
  # Compute $ac_file's index in $config_headers.
@@ -3775,7 +3792,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -27237,7 +27652,7 @@
+@@ -27237,7 +27653,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.
@@ -3784,7 +3801,7 @@
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \
-@@ -27356,10 +27771,6 @@
+@@ -27356,10 +27772,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" \
@@ -3796,8 +3813,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/dbus-sharp/Makefile.in	2008-03-09 00:24:01.000000000 +0000
+--- f-spot~/dbus-sharp/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/dbus-sharp/Makefile.in	2008-03-09 11:25:01.000000000 +0000
 @@ -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.
@@ -3874,8 +3891,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/dbus-sharp-glib/Makefile.in	2008-03-09 00:24:01.000000000 +0000
+--- f-spot~/dbus-sharp-glib/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/dbus-sharp-glib/Makefile.in	2008-03-09 11:25:00.000000000 +0000
 @@ -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.
@@ -3952,8 +3969,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/docs/Makefile.in	2008-03-09 00:24:02.000000000 +0000
+--- f-spot~/docs/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/docs/Makefile.in	2008-03-09 11:25:01.000000000 +0000
 @@ -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.
@@ -4017,8 +4034,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/CDExport/Makefile.in	2008-03-09 00:24:02.000000000 +0000
+--- f-spot~/extensions/CDExport/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/CDExport/Makefile.in	2008-03-09 11:25:01.000000000 +0000
 @@ -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.
@@ -4095,8 +4112,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/DefaultExporters/Makefile.in	2008-03-09 00:24:02.000000000 +0000
+--- f-spot~/extensions/DefaultExporters/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/DefaultExporters/Makefile.in	2008-03-09 11:25:01.000000000 +0000
 @@ -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.
@@ -4173,8 +4190,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in	2008-03-09 00:24:02.000000000 +0000
+--- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in	2008-03-09 11:25:01.000000000 +0000
 @@ -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.
@@ -4251,8 +4268,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/FlickrExport/Makefile.in	2008-03-09 00:24:02.000000000 +0000
+--- f-spot~/extensions/FlickrExport/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/FlickrExport/Makefile.in	2008-03-09 11:25:01.000000000 +0000
 @@ -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.
@@ -4676,8 +4693,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/FolderExport/Makefile.in	2008-03-09 00:24:02.000000000 +0000
+--- f-spot~/extensions/FolderExport/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/FolderExport/Makefile.in	2008-03-09 11:25:02.000000000 +0000
 @@ -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.
@@ -4754,8 +4771,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/GalleryExport/Makefile.in	2008-03-09 00:24:03.000000000 +0000
+--- f-spot~/extensions/GalleryExport/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/GalleryExport/Makefile.in	2008-03-09 11:25:02.000000000 +0000
 @@ -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.
@@ -4841,8 +4858,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/Makefile.in	2008-03-09 00:24:03.000000000 +0000
+--- f-spot~/extensions/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/Makefile.in	2008-03-09 11:25:02.000000000 +0000
 @@ -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.
@@ -4944,8 +4961,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/PicasaWebExport/Makefile.in	2008-03-09 00:24:03.000000000 +0000
+--- f-spot~/extensions/PicasaWebExport/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/PicasaWebExport/Makefile.in	2008-03-09 11:25:02.000000000 +0000
 @@ -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.
@@ -5060,8 +5077,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in	2008-03-09 00:24:03.000000000 +0000
+--- f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in	2008-03-09 11:25:02.000000000 +0000
 @@ -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.
@@ -5138,8 +5155,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/SmugMugExport/Makefile.in	2008-03-09 00:24:03.000000000 +0000
+--- f-spot~/extensions/SmugMugExport/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/SmugMugExport/Makefile.in	2008-03-09 11:25:02.000000000 +0000
 @@ -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.
@@ -5254,8 +5271,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in	2008-03-09 00:24:03.000000000 +0000
+--- f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in	2008-03-09 11:25:02.000000000 +0000
 @@ -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.
@@ -5332,8 +5349,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/glitz-sharp/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/glitz-sharp/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/glitz-sharp/Makefile.in	2008-03-09 11:25:03.000000000 +0000
 @@ -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.
@@ -5435,8 +5452,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/glitz-sharp/src/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/glitz-sharp/src/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/glitz-sharp/src/Makefile.in	2008-03-09 11:25:03.000000000 +0000
 @@ -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.
@@ -5513,8 +5530,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/gnome-keyring-sharp/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/gnome-keyring-sharp/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/gnome-keyring-sharp/Makefile.in	2008-03-09 11:25:03.000000000 +0000
 @@ -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.
@@ -5591,8 +5608,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/icons/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/icons/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/icons/Makefile.in	2008-03-09 11:25:03.000000000 +0000
 @@ -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.
@@ -5668,8 +5685,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/intltool-extract.in	2008-03-09 00:23:48.000000000 +0000
+--- f-spot~/intltool-extract.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/intltool-extract.in	2008-03-09 11:24:39.000000000 +0000
 @@ -32,7 +32,7 @@
  ## Release information
  my $PROGRAM      = "intltool-extract";
@@ -5728,8 +5745,8 @@
      ### For translatable Glade XML files ###
  
 diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
---- f-spot~/intltool-merge.in	2008-03-09 00:21:03.000000000 +0000
-+++ f-spot/intltool-merge.in	2008-03-09 00:23:48.000000000 +0000
+--- f-spot~/intltool-merge.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/intltool-merge.in	2008-03-09 11:24:39.000000000 +0000
 @@ -35,7 +35,7 @@
  ## Release information
  my $PROGRAM = "intltool-merge";
@@ -6041,8 +6058,8 @@
          }
          close OUTPUT;
 diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
---- f-spot~/intltool-update.in	2008-03-09 00:21:03.000000000 +0000
-+++ f-spot/intltool-update.in	2008-03-09 00:23:48.000000000 +0000
+--- f-spot~/intltool-update.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/intltool-update.in	2008-03-09 11:24:39.000000000 +0000
 @@ -30,7 +30,7 @@
  
  ## Release information
@@ -6301,8 +6318,8 @@
      
      return $keywords;
 diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
---- f-spot~/libeog/Makefile.in	2008-03-09 00:21:03.000000000 +0000
-+++ f-spot/libeog/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/libeog/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/libeog/Makefile.in	2008-03-09 11:25:03.000000000 +0000
 @@ -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.
@@ -6453,8 +6470,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/libeog/cursors/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/libeog/cursors/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/libeog/cursors/Makefile.in	2008-03-09 11:25:03.000000000 +0000
 @@ -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.
@@ -6518,8 +6535,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/libfspot/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/libfspot/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/libfspot/Makefile.in	2008-03-09 11:25:03.000000000 +0000
 @@ -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.
@@ -6668,8 +6685,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/libgphoto2-sharp/Makefile.in	2008-03-09 00:24:04.000000000 +0000
+--- f-spot~/libgphoto2-sharp/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/libgphoto2-sharp/Makefile.in	2008-03-09 11:25:04.000000000 +0000
 @@ -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.
@@ -6746,8 +6763,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/libjpegtran/Makefile.in	2008-03-09 00:24:05.000000000 +0000
+--- f-spot~/libjpegtran/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/libjpegtran/Makefile.in	2008-03-09 11:25:04.000000000 +0000
 @@ -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.
@@ -6894,8 +6911,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/mono-addins/Makefile.in	2008-03-09 00:24:05.000000000 +0000
+--- f-spot~/mono-addins/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/mono-addins/Makefile.in	2008-03-09 11:25:04.000000000 +0000
 @@ -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.
@@ -6997,8 +7014,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in	2008-03-09 00:24:05.000000000 +0000
+--- f-spot~/mono-addins/Mono.Addins/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins/Makefile.in	2008-03-09 11:25:04.000000000 +0000
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7075,8 +7092,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in	2008-03-09 00:24:05.000000000 +0000
+--- f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in	2008-03-09 11:25:04.000000000 +0000
 @@ -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.
@@ -7153,8 +7170,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in	2008-03-09 00:24:05.000000000 +0000
+--- f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in	2008-03-09 11:25:04.000000000 +0000
 @@ -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.
@@ -7231,8 +7248,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-03-09 00:21:03.000000000 +0000
-+++ f-spot/po/Makefile.in.in	2008-03-09 00:23:48.000000000 +0000
+--- f-spot~/po/Makefile.in.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/po/Makefile.in.in	2008-03-09 11:24:39.000000000 +0000
 @@ -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>
@@ -7266,8 +7283,8 @@
  uninstall:
  	linguas="$(USE_LINGUAS)"; \
 diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
---- f-spot~/semweb/Makefile.in	2008-03-09 00:21:03.000000000 +0000
-+++ f-spot/semweb/Makefile.in	2008-03-09 00:24:05.000000000 +0000
+--- f-spot~/semweb/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/semweb/Makefile.in	2008-03-09 11:25:05.000000000 +0000
 @@ -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.
@@ -7344,8 +7361,163 @@
  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-03-09 00:21:03.000000000 +0000
-+++ f-spot/src/Makefile.in	2008-03-09 00:24:06.000000000 +0000
+--- f-spot~/src/Makefile.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/src/Makefile.in	2008-03-09 11:25:05.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,9 +33,10 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(srcdir)/f-spot.exe.config.in \
+-	$(srcdir)/f-spot.in $(top_srcdir)/Makefile.include
++DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Cms.dll.config.in \
++	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	$(srcdir)/f-spot.exe.config.in $(srcdir)/f-spot.in \
++	$(top_srcdir)/Makefile.include
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+@@ -44,7 +45,8 @@
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = f-spot AssemblyInfo.cs f-spot.exe.config
++CONFIG_CLEAN_FILES = f-spot AssemblyInfo.cs f-spot.exe.config \
++	Cms.dll.config
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(fspotlibdir)"
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+@@ -90,7 +92,9 @@
+ DEPDIR = @DEPDIR@
+ DIR_DBUS = @DIR_DBUS@
+ DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -139,14 +143,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -158,7 +160,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LCMS_CFLAGS = @LCMS_CFLAGS@
+@@ -180,13 +181,16 @@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+ NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
++NMEDIT = @NMEDIT@
+ NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
+ NUNIT22_LIBS = @NUNIT22_LIBS@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+@@ -292,9 +296,9 @@
+ LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
+ LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
+ LINK_MONO_ADDINS = \
+-	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
+-	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
+-	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
++	-pkg:mono-addins		\
++	-pkg:mono-addins-setup		\
++	-pkg:mono-addins-gui
+ 
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+@@ -306,7 +310,7 @@
+ CSC_LIB = gmcs $(CSC_FLAGS) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+-EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
++EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
+ CMS_CSDISTFILES = \
+ 	$(srcdir)/Cms/Cms.cs			\
+ 	$(srcdir)/Cms/CctTable.cs
+@@ -573,7 +577,6 @@
+ 
+ @NOGCONF_FALSE at GCONF_PKG = -pkg:gconf-sharp-2.0
+ CMS_ASSEMBLIES = \
+-	$(NUNIT_PKG)				\
+ 	-pkg:gtk-sharp-2.0
+ 
+ CORE_ASSEMBLIES = \
+@@ -615,7 +618,6 @@
+ 	-r:FSpot.Query.dll			\
+ 	-r:FSpot.Utils.dll			\
+ 	-r:Cms.dll				\
+-	$(NUNIT_PKG)				\
+ 	$(GCONF_PKG)				\
+ 	$(GTKHTML_SHARP_PKG)			\
+ 	-pkg:glade-sharp-2.0			\
+@@ -660,7 +662,7 @@
+ 	$(F_SPOT_DISTRESOURCES)			\
+ 	f-spot.exe.config.in			\
+ 	f-spot.in				\
+-	Cms.dll.config
++	Cms.dll.config.in
+ 
+ CLEANFILES = \
+ 	f-spot.exe.config			\
+@@ -674,7 +676,8 @@
+ 	FSpot.Query.dll				\
+ 	FSpot.Query.dll.mdb			\
+ 	FSpot.Core.dll.mdb			\
+-	FSpot.Core.dll
++	FSpot.Core.dll				\
++	Cms.dll.config
+ 
+ DISTCLEANFILES = \
+ 	Makefile
+@@ -717,6 +720,8 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ f-spot.exe.config: $(top_builddir)/config.status $(srcdir)/f-spot.exe.config.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++Cms.dll.config: $(top_builddir)/config.status $(srcdir)/Cms.dll.config.in
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(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-03-09 11:12:45.000000000 +0000
++++ f-spot/tools/Makefile.in	2008-03-09 11:25:05.000000000 +0000
 @@ -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.
@@ -7408,106 +7580,3 @@
  NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
  NUNIT22_LIBS = @NUNIT22_LIBS@
  NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -292,9 +294,9 @@
- LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
- LINK_MONO_ADDINS = \
--	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
--	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
--	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+	-pkg:mono-addins		\
-+	-pkg:mono-addins-setup		\
-+	-pkg:mono-addins-gui
- 
- LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
-@@ -306,7 +308,7 @@
- CSC_LIB = gmcs $(CSC_FLAGS) -target:library
- MONO_DEBUGFLAGS = --debug
- RUNTIME = mono $(MONO_DEBUGFLAGS)
--EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
-+EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
- CMS_CSDISTFILES = \
- 	$(srcdir)/Cms/Cms.cs			\
- 	$(srcdir)/Cms/CctTable.cs
-@@ -573,7 +575,6 @@
- 
- @NOGCONF_FALSE at GCONF_PKG = -pkg:gconf-sharp-2.0
- CMS_ASSEMBLIES = \
--	$(NUNIT_PKG)				\
- 	-pkg:gtk-sharp-2.0
- 
- CORE_ASSEMBLIES = \
-@@ -615,7 +616,6 @@
- 	-r:FSpot.Query.dll			\
- 	-r:FSpot.Utils.dll			\
- 	-r:Cms.dll				\
--	$(NUNIT_PKG)				\
- 	$(GCONF_PKG)				\
- 	$(GTKHTML_SHARP_PKG)			\
- 	-pkg:glade-sharp-2.0			\
-diff -urNad f-spot~/tools/Makefile.in f-spot/tools/Makefile.in
---- f-spot~/tools/Makefile.in	2008-03-09 00:21:03.000000000 +0000
-+++ f-spot/tools/Makefile.in	2008-03-09 00:24:06.000000000 +0000
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,7 +90,9 @@
- DEPDIR = @DEPDIR@
- DIR_DBUS = @DIR_DBUS@
- DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -139,14 +141,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -158,7 +158,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -180,13 +179,16 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONO = @MONO@
- MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
- MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
- NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
- NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
-+NMEDIT = @NMEDIT@
- NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
- NUNIT22_LIBS = @NUNIT22_LIBS@
- NUNIT_CFLAGS = @NUNIT_CFLAGS@

Added: packages/f-spot/trunk/debian/patches/fix_cms_linkage.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_cms_linkage.dpatch?rev=3788&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_cms_linkage.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_cms_linkage.dpatch Sun Mar  9 11:34:03 2008
@@ -1,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_cms_linkage.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix from upstream 0.4.2 stable branch (rev 3692).
+## DP: Fix linking Cms.dll against libfspot.
+
+ at DPATCH@
+diff -urNad f-spot~/configure.in f-spot/configure.in
+--- f-spot~/configure.in	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/configure.in	2008-03-09 11:19:51.000000000 +0000
+@@ -292,6 +292,7 @@
+ 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
+diff -urNad f-spot~/src/Cms.dll.config f-spot/src/Cms.dll.config
+--- f-spot~/src/Cms.dll.config	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/src/Cms.dll.config	1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-<configuration>
+-  <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
+-</configuration>
+-
+diff -urNad f-spot~/src/Cms.dll.config.in f-spot/src/Cms.dll.config.in
+--- f-spot~/src/Cms.dll.config.in	1970-01-01 01:00:00.000000000 +0100
++++ f-spot/src/Cms.dll.config.in	2008-03-09 11:19:51.000000000 +0000
+@@ -0,0 +1,5 @@
++<configuration>
++  <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
++  <dllmap dll="libfspot" target="@expanded_libdir@/f-spot/libfspot.so.0"/>
++</configuration>
++
+diff -urNad f-spot~/src/Makefile.am f-spot/src/Makefile.am
+--- f-spot~/src/Makefile.am	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/src/Makefile.am	2008-03-09 11:19:51.000000000 +0000
+@@ -384,7 +384,7 @@
+ 	$(F_SPOT_DISTRESOURCES)			\
+ 	f-spot.exe.config.in			\
+ 	f-spot.in				\
+-	Cms.dll.config
++	Cms.dll.config.in
+ 
+ CLEANFILES =					\
+ 	f-spot.exe.config			\
+@@ -398,7 +398,8 @@
+ 	FSpot.Query.dll				\
+ 	FSpot.Query.dll.mdb			\
+ 	FSpot.Core.dll.mdb			\
+-	FSpot.Core.dll
++	FSpot.Core.dll				\
++	Cms.dll.config
+ 
+ 
+ DISTCLEANFILES = 				\

Propchange: packages/f-spot/trunk/debian/patches/fix_cms_linkage.dpatch
------------------------------------------------------------------------------
    svn:executable = *

More information about the Pkg-cli-apps-commits mailing list