diff -u gthumb-2.10.10/debian/changelog gthumb-2.10.10/debian/changelog --- gthumb-2.10.10/debian/changelog +++ gthumb-2.10.10/debian/changelog @@ -1,3 +1,11 @@ +gthumb (3:2.10.10-0ubuntu1.1) intrepid-proposed; urgency=low + + * Add 04-nautilus-import.patch: Provide a gthumb-import.desktop which works + with nautilus and gphoto cameras. (LP: #287689) + * 09-autoconf.patch: Refresh, previous patch touches data/Makefile.am. + + -- Martin Pitt Tue, 11 Nov 2008 16:02:26 +0100 + gthumb (3:2.10.10-0ubuntu1) intrepid; urgency=low * New upstream release (LP: #273619) reverted: --- gthumb-2.10.10/debian/patches/09-autoconf.patch +++ gthumb-2.10.10/debian/patches/09-autoconf.patch @@ -1,7 +1,7 @@ Index: gthumb-2.10.10/aclocal.m4 =================================================================== ---- gthumb-2.10.10.orig/aclocal.m4 2008-09-22 20:22:57.000000000 +0100 -+++ gthumb-2.10.10/aclocal.m4 2008-09-23 16:06:25.000000000 +0100 +--- gthumb-2.10.10.orig/aclocal.m4 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/aclocal.m4 2008-11-11 16:01:02.000000000 +0100 @@ -704,102 +704,419 @@ fi]) @@ -14068,8 +14068,8 @@ -m4_include([m4/intltool.m4]) Index: gthumb-2.10.10/config.guess =================================================================== ---- gthumb-2.10.10.orig/config.guess 2008-09-22 20:23:09.000000000 +0100 -+++ gthumb-2.10.10/config.guess 2008-09-23 16:06:25.000000000 +0100 +--- gthumb-2.10.10.orig/config.guess 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/config.guess 2008-11-11 16:01:02.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -14155,8 +14155,8 @@ send the following data and any information you think might be Index: gthumb-2.10.10/config.h.in =================================================================== ---- gthumb-2.10.10.orig/config.h.in 2008-09-22 20:23:04.000000000 +0100 -+++ gthumb-2.10.10/config.h.in 2008-09-23 16:06:25.000000000 +0100 +--- gthumb-2.10.10.orig/config.h.in 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/config.h.in 2008-11-11 16:01:02.000000000 +0100 @@ -84,6 +84,10 @@ /* Locale directory */ #undef LOCALEDIR @@ -14170,8 +14170,8 @@ Index: gthumb-2.10.10/config.sub =================================================================== ---- gthumb-2.10.10.orig/config.sub 2008-09-22 20:23:09.000000000 +0100 -+++ gthumb-2.10.10/config.sub 2008-09-23 16:06:25.000000000 +0100 +--- gthumb-2.10.10.orig/config.sub 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/config.sub 2008-11-11 16:01:02.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. @@ -14271,8 +14271,8 @@ ;; Index: gthumb-2.10.10/configure =================================================================== ---- gthumb-2.10.10.orig/configure 2008-09-22 20:23:03.000000000 +0100 -+++ gthumb-2.10.10/configure 2008-09-23 16:06:48.000000000 +0100 +--- gthumb-2.10.10.orig/configure 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/configure 2008-11-11 16:01:02.000000000 +0100 @@ -555,22 +555,22 @@ # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -43289,8 +43289,8 @@ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) Index: gthumb-2.10.10/INSTALL =================================================================== ---- gthumb-2.10.10.orig/INSTALL 2008-09-22 20:22:26.000000000 +0100 -+++ gthumb-2.10.10/INSTALL 2008-09-23 16:06:25.000000000 +0100 +--- gthumb-2.10.10.orig/INSTALL 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/INSTALL 2008-11-11 16:01:03.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* @@ -43443,8 +43443,8 @@ Index: gthumb-2.10.10/ltmain.sh =================================================================== ---- gthumb-2.10.10.orig/ltmain.sh 2008-02-08 00:54:46.000000000 +0000 -+++ gthumb-2.10.10/ltmain.sh 2008-09-23 16:06:25.000000000 +0100 +--- gthumb-2.10.10.orig/ltmain.sh 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/ltmain.sh 2008-11-11 16:01:03.000000000 +0100 @@ -1,52 +1,83 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. @@ -57150,8 +57150,8 @@ + Index: gthumb-2.10.10/Makefile.in =================================================================== ---- gthumb-2.10.10.orig/Makefile.in 2008-09-22 20:23:09.000000000 +0100 -+++ gthumb-2.10.10/Makefile.in 2008-09-23 16:06:25.000000000 +0100 +--- gthumb-2.10.10.orig/Makefile.in 2008-11-11 16:00:47.000000000 +0100 ++++ gthumb-2.10.10/Makefile.in 2008-11-11 16:01:38.000000000 +0100 @@ -38,8 +38,7 @@ TODO config.guess config.sub depcomp install-sh ltmain.sh \ missing mkinstalldirs @@ -57261,0 +57262,102 @@ +Index: gthumb-2.10.10/data/Makefile.in +=================================================================== +--- gthumb-2.10.10.orig/data/Makefile.in 2008-11-11 16:01:13.000000000 +0100 ++++ gthumb-2.10.10/data/Makefile.in 2008-11-11 16:01:36.000000000 +0100 +@@ -35,8 +35,7 @@ + subdir = data + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -90,10 +89,6 @@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ +@@ -101,14 +96,13 @@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -160,6 +154,7 @@ + IPTCDATA_CFLAGS = @IPTCDATA_CFLAGS@ + IPTCDATA_LIBS = @IPTCDATA_LIBS@ + JPEG_LIBS = @JPEG_LIBS@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LEX = @LEX@ + LEXLIB = @LEXLIB@ +@@ -178,6 +173,7 @@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBXML_REQUIRED = @LIBXML_REQUIRED@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +@@ -187,6 +183,7 @@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ ++NM = @NM@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -194,6 +191,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -225,8 +224,7 @@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -257,6 +255,7 @@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -273,7 +272,7 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = albumthemes glade + desktopdir = $(datadir)/applications +-desktop_in_files = gthumb.desktop.in ++desktop_in_files = gthumb.desktop.in gthumb-import.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + icondir = $(datadir)/icons/hicolor/48x48/apps + icon_DATA = gthumb.png reverted: --- gthumb-2.10.10/debian/patches/series +++ gthumb-2.10.10/debian/patches/series @@ -1,6 +1,7 @@ 01-PIC.patch 02-preserve_gnome-doc-utils.make.patch 03-libgthumb_moduledir.patch +04-nautilus-import.patch 05-fix_locales.patch 06-add_keybinding_DoNotSave.patch 07-fix_zooms.patch only in patch2: unchanged: --- gthumb-2.10.10.orig/debian/patches/04-nautilus-import.patch +++ gthumb-2.10.10/debian/patches/04-nautilus-import.patch @@ -0,0 +1,50 @@ +# Description: Provide a gthumb-import.desktop which works with nautilus and gphoto cameras. +# Ubuntu: https://launchpad.net/bugs/287689 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=560352 +Index: gthumb-2.10.10/data/Makefile.am +=================================================================== +--- gthumb-2.10.10.orig/data/Makefile.am 2008-11-11 15:46:55.000000000 +0100 ++++ gthumb-2.10.10/data/Makefile.am 2008-11-11 15:48:51.000000000 +0100 +@@ -3,7 +3,7 @@ + @INTLTOOL_DESKTOP_RULE@ + + desktopdir = $(datadir)/applications +-desktop_in_files=gthumb.desktop.in ++desktop_in_files=gthumb.desktop.in gthumb-import.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + + icondir = $(datadir)/icons/hicolor/48x48/apps +Index: gthumb-2.10.10/data/gthumb-import.desktop.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gthumb-2.10.10/data/gthumb-import.desktop.in 2008-11-11 15:50:22.000000000 +0100 +@@ -0,0 +1,16 @@ ++[Desktop Entry] ++_Name=gThumb Image Viewer ++_GenericName=Image Viewer ++_Comment=View and organize your images ++Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography; ++Exec=sh -c 'gvfs-mount -u "%U"; exec gthumb --import-photos' ++Icon=gthumb ++MimeType=x-content/image-dcf;x-content/image-picturecd; ++NoDisplay=true ++StartupNotify=true ++Terminal=false ++Type=Application ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=gthumb ++X-GNOME-Bugzilla-Component=general ++X-GNOME-DocPath=gthumb/gthumb.xml +Index: gthumb-2.10.10/data/gthumb.desktop.in +=================================================================== +--- gthumb-2.10.10.orig/data/gthumb.desktop.in 2008-11-11 15:46:33.000000000 +0100 ++++ gthumb-2.10.10/data/gthumb.desktop.in 2008-11-11 15:47:15.000000000 +0100 +@@ -5,7 +5,7 @@ + Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography; + Exec=gthumb %U + Icon=gthumb +-MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml;x-content/image-dcf;x-content/image-picturecd; ++MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml; + StartupNotify=true + Terminal=false + Type=Application only in patch2: unchanged: