[Pkg-cli-apps-commits] r3887 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/55-add-mimetype.dpatch patches/98_autoreconf.dpatch patches/debian_x-content-mimetype.dpatch

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Tue Apr 15 20:27:14 UTC 2008 

Author: diocles-guest
Date: Tue Apr 15 20:27:14 2008
New Revision: 3887

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3887
Log:
Use x-content patch from upstream bugzilla rather than the older Ubuntu one.

Added:
    packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch   (with props)
Removed:
    packages/f-spot/trunk/debian/patches/55-add-mimetype.dpatch
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=3887&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Apr 15 20:27:14 2008
@@ -1,7 +1,7 @@
 f-spot (0.4.2-2) unstable; urgency=low
 
-  * debian/patches/55-add-mimetype.dpatch:
-    + Patch from Ubuntu for x-control/* mimetypes in .desktop file.
+  * debian/patches/debian_x-content-mimetype.dpatch:
+    + Patch from upstream bugzilla for x-content mimetype .desktop file.
   * 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)
@@ -9,7 +9,7 @@
     + Add line breaks to Build-Depends.
   * debian/update_src_to_use_system_libs.sh: Remove unused script.
 
- -- Tim Retout <tim at retout.co.uk>  Sat, 05 Apr 2008 16:04:32 +0100
+ -- Tim Retout <tim at retout.co.uk>  Tue, 15 Apr 2008 20:58:22 +0100
 
 f-spot (0.4.2-1) 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=3887&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Apr 15 20:27:14 2008
@@ -1,5 +1,4 @@
 11_screensaver-path
-55-add-mimetype
 fix_libfspot_linkage
 fix_libfspoteog_linkage
 fix_libfspotjpegtran_linkage
@@ -34,6 +33,9 @@
 # Patches from upstream SVN trunk.
 svn-042-3817_importdialog-missing-icon
 
+# Patches that haven't been applied upstream yet.
+debian_x-content-mimetype
+
 # Patches to be applied last.
 98_autoreconf
 99_ltmain_as-needed

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=3887&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Tue Apr 15 20:27:14 2008
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
---- f-spot~/Makefile.in	2008-03-15 15:00:06.000000000 +0000
-+++ f-spot/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- f-spot~/Makefile.in	2008-04-15 20:47:53.000000000 +0100
++++ f-spot/Makefile.in	2008-04-15 21:09:25.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.
@@ -19,7 +19,25 @@
  # 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.
-@@ -118,7 +118,9 @@
+@@ -35,6 +35,7 @@
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
++	$(srcdir)/f-spot-import.desktop.in.in \
+ 	$(srcdir)/f-spot-view.desktop.in.in \
+ 	$(srcdir)/f-spot.desktop.in.in $(srcdir)/f-spot.pc.in \
+ 	$(srcdir)/f-spot.spec.in $(top_srcdir)/configure \
+@@ -51,7 +52,8 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = src/Core/Defines.cs f-spot.pc f-spot.spec \
+-	f-spot.desktop.in f-spot-view.desktop.in
++	f-spot.desktop.in f-spot-view.desktop.in \
++	f-spot-import.desktop.in
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -118,7 +120,9 @@
  DEPDIR = @DEPDIR@
  DIR_DBUS = @DIR_DBUS@
  DIR_DBUS_GLIB = @DIR_DBUS_GLIB@
@@ -29,7 +47,7 @@
  ECHO = @ECHO@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
-@@ -167,14 +169,12 @@
+@@ -167,14 +171,12 @@
  INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
  INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
  INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -45,7 +63,7 @@
  INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
  INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
  INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -186,7 +186,6 @@
+@@ -186,7 +188,6 @@
  INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -53,7 +71,7 @@
  INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
  INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
  LCMS_CFLAGS = @LCMS_CFLAGS@
-@@ -208,13 +207,16 @@
+@@ -208,13 +209,16 @@
  MAKEINFO = @MAKEINFO@
  MCS = @MCS@
  MKDIR_P = @MKDIR_P@
@@ -70,7 +88,7 @@
  NUNIT22_CFLAGS = @NUNIT22_CFLAGS@
  NUNIT22_LIBS = @NUNIT22_LIBS@
  NUNIT_CFLAGS = @NUNIT_CFLAGS@
-@@ -311,7 +313,6 @@
+@@ -311,7 +315,6 @@
  	libgphoto2-sharp \
  	semweb		\
  	Tao		\
@@ -78,7 +96,7 @@
  	tools		\
  	po		\
  	src		\
-@@ -330,7 +331,6 @@
+@@ -330,7 +333,6 @@
  	libgphoto2-sharp \
  	semweb		\
  	Tao		\
@@ -86,7 +104,17 @@
  	tools		\
  	po		\
  	src		\
-@@ -370,7 +370,6 @@
+@@ -338,7 +340,8 @@
+ 
+ desktop_in_files = \
+ 	f-spot.desktop.in	\
+-	f-spot-view.desktop.in
++	f-spot-view.desktop.in	\
++	f-spot-import.desktop.in
+ 
+ desktop_files = $(desktop_in_files:.desktop.in=.desktop)
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -370,7 +373,6 @@
  	gnome-doc-utils.make	\
          $(desktop_files)
  
@@ -94,7 +122,16 @@
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -554,8 +553,8 @@
+@@ -435,6 +437,8 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ f-spot-view.desktop.in: $(top_builddir)/config.status $(srcdir)/f-spot-view.desktop.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
++f-spot-import.desktop.in: $(top_builddir)/config.status $(srcdir)/f-spot-import.desktop.in.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -554,8 +558,8 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -105,7 +142,7 @@
  	mkid -fID $$unique
  tags: TAGS
  
-@@ -580,8 +579,8 @@
+@@ -580,8 +584,8 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -116,7 +153,7 @@
  	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
  	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -591,13 +590,12 @@
+@@ -591,13 +595,12 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	tags=; \
@@ -132,7 +169,7 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-@@ -668,6 +666,10 @@
+@@ -668,6 +671,10 @@
  	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
  	$(am__remove_distdir)
  
@@ -143,7 +180,7 @@
  dist-tarZ: distdir
  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__remove_distdir)
-@@ -694,6 +696,8 @@
+@@ -694,6 +701,8 @@
  	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
  	*.tar.bz2*) \
  	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -152,7 +189,7 @@
  	*.tar.Z*) \
  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  	*.shar.gz*) \
-@@ -850,8 +854,8 @@
+@@ -850,8 +859,8 @@
  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  	all all-am am--refresh check check-am clean clean-generic \
  	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
@@ -164,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-03-15 15:00:06.000000000 +0000
-+++ f-spot/Tao/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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 +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-03-15 15:00:06.000000000 +0000
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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 +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-03-15 15:00:06.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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 +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-03-15 15:00:06.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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 +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-03-15 15:00:06.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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 +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-03-15 15:00:06.000000000 +0000
-+++ f-spot/aclocal.m4	2008-03-20 17:58:50.000000000 +0000
+--- f-spot~/aclocal.m4	2008-04-15 20:47:53.000000000 +0100
++++ f-spot/aclocal.m4	2008-04-15 21:09:15.000000000 +0100
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -609,38 +646,7 @@
  
  dnl AM_GCONF_SOURCE_2
  dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-@@ -60,8 +63,8 @@
- # Owen Taylor     1997-2001
- 
- dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
--dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
--dnl gthread, or gio is specified in MODULES, pass to pkg-config
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-+dnl gthread is specified in MODULES, pass to pkg-config
- dnl
- AC_DEFUN([AM_PATH_GLIB_2_0],
- [dnl 
-@@ -86,9 +89,6 @@
-          gthread) 
-              pkg_config_args="$pkg_config_args gthread-2.0"
-          ;;
--         gio*) 
--             pkg_config_args="$pkg_config_args $module-2.0"
--         ;;
-       esac
-   done
- 
-@@ -371,7 +371,8 @@
- #-----------------
- glib_DEFUN([GLIB_WITH_NLS],
-   dnl NLS is obligatory
--  [USE_NLS=yes
-+  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+    USE_NLS=yes
-     AC_SUBST(USE_NLS)
- 
-     gt_cv_have_gettext=no
-@@ -623,6 +624,18 @@
+@@ -623,6 +626,18 @@
       fi
     fi
  
@@ -659,7 +665,7 @@
     dnl Generate list of files to be processed by xgettext which will
     dnl be included in po/Makefile.
     test -d po || mkdir po
-@@ -859,6 +872,10 @@
+@@ -859,6 +874,10 @@
  	enable_scrollkeeper=yes)
  AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
  
@@ -670,7 +676,7 @@
  AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
  ])
  
-@@ -882,7 +899,7 @@
+@@ -882,7 +901,7 @@
  
  
  dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
@@ -679,7 +685,7 @@
  AC_DEFUN([IT_PROG_INTLTOOL],
  [AC_PREREQ([2.50])dnl
  
-@@ -895,7 +912,7 @@
+@@ -895,7 +914,7 @@
  esac
  
  if test -n "$1"; then
@@ -688,7 +694,7 @@
  
      INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
      INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-@@ -924,6 +941,7 @@
+@@ -924,6 +943,7 @@
    INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
      INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
      INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -696,7 +702,7 @@
  
  AC_SUBST(INTLTOOL_DESKTOP_RULE)
  AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -943,6 +961,21 @@
+@@ -943,6 +963,21 @@
  AC_SUBST(INTLTOOL_SCHEMAS_RULE)
  AC_SUBST(INTLTOOL_THEME_RULE)
  AC_SUBST(INTLTOOL_SERVICE_RULE)
@@ -718,7 +724,7 @@
  
  # Use the tools built into the package, not the ones that are installed.
  AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -965,19 +998,16 @@
+@@ -965,19 +1000,16 @@
     fi
  fi
  
@@ -742,7 +748,7 @@
      [DATADIRNAME=share],
      [case $host in
      *-*-solaris*)
-@@ -1018,10 +1048,6 @@
+@@ -1018,10 +1050,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" \
@@ -753,7 +759,7 @@
        -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
  	< ${ac_aux_dir}/${file}.in > ${file}.out
    if cmp -s ${file} ${file}.out 2>/dev/null; then
-@@ -1036,9 +1062,7 @@
+@@ -1036,9 +1064,7 @@
  ],
  [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
  prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
@@ -764,16 +770,16 @@
  
  ])
  
-@@ -1087,7 +1111,7 @@
+@@ -1087,7 +1113,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
 -# serial 51 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-2 AC_PROG_LIBTOOL
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1175,7 +1199,6 @@
+@@ -1175,7 +1201,6 @@
  AC_REQUIRE([AC_OBJEXT])dnl
  AC_REQUIRE([AC_EXEEXT])dnl
  dnl
@@ -781,7 +787,7 @@
  AC_LIBTOOL_SYS_MAX_CMD_LEN
  AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
  AC_LIBTOOL_OBJDIR
-@@ -1277,6 +1300,8 @@
+@@ -1277,6 +1302,8 @@
    ;;
  esac
  
@@ -790,7 +796,7 @@
  AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
  enable_win32_dll=yes, enable_win32_dll=no)
-@@ -1356,9 +1381,80 @@
+@@ -1356,9 +1383,80 @@
  echo "$lt_simple_link_test_code" >conftest.$ac_ext
  eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
  _lt_linker_boilerplate=`cat conftest.err`
@@ -872,7 +878,7 @@
  
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
-@@ -1683,7 +1779,11 @@
+@@ -1683,7 +1781,11 @@
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
        yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -885,7 +891,7 @@
        esac
        ;;
      esac
-@@ -1776,7 +1876,7 @@
+@@ -1776,7 +1878,7 @@
         $2=yes
       fi
     fi
@@ -894,7 +900,7 @@
     LDFLAGS="$save_LDFLAGS"
  ])
  
-@@ -2047,7 +2147,7 @@
+@@ -2047,7 +2149,7 @@
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
        [AC_CHECK_LIB([dld], [shl_load],
@@ -903,7 +909,7 @@
  	[AC_CHECK_FUNC([dlopen],
  	      [lt_cv_dlopen="dlopen"],
  	  [AC_CHECK_LIB([dl], [dlopen],
-@@ -2055,7 +2155,7 @@
+@@ -2055,7 +2157,7 @@
  	    [AC_CHECK_LIB([svld], [dlopen],
  		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
  	      [AC_CHECK_LIB([dld], [dld_link],
@@ -912,7 +918,7 @@
  	      ])
  	    ])
  	  ])
-@@ -2372,7 +2472,7 @@
+@@ -2372,7 +2474,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    ;;
  
@@ -921,7 +927,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -2713,6 +2813,18 @@
+@@ -2713,6 +2815,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -940,7 +946,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -2893,6 +3005,13 @@
+@@ -2893,6 +3007,13 @@
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
  
@@ -954,7 +960,7 @@
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
  if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -3392,7 +3511,7 @@
+@@ -3392,7 +3513,7 @@
  # whether `pass_all' will *always* work, you probably want this one.
  
  case $host_os in
@@ -963,7 +969,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -3487,7 +3606,7 @@
+@@ -3487,7 +3608,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -972,7 +978,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -3828,7 +3947,7 @@
+@@ -3828,7 +3949,7 @@
    fi
    ;;
  
@@ -981,7 +987,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -3885,6 +4004,7 @@
+@@ -3885,6 +4006,7 @@
  _LT_AC_TAGVAR(predeps, $1)=
  _LT_AC_TAGVAR(postdeps, $1)=
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -989,7 +995,7 @@
  
  # Source file extension for C++ test sources.
  ac_ext=cpp
-@@ -3994,7 +4114,7 @@
+@@ -3994,7 +4116,7 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -998,7 +1004,7 @@
      if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
-@@ -4007,7 +4127,7 @@
+@@ -4007,7 +4129,7 @@
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
@@ -1007,7 +1013,7 @@
  	for ld_flag in $LDFLAGS; do
  	  case $ld_flag in
  	  *-brtl*)
-@@ -4153,51 +4273,23 @@
+@@ -4153,51 +4275,23 @@
      fi
    ;;
        darwin* | rhapsody*)
@@ -1068,7 +1074,7 @@
        else
        case $cc_basename in
          xlc*)
-@@ -4448,7 +4540,7 @@
+@@ -4448,7 +4542,7 @@
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
@@ -1077,7 +1083,7 @@
          # Portland Group C++ compiler
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
    	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -4521,7 +4613,7 @@
+@@ -4521,7 +4615,7 @@
  	;;
      esac
      ;;
@@ -1086,7 +1092,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -4883,7 +4975,8 @@
+@@ -4883,7 +4977,8 @@
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
  # objects, libraries and library flags.
@@ -1096,7 +1102,7 @@
  dnl we can't use the lt_simple_compile_test_code here,
  dnl because it contains code intended for an executable,
  dnl not a library.  It's possible we should let each
-@@ -5008,6 +5101,11 @@
+@@ -5008,6 +5103,11 @@
  
  $rm -f confest.$objext
  
@@ -1108,7 +1114,7 @@
  # PORTME: override above test on systems where it is broken
  ifelse([$1],[CXX],
  [case $host_os in
-@@ -5064,7 +5162,6 @@
+@@ -5064,7 +5164,6 @@
    ;;
  esac
  ])
@@ -1116,7 +1122,7 @@
  case " $_LT_AC_TAGVAR(postdeps, $1) " in
  *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
  esac
-@@ -5149,7 +5246,7 @@
+@@ -5149,7 +5248,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -1125,7 +1131,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -5326,6 +5423,7 @@
+@@ -5326,6 +5425,7 @@
      _LT_AC_TAGVAR(predeps, $1) \
      _LT_AC_TAGVAR(postdeps, $1) \
      _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -1133,7 +1139,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
      _LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -5388,7 +5486,7 @@
+@@ -5388,7 +5488,7 @@
  # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
@@ -1142,7 +1148,7 @@
  # Free Software Foundation, Inc.
  #
  # This file is part of GNU Libtool:
-@@ -5625,6 +5723,10 @@
+@@ -5625,6 +5725,10 @@
  # shared library.
  postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
  
@@ -1153,7 +1159,7 @@
  # The library search path used internally by the compiler when linking
  # a shared library.
  compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -5974,7 +6076,7 @@
+@@ -5974,7 +6078,7 @@
      echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
      cat conftest.$ac_ext >&5
    fi
@@ -1162,7 +1168,7 @@
  
    # Do not use the global_symbol_pipe unless it works.
    if test "$pipe_works" = yes; then
-@@ -6031,7 +6133,8 @@
+@@ -6031,7 +6135,8 @@
        # built for inclusion in a dll (and should export symbols for example).
        # Although the cygwin gcc ignores -fPIC, still need this for old-style
        # (--disable-auto-import) libraries
@@ -1172,7 +1178,7 @@
        ;;
      darwin* | rhapsody*)
        # PIC is the default on this platform
-@@ -6068,7 +6171,7 @@
+@@ -6068,7 +6173,7 @@
      esac
    else
      case $host_os in
@@ -1181,7 +1187,7 @@
  	# All AIX code is PIC.
  	if test "$host_cpu" = ia64; then
  	  # AIX 5 now supports IA64 processor
-@@ -6164,7 +6267,7 @@
+@@ -6164,7 +6269,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
  	    ;;
@@ -1190,7 +1196,7 @@
  	    # Portland Group C++ compiler.
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -6202,7 +6305,7 @@
+@@ -6202,7 +6307,7 @@
  	    ;;
  	esac
  	;;
@@ -1199,7 +1205,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -6315,7 +6418,8 @@
+@@ -6315,7 +6420,8 @@
        # built for inclusion in a dll (and should export symbols for example).
        # Although the cygwin gcc ignores -fPIC, still need this for old-style
        # (--disable-auto-import) libraries
@@ -1209,7 +1215,7 @@
        ;;
  
      darwin* | rhapsody*)
-@@ -6385,7 +6489,8 @@
+@@ -6385,7 +6491,8 @@
      mingw* | cygwin* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
@@ -1219,7 +1225,7 @@
        ;;
  
      hpux9* | hpux10* | hpux11*)
-@@ -6522,7 +6627,7 @@
+@@ -6522,7 +6629,7 @@
  #
  if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
    AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
@@ -1228,7 +1234,7 @@
      [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
      [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
       "" | " "*) ;;
-@@ -6546,7 +6651,7 @@
+@@ -6546,7 +6653,7 @@
  #
  wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
  AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
@@ -1237,7 +1243,7 @@
    $lt_tmp_static_flag,
    [],
    [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -6562,7 +6667,7 @@
+@@ -6562,7 +6669,7 @@
  ifelse([$1],[CXX],[
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
@@ -1246,7 +1252,7 @@
      # If we're using GNU nm, then we don't want the "-C" option.
      # -C means demangle to AIX nm, but means don't demangle with GNU nm
      if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -6577,10 +6682,14 @@
+@@ -6577,10 +6684,14 @@
    cygwin* | mingw*)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
    ;;
@@ -1261,7 +1267,7 @@
  ],[
    runpath_var=
    _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -6611,12 +6720,14 @@
+@@ -6611,12 +6722,14 @@
    # it will be wrapped by ` (' and `)$', so one must not match beginning or
    # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    # as well as any symbol that contains `d'.
@@ -1277,7 +1283,7 @@
    extract_expsyms_cmds=
    # Just being paranoid about ensuring that cc_basename is set.
    _LT_CC_BASENAME([$compiler])
-@@ -6666,7 +6777,7 @@
+@@ -6666,7 +6779,7 @@
  
      # See if GNU ld supports shared libraries.
      case $host_os in
@@ -1286,7 +1292,7 @@
        # On AIX/PPC, the GNU linker is very broken
        if test "$host_cpu" != ia64; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6782,12 +6893,13 @@
+@@ -6782,12 +6895,13 @@
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -1301,7 +1307,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -6885,7 +6997,7 @@
+@@ -6885,7 +6999,7 @@
        fi
        ;;
  
@@ -1310,7 +1316,7 @@
        if test "$host_cpu" = ia64; then
  	# On IA64, the linker does run time linking by default, so we don't
  	# have to do anything special.
-@@ -6905,7 +7017,7 @@
+@@ -6905,7 +7019,7 @@
  	# Test if we are trying to use run time linking or normal
  	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
  	# need to do runtime linking.
@@ -1319,7 +1325,7 @@
  	  for ld_flag in $LDFLAGS; do
    	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
    	    aix_use_runtimelinking=yes
-@@ -7065,11 +7177,10 @@
+@@ -7065,11 +7179,10 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
      if test "$GCC" = yes ; then
      	output_verbose_link_cmd='echo'
@@ -1335,7 +1341,7 @@
      else
        case $cc_basename in
          xlc*)
-@@ -7219,7 +7330,7 @@
+@@ -7219,7 +7332,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1344,7 +1350,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -7798,7 +7909,7 @@
+@@ -7798,7 +7911,7 @@
  
  _PKG_TEXT
  
@@ -1353,7 +1359,7 @@
  		[$4])
  else
  	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7808,7 +7919,7 @@
+@@ -7808,7 +7921,7 @@
  fi[]dnl
  ])# PKG_CHECK_MODULES
  
@@ -1362,7 +1368,7 @@
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
-@@ -7823,7 +7934,7 @@
+@@ -7823,7 +7936,7 @@
  [am__api_version='1.10'
  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
  dnl require some minimum version.  Point them to the right macro.
@@ -1371,7 +1377,7 @@
        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
  ])
  
-@@ -7839,8 +7950,10 @@
+@@ -7839,8 +7952,10 @@
  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -1384,7 +1390,7 @@
  
  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
-@@ -8112,7 +8225,7 @@
+@@ -8112,7 +8227,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.
@@ -1393,7 +1399,7 @@
      dirpart=`AS_DIRNAME("$mf")`
    else
      continue
-@@ -8172,13 +8285,13 @@
+@@ -8172,13 +8287,13 @@
  # Do all the work for Automake.                             -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -1409,7 +1415,7 @@
  
  # This macro actually does too much.  Some checks are only needed if
  # your package does certain things.  But this isn't really a big deal.
-@@ -8283,16 +8396,17 @@
+@@ -8283,16 +8398,17 @@
  # our stamp files there.
  AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
  [# Compute $1's index in $config_headers.
@@ -1429,7 +1435,7 @@
  
  # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
  #
-@@ -8610,7 +8724,7 @@
+@@ -8610,7 +8726,7 @@
  
  # _AM_SUBST_NOTMAKE(VARIABLE)
  # ---------------------------
@@ -1439,8 +1445,8 @@
  AC_DEFUN([_AM_SUBST_NOTMAKE])
  
 diff -urNad f-spot~/configure f-spot/configure
---- f-spot~/configure	2008-03-15 15:00:06.000000000 +0000
-+++ f-spot/configure	2008-03-20 17:59:01.000000000 +0000
+--- f-spot~/configure	2008-04-15 20:47:53.000000000 +0100
++++ f-spot/configure	2008-04-15 21:09:19.000000000 +0100
 @@ -847,14 +847,14 @@
  INTLTOOL_SCHEMAS_RULE
  INTLTOOL_THEME_RULE
@@ -1510,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
@@ -3479,17 +3485,7 @@
  # The library search path used internally by the compiler when linking
  # a shared library.
  compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -21106,9 +21511,6 @@
-          gthread)
-              pkg_config_args="$pkg_config_args gthread-2.0"
-          ;;
--         gio*)
--             pkg_config_args="$pkg_config_args $module-2.0"
--         ;;
-       esac
-   done
- 
-@@ -21651,6 +22053,9 @@
+@@ -21651,6 +22056,9 @@
  fi
  
  
@@ -3499,7 +3495,7 @@
   if test "$gdu_cv_have_gdu" = "yes"; then
    HAVE_GNOME_DOC_UTILS_TRUE=
    HAVE_GNOME_DOC_UTILS_FALSE='#'
-@@ -21794,7 +22199,7 @@
+@@ -21794,7 +22202,7 @@
  and F_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3508,7 +3504,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
-@@ -21804,7 +22209,7 @@
+@@ -21804,7 +22212,7 @@
  and F_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3517,7 +3513,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21908,7 +22313,7 @@
+@@ -21908,7 +22316,7 @@
  and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3526,7 +3522,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 +22323,7 @@
+@@ -21918,7 +22326,7 @@
  and GNOME_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3535,7 +3531,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21928,7 +22333,7 @@
+@@ -21928,7 +22336,7 @@
  echo "${ECHO_T}yes" >&6; }
  	:
  fi
@@ -3544,7 +3540,7 @@
  
  pkg_failed=no
  { echo "$as_me:$LINENO: checking for GTKHTML_SHARP" >&5
-@@ -22020,7 +22425,7 @@
+@@ -22020,7 +22428,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3553,7 +3549,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 +22435,7 @@
+@@ -22030,7 +22438,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3562,7 +3558,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -22133,7 +22538,7 @@
+@@ -22133,7 +22541,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3571,7 +3567,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 +22548,7 @@
+@@ -22143,7 +22551,7 @@
  and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3580,7 +3576,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -22274,7 +22679,7 @@
+@@ -22274,7 +22682,7 @@
  and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3589,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
-@@ -22284,7 +22689,7 @@
+@@ -22284,7 +22692,7 @@
  and GCONF_SHARP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3598,7 +3594,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -23925,7 +24330,7 @@
+@@ -23925,7 +24333,7 @@
  and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3607,7 +3603,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 +24340,7 @@
+@@ -23935,7 +24343,7 @@
  and LIBGPHOTO2_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3616,7 +3612,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -24039,7 +24444,7 @@
+@@ -24039,7 +24447,7 @@
  and EXIF_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3625,7 +3621,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 +24454,7 @@
+@@ -24049,7 +24457,7 @@
  and EXIF_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -3634,16 +3630,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -24394,7 +24799,7 @@
- 
-     fi
-   fi
--     USE_NLS=yes
-+         USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no
-@@ -25686,6 +26091,15 @@
+@@ -25686,6 +26094,15 @@
       fi
     fi
  
@@ -3659,16 +3646,16 @@
           test -d po || mkdir po
     if test "x$srcdir" != "x."; then
       if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -25723,7 +26137,7 @@
+@@ -25723,7 +26140,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"
++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"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -26355,9 +26769,7 @@
+@@ -26355,9 +26772,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"
@@ -3679,7 +3666,7 @@
  
  
  _ACEOF
-@@ -26394,6 +26806,7 @@
+@@ -26394,6 +26809,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" ;;
@@ -3687,7 +3674,15 @@
      "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 @@
+@@ -26417,6 +26833,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" ;;
++    "f-spot-import.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot-import.desktop.in" ;;
+     "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 @@
  INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
  INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
  INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
@@ -3706,7 +3701,7 @@
  ALL_LINGUAS!$ALL_LINGUAS$ac_delim
  CC!$CC$ac_delim
  CFLAGS!$CFLAGS$ac_delim
-@@ -26643,6 +27056,8 @@
+@@ -26643,6 +27060,8 @@
  ECHO!$ECHO$ac_delim
  AR!$AR$ac_delim
  RANLIB!$RANLIB$ac_delim
@@ -3715,7 +3710,7 @@
  CXX!$CXX$ac_delim
  CXXFLAGS!$CXXFLAGS$ac_delim
  ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26668,6 +27083,7 @@
+@@ -26668,6 +27087,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
@@ -3723,7 +3718,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 +27128,6 @@
+@@ -26712,9 +27132,6 @@
  LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
  EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
  EXIF_LIBS!$EXIF_LIBS$ac_delim
@@ -3733,7 +3728,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26756,6 +27169,9 @@
+@@ -26756,6 +27173,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -3743,7 +3738,7 @@
  WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
  WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
  TURTLEDIR!$TURTLEDIR$ac_delim
-@@ -26764,10 +27180,8 @@
+@@ -26764,10 +27184,8 @@
  ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
  GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
  USE_NLS!$USE_NLS$ac_delim
@@ -3754,7 +3749,7 @@
  CATALOGS!$CATALOGS$ac_delim
  CATOBJEXT!$CATOBJEXT$ac_delim
  GMOFILES!$GMOFILES$ac_delim
-@@ -26777,6 +27191,7 @@
+@@ -26777,6 +27195,7 @@
  PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
  POFILES!$POFILES$ac_delim
  POSUB!$POSUB$ac_delim
@@ -3762,7 +3757,7 @@
  LIBJPEG!$LIBJPEG$ac_delim
  CSC!$CSC$ac_delim
  expanded_libdir!$expanded_libdir$ac_delim
-@@ -26785,7 +27200,7 @@
+@@ -26785,7 +27204,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -3771,7 +3766,7 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -27186,21 +27601,22 @@
+@@ -27186,21 +27605,22 @@
    fi
    rm -f "$tmp/out12"
  # Compute $ac_file's index in $config_headers.
@@ -3801,7 +3796,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -27237,7 +27653,7 @@
+@@ -27237,7 +27657,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.
@@ -3810,7 +3805,7 @@
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \
-@@ -27356,10 +27772,6 @@
+@@ -27356,10 +27776,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" \
@@ -3822,8 +3817,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-15 15:00:06.000000000 +0000
-+++ f-spot/dbus-sharp/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -3900,8 +3895,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-15 15:00:06.000000000 +0000
-+++ f-spot/dbus-sharp-glib/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -3978,8 +3973,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-15 15:00:06.000000000 +0000
-+++ f-spot/docs/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4043,8 +4038,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/CDExport/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4121,8 +4116,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/DefaultExporters/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4199,8 +4194,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4277,8 +4272,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/FlickrExport/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4702,8 +4697,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/FolderExport/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4780,8 +4775,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/GalleryExport/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4867,8 +4862,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -4970,8 +4965,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/PicasaWebExport/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5086,8 +5081,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5164,8 +5159,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/SmugMugExport/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5280,8 +5275,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-15 15:00:06.000000000 +0000
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5358,8 +5353,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-15 15:00:06.000000000 +0000
-+++ f-spot/glitz-sharp/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5461,8 +5456,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-15 15:00:06.000000000 +0000
-+++ f-spot/glitz-sharp/src/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5539,8 +5534,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-15 15:00:06.000000000 +0000
-+++ f-spot/gnome-keyring-sharp/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5617,8 +5612,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-15 15:00:06.000000000 +0000
-+++ f-spot/icons/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -5694,8 +5689,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-15 15:00:06.000000000 +0000
-+++ f-spot/intltool-extract.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -32,7 +32,7 @@
  ## Release information
  my $PROGRAM      = "intltool-extract";
@@ -5754,8 +5749,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-15 15:00:06.000000000 +0000
-+++ f-spot/intltool-merge.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -35,7 +35,7 @@
  ## Release information
  my $PROGRAM = "intltool-merge";
@@ -6067,8 +6062,8 @@
          }
          close OUTPUT;
 diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
---- f-spot~/intltool-update.in	2008-03-15 15:00:06.000000000 +0000
-+++ f-spot/intltool-update.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -30,7 +30,7 @@
  
  ## Release information
@@ -6327,8 +6322,8 @@
      
      return $keywords;
 diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
---- f-spot~/libeog/Makefile.in	2008-03-15 15:00:06.000000000 +0000
-+++ f-spot/libeog/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -6479,8 +6474,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-15 15:00:06.000000000 +0000
-+++ f-spot/libeog/cursors/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -6544,8 +6539,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-15 15:00:06.000000000 +0000
-+++ f-spot/libfspot/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -6694,8 +6689,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-15 15:00:06.000000000 +0000
-+++ f-spot/libgphoto2-sharp/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -6772,8 +6767,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-15 15:00:06.000000000 +0000
-+++ f-spot/libjpegtran/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -6920,8 +6915,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-15 15:00:06.000000000 +0000
-+++ f-spot/mono-addins/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -7023,8 +7018,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-15 15:00:06.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -7101,8 +7096,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-15 15:00:06.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -7179,8 +7174,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-15 15:00:06.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -7257,8 +7252,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-15 15:00:06.000000000 +0000
-+++ f-spot/po/Makefile.in.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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>
@@ -7292,8 +7287,8 @@
  uninstall:
  	linguas="$(USE_LINGUAS)"; \
 diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
---- f-spot~/semweb/Makefile.in	2008-03-15 15:00:06.000000000 +0000
-+++ f-spot/semweb/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -7370,8 +7365,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-03-15 15:00:06.000000000 +0000
-+++ f-spot/src/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -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.
@@ -7525,8 +7520,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-03-15 15:00:06.000000000 +0000
-+++ f-spot/tools/Makefile.in	2008-03-20 17:58:50.000000000 +0000
+--- 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
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.

Added: packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch?rev=3887&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/debian_x-content-mimetype.dpatch Tue Apr 15 20:27:14 2008
@@ -1,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian_x-content-mimetype.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from b.g.o. 510325 by Stephane Delcroix adding an f-spot-import
+## DP: .desktop file for appropiate x-content mimetypes.
+
+ at DPATCH@
+diff -urNad f-spot~/Makefile.am f-spot/Makefile.am
+--- f-spot~/Makefile.am	2008-04-15 21:08:14.000000000 +0100
++++ f-spot/Makefile.am	2008-04-15 21:08:15.000000000 +0100
+@@ -36,7 +36,8 @@
+ 
+ desktop_in_files=	\
+ 	f-spot.desktop.in	\
+-	f-spot-view.desktop.in
++	f-spot-view.desktop.in	\
++	f-spot-import.desktop.in
+ 
+ desktop_files=$(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+diff -urNad f-spot~/configure.in f-spot/configure.in
+--- f-spot~/configure.in	2008-04-15 21:08:14.000000000 +0100
++++ f-spot/configure.in	2008-04-15 21:08:15.000000000 +0100
+@@ -316,4 +316,5 @@
+ f-spot.spec
+ f-spot.desktop.in
+ f-spot-view.desktop.in
++f-spot-import.desktop.in
+ ])
+diff -urNad f-spot~/f-spot-import.desktop.in.in f-spot/f-spot-import.desktop.in.in
+--- f-spot~/f-spot-import.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
++++ f-spot/f-spot-import.desktop.in.in	2008-04-15 21:08:15.000000000 +0100
+@@ -0,0 +1,20 @@
++[Desktop Entry]
++Version=1.0
++Encoding=UTF-8
++_Name=F-Spot Photo Manager
++_GenericName=Photo Manager
++_Comment=Import into F-Spot
++NoDisplay=true
++Exec=f-spot-import %u
++Icon=f-spot
++MimeType=x-content/image-dcf;x-content/image-picturecd
++StartupNotify=true
++Terminal=false
++Type=Application
++Categories=Graphics;Photography;GNOME;GTK;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=f-spot
++X-GNOME-Bugzilla-Component=General
++X-GNOME-Bugzilla-Version=@VERSION@
++X-GNOME-DocPath=f-spot/f-spot.xml
++X-SuSE-translate=true

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

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