--- gthumb-2.10.11.orig/debian/gthumb-data.dirs +++ gthumb-2.10.11/debian/gthumb-data.dirs @@ -0,0 +1 @@ +usr/share/pixmaps --- gthumb-2.10.11.orig/debian/rules +++ gthumb-2.10.11/debian/rules @@ -0,0 +1,81 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +TMPCFLAGS = -Wall -g -lpng + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + export CFLAGS=$(TMPCFLAGS) -O0 +else + export CFLAGS=$(TMPCFLAGS) -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +export CPPFLAGS=-I/usr/include/libpng12 +export LDFLAGS=-Wl,-rpath,/usr/lib/gthumb -Wl,--as-needed + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + autoreconf -fvi + rm -rf autom4te.cache + dh build --before dh_auto_configure + dh_auto_configure -- --with-gconf-schema-file-dir=\$${datadir}/gconf/schemas + dh build --after dh_auto_configure + + # Remove RPATH warning from lintian + #perl -i -pe 's/^(hardcode_libdir_flag_spec\s*=\s*).+$$/$$1" -D__LIBTOOL_IS_A_FOOL__ "/' libtool + + touch $@ + cd po; intltool-update -p + +clean: distclean unpatch +distclean: $(QUILT_STAMPFN) + dh clean + +install: install-stamp +install-stamp: $(QUILT_STAMPFN) + dh install + + find debian/ \( -name "*.la" -o -name "*.a" \) -exec rm -vrf {} \; + + # These go into gthumb... + -rm -rf $(CURDIR)/debian/gthumb-data/usr/share/applications + -rm -rf $(CURDIR)/debian/gthumb-data/usr/share/man + + # ...put this in the right location. + install -m644 $(CURDIR)/debian/tmp/usr/lib/libgthumb.so $(CURDIR)/debian/gthumb/usr/lib/gthumb/ + + for file in $(wildcard $(CURDIR)/debian/gthumb-data/usr/share/gthumb/albumthemes/*/index.gthtml); do \ + sed -e "s/@CHARSET@/`grep " `dirname \$${file}`/htaccess; \ + echo "Please rename htaccess to .htaccess when uploading your Web Album." >> `dirname \$${file}`/README; \ + done + + # Add translation domain to .desktop and .server files + DOMAIN=$$(grep --max-count 1 '^GETTEXT_PACKAGE[[:space:]]*=' $(CURDIR)/po/Makefile | sed 's/^.*=[[:space:]]\([^[:space:]]\)/\1/'); \ + for d in $$(find debian/gthumb -type f -name "*.desktop" ); do \ + echo "Adding translation domain $$DOMAIN to $$d..."; \ + echo "X-Ubuntu-Gettext-Domain=$$DOMAIN" >> $$d; \ + done; \ + for d in $$(find debian/gthumb -type f -name "*.server" ); do \ + echo "Adding translation domain $$DOMAIN to $$d..."; \ + sed -i "s// Tue, 05 May 2009 10:32:50 +0200 + +gthumb (3:2.10.11-1) unstable; urgency=low + + * New Upstream Version: + - fix crasher bug in exif tag reading, caused by malformed tiff headers. + (LP: #316017) + - give the photo-import desktop file different name parameters, so that + users can distinguish it from the normal desktop file. (LP: #318694) + - fixes GtkSpinButton deprecated non-zero page size adjustment setting, + patch from Ubuntu merged upstream (LP: #319349) + * Forgot bugnumber to close in 3:2.10.10-1, added (mostly for + changelog reasons, closing it manually) + * debian/control: + - scrollkeeper moved from gthumb's Recommends to gthumb-data's + Depends (Closes: #508709) + - yelp Recommends moved from gthumb to gthumb-data + - Standards-Version bumped to 3.8.1 (no changes needed) + * debian/patches/: + - 05-fix_locales.patch, 06-add_keybinding_DoNotSave.patch. + 10-fix_POTFILES.skip.patch refreshed + - 12-remove_Save_button_in_crop_dialog.patch added (Closes: #495444) + + -- David Paleino Sat, 11 Apr 2009 17:17:51 +0200 + +gthumb (3:2.10.10-2) unstable; urgency=low + + * Brown-paper-bag bug upload + * debian/patches/: + - 01-PIC.patch forwarded upstream, annotated. + - 06-add_keybinding_DoNotSave.patch forwarded upstream, annotated. + - 07-fix_zooms.patch, 08-fix_preferences.patch forwarded upstream, + annotated. + - 09-fix_infinite_loop_dragging_parent_dir.patch forwarded upstream, + annotated. + - 10-fix_POTFILES.skip.patch updated + - 11-fix_Film_on_import.patch added, thanks to Matijs van Zuijlen + (Closes: #510143) + - series updated: disable 03-libgthumb_moduledir.patch (i.e. let's + fix this bug before someone else notices :) ) + + -- David Paleino Sat, 21 Feb 2009 23:24:50 +0100 + +gthumb (3:2.10.10-1) unstable; urgency=low + + * New Upstream Version + * debian/rules: use $(QUILT_STAMPFN) instead of "patch" + * debian/patches/: + - 00-fix_ltmain.sh.patch added + - 04-fix_gthumb.desktop.in.patch removed, merged upstream + - 06-add_keybinding_DoNotSave.patch refreshed to cleanly apply, + description added + - 08-fix_missing_include.patch removed, was only needed in 2.10.8 + - 08-fix_preferences.patch added (Closes: #452932) + - 09-fix_infinite_loop_dragging_parent_dir.patch added: see + patch description for more info (Closes: #420195) + - 10-fix_POTFILES.skip.patch added: intltool-extract wrongly looks + at the original files patched by quilt, thus issuing an error + because of "unused translations" + - 01-PIC.patch, 02-preserve_gnome-doc-utils.make.patch, + 03-libgthumb_moduledir.patch, 05-fix_locales.patch, + 07-fix_zooms.patch: descriptions added + * debian/control: + - packaging moved to Git, updated Vcs-* fields + - dependency fields wrapped, for better readability in diffs + - added missing Build-Dependencies: libjpeg62-dev, + libglade2-dev (>= 2.4.0), libxrender-dev + - added support for libopenraw (B-D libopenrawgnome-dev) (Closes: #365060) + - debhelper dependency bumped to >= 7 + - added ${misc:Depends} to gthumb-data + - Standards-Version bumped to 3.8.0: + + debian/README.source added + - DMUA set + * debian/compat bumped to 7 + * debian/rules: + - using dh7 + - pass --with-gconf-schema-file-dir to ./configure + - auto-generation of htaccess and README files for Album Themes + - moved scrollkeeper to Recommends (it's not essential) + * debian/gthumb.mime added (Closes: #469316) + * debian/gthumb.dirs removed + * debian/htaccess.tmpl added (Closes: #434111) + * debian/gthumb-data.dirs: also installing gconf.schemas now + (Closes: #502968) + + -- David Paleino Sat, 21 Feb 2009 18:55:37 +0100 + +gthumb (3:2.10.8-1) unstable; urgency=low + + * Package adopted by me (Closes: #457591) + * New upstream release (Closes: #457509): + - fixes crash trying to print (Closes: #457350, #454298, #446413) + - fixes command line options parsing (Closes: #298881) + * debian/compat bumped to 5 + * debian/control: + - Standards-Version 3.7.3 + - dependencies updated (and wrapped) + - depending on unversioned scrollkeeper (Closes: #456602, #457021) + - recommending yelp (Closes: #340820) + - changed the Maintainer field + - added Homepage field (removing old pseudo-field) + - added Vcs-Svn and Vcs-Browser fields + - added Conflicts: gthumb (<< 3:2.10.8-1) to gthumb-data because of + conflicting files with older packages. + * debian/patches: converted to quilt + - 02-preserve_gnome-doc-utils.make added (compilation failed otherwise) + - 04-fix_gnome.desktop.in added (removing Encoding line) + - 06-fix_locales.patch added (Closes: #403736, #404086) + - 07-add_keybinding_DoNotSave.patch added (Closes: #310095) + - 08-fix_zooms.patch added (Closes: #452929) + * debian/copyright fixed. + + -- David Paleino Sun, 27 Jan 2008 10:26:18 +0100 + +gthumb (3:2.10.5-2) unstable; urgency=low + + * Update debian/watch file for gthumb 2.10 series (closes: #404647) + + -- Remco van de Meent Wed, 15 Aug 2007 09:36:49 +0200 + +gthumb (3:2.10.5-1) unstable; urgency=low + + * New upstream release + * Enable libiptcdata (closes: #426909) + + -- Remco van de Meent Tue, 14 Aug 2007 11:14:16 +0200 + +gthumb (3:2.10.2-4) unstable; urgency=low + + * Rebuild scrollkeeper-db after upgrade from version in which + /var/lib/scrollkeeper files were provided (closes: #417593) + + -- Remco van de Meent Thu, 24 May 2007 09:22:51 +0200 + +gthumb (3:2.10.2-3) unstable; urgency=low + + * Disable install of scrollkeeper files (closes: #417593) + + -- Remco van de Meent Wed, 23 May 2007 22:27:23 +0200 + +gthumb (3:2.10.2-2) unstable; urgency=low + + * Upload to unstable instead of experimental. + + -- Remco van de Meent Fri, 04 May 2007 15:37:51 +0200 + +gthumb (3:2.10.2-1) experimental; urgency=low + + * New upstream release + + -- Remco van de Meent Fri, 04 May 2007 13:40:14 +0200 + +gthumb (3:2.10.0-1) experimental; urgency=low + + * New upstream release + + -- Remco van de Meent Tue, 20 Mar 2007 15:33:55 +0100 + +gthumb (3:2.9.3-2) experimental; urgency=low + + * Fix dependency on libcairo2 (closes: #414577) + + -- Remco van de Meent Wed, 14 Mar 2007 19:57:06 +0000 + +gthumb (3:2.9.3-1) experimental; urgency=low + + * New upstream release (closes: #306189) + + -- Remco van de Meent Mon, 5 Mar 2007 09:29:05 +0100 + +gthumb (3:2.9.2-2) experimental; urgency=low + + * Adding versioned build-depends where necessary (closes: #412685) + + -- Remco van de Meent Tue, 27 Feb 2007 13:35:23 +0100 + +gthumb (3:2.9.2-1) experimental; urgency=low + + * New upstream release + + -- Remco van de Meent Mon, 26 Feb 2007 13:03:54 +0100 + +gthumb (3:2.9.1-1) experimental; urgency=low + + * New upstream release + + -- Remco van de Meent Thu, 25 Jan 2007 09:09:49 +0100 + +gthumb (3:2.8.0-2) unstable; urgency=low + + * Minor cleanups + + -- Remco van de Meent Mon, 4 Dec 2006 21:16:13 +0100 + +gthumb (3:2.8.0-1) unstable; urgency=low + + * New upstream release + * Acknowledge changes in previous NMU (closes: #372582) + * Bump standards version to 3.7.2 + + -- Remco van de Meent Wed, 29 Nov 2006 09:34:09 +0100 + +gthumb (3:2.6.9-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Drop the makefile-install-rule gconf snippet from the postinst completely + as it was never triggerred (since dh_gconf moved the schema out of /etc). + [debian/postinst] + * Add a makefile-uninstall-rule gconf snippet in postinst to remove cruft + left over from versions prior to this version. (Closes: #369866) + + -- Loic Minier Sat, 10 Jun 2006 13:12:46 +0200 + +gthumb (3:2.6.9-3) unstable; urgency=low + + * Fix gthumb module dir location (closes: #360122) + + -- Remco van de Meent Thu, 30 Mar 2006 22:06:00 +0200 + +gthumb (3:2.6.9-2) unstable; urgency=low + + * Add libtool as Build-Depends, fixes compile problems + + -- Remco van de Meent Wed, 29 Mar 2006 10:29:36 +0200 + +gthumb (3:2.6.9-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Tue, 28 Mar 2006 15:05:41 +0200 + +gthumb (3:2.6.6-1) unstable; urgency=low + + * New upstream release + * Depend on libexif >= 0.6.12 (closes: #321311) + + -- Remco van de Meent Wed, 10 Aug 2005 23:50:04 +0200 + +gthumb (3:2.6.5-1) unstable; urgency=low + + * New upstream release + * No more 05_libtool.dpatch at compile-time + * German PO file correction (closes: #314058, thanks to Jens Seidel) + * Various packaging fixes: updated menu label, xpm icon, new package + description, install gconf scheme correctly, use dh_desktop (closes: + #306166, thanks to Dan Korostelev) + + -- Remco van de Meent Thu, 23 Jun 2005 18:00:01 +0200 + +gthumb (3:2.6.3-1.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for sarge-targetted RC bugfix + * Rebuild debian/patches/05_libtool.dpatch after running automake, to + avoid macro skew when automake has to be run at build time + (closes: #300424). + + -- Steve Langasek Sat, 26 Mar 2005 16:28:59 -0800 + +gthumb (3:2.6.3-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Thu, 10 Feb 2005 15:38:22 +0100 + +gthumb (3:2.6.2-1) unstable; urgency=low + + * New upstream release (closes: #286326) + * New upstream version resolves SVG bug (closes: #288242) + + -- Remco van de Meent Thu, 6 Jan 2005 11:45:06 +0100 + +gthumb (3:2.6.1-3) unstable; urgency=high + + * Automake-1.9. Run only once. Should fix build problems on ia64 + + -- Remco van de Meent Wed, 1 Dec 2004 15:36:46 +0100 + +gthumb (3:2.6.1-2) unstable; urgency=high + + * Added Build-Dep on dpatch + + -- Remco van de Meent Wed, 1 Dec 2004 13:45:26 +0100 + +gthumb (3:2.6.1-1) unstable; urgency=high + + * New upstream release (fixes some crashes in previous versions) + * Build cleanup + + -- Remco van de Meent Wed, 1 Dec 2004 10:04:05 +0100 + +gthumb (3:2.6.0.1-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sat, 13 Nov 2004 11:44:15 +0100 + +gthumb (3:2.5.1-1) experimental; urgency=low + + * New upstream release + + -- Remco van de Meent Thu, 2 Sep 2004 22:14:43 +0200 + +gthumb (3:2.4.1-5) unstable; urgency=high + + * High-urgency because this is a release-critical bug + * Fix automake braindamage while building by adding AM_MAINTAINER_MODE + to configure.in (closes: #268303) (thanks to Steve Langasek for + providing a patch) + + -- Remco van de Meent Fri, 27 Aug 2004 17:27:21 +0200 + +gthumb (3:2.4.1-4) unstable; urgency=low + + * Minor build clean ups + * Move from libpng10 to libpng12 + + -- Remco van de Meent Thu, 12 Aug 2004 16:43:13 +0200 + +gthumb (3:2.4.1-3) unstable; urgency=medium + + * Some fixes in build process. + * Priority medium because of the libtiff3->4 transition + * Added debian/watch file + + -- Remco van de Meent Thu, 5 Aug 2004 11:10:45 +0200 + +gthumb (3:2.4.1-2) unstable; urgency=low + + * gthumb now depends on libtiff4 instead of libtiff3 + * Closes: #260156: addition to man page to mention --import-photos + option + + -- Remco van de Meent Thu, 29 Jul 2004 17:22:14 +0200 + +gthumb (3:2.4.1-1) unstable; urgency=low + + * New upstream release (closes: #230411) + * Add image/svg+xml to data/gthumb.applications, as gthumb can also + view SVG files (closes: #257207) + + -- Remco van de Meent Fri, 9 Jul 2004 13:22:00 +0200 + +gthumb (3:2.4.0-3) unstable; urgency=low + + * Rebuild with libexif10 + + -- Remco van de Meent Sat, 19 Jun 2004 23:30:46 +0200 + +gthumb (3:2.4.0-2) unstable; urgency=low + + * png.h could not be found on various archs. resolve by setting + CPPFLAGS before ./configure is run in debian/rules + + -- Remco van de Meent Sat, 5 Jun 2004 11:20:20 +0200 + +gthumb (3:2.4.0-1) unstable; urgency=low + + * New upstream release + * depends on shared-mime-info, not gnome-mime-data (closes: #240804) + * accented character problem fixed in upstream version (closes: + #241800) + * Put libgthumb.so in /usr/lib/gthumb instead of /usr/lib (cf. policy + manual ch. 10) + + -- Remco van de Meent Thu, 3 Jun 2004 23:41:43 +0200 + +gthumb (3:2.3.3-2) unstable; urgency=low + + * Recompile for GNOME 2.6, and add dependency on gnome-mime-data + + -- Remco van de Meent Sun, 30 May 2004 13:18:55 +0200 + +gthumb (3:2.3.3-1) unstable; urgency=low + + * New upstream release + * Fixes problem when saving images (closes: #249938) + * Upgraded to Standards Version 3.6.1 + + -- Remco van de Meent Fri, 21 May 2004 16:33:46 +0200 + +gthumb (3:2.3.2-1) unstable; urgency=low + + * New upstream release + * Quote strings in debian/menu + * Run ldconfig in post{inst,rm} + * Window layout options work in this version (closes: #234493) + * Moving multiple images works in this version (closes: #232901) + * Enable import photo feature (closes: #231943) + + -- Remco van de Meent Sun, 28 Mar 2004 15:46:23 +0200 + +gthumb (3:2.3.0-1) unstable; urgency=low + + * New upstream release + * Updated debian/copyright file with new upstream source location + * Thanks Christian Marillat for pointing out new upstream release + (closes: #229349) + * Fix French translation problem (closes: #226272) + * (Once again) reworked 02_fPIC patch + + -- Remco van de Meent Mon, 26 Jan 2004 20:42:30 +0100 + +gthumb (3:2.2.0-1) unstable; urgency=low + + * New upstream release + * Reworked -fPIC patch + + -- Remco van de Meent Mon, 29 Dec 2003 19:15:04 +0100 + +gthumb (3:2.1.9-2) unstable; urgency=low + + * Move libgthumb.so from /usr/lib/gthumb back to /usr/lib (closes: + #223559) + + -- Remco van de Meent Sat, 13 Dec 2003 11:05:45 +0100 + +gthumb (3:2.1.9-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Mon, 8 Dec 2003 20:47:45 +0100 + +gthumb (3:2.1.8-1) unstable; urgency=low + + * New upstream release + * No more depends on liblincl (closes: #217669) + * Remove patches/03_gettext.dpatch (no longer necessary) + + -- Remco van de Meent Tue, 4 Nov 2003 15:10:49 +0100 + +gthumb (3:2.1.6-1) unstable; urgency=low + + * New upstream release (closes: #214762) + * Add a few words to Description of gthumb package + + -- Remco van de Meent Fri, 10 Oct 2003 09:51:23 +0200 + +gthumb (3:2.1.5-1) unstable; urgency=low + + * Accepting all changes by Christian Marillat (closes: #158437, #205605, + #204285, #176886, #201276, #204741, #204491, #205219, #205245, #176886) + * There is no much more to say about gthumb than a one-line description + (closes: #209621) + + -- Remco van de Meent Tue, 7 Oct 2003 14:16:34 +0200 + +gthumb (3:2.1.5-0.1) unstable; urgency=low + + * New patch 03_gettext, why .mo files are installed in /usr/lib/locale and + gthumb don' want to read these files in /usr/share/locale ? + * Toolbar can be displayed or not (Closes: #158437) + + -- Christian Marillat Thu, 21 Aug 2003 13:01:16 +0200 + +gthumb (3:2.1.5-0.0) unstable; urgency=low + + * NMU + * New upstream release. + * Improve 02_fPIC patch to link against -lpng10 (Closes: #205605) + * Entries in the View menu are finally working (Closes: #204285) + + -- Christian Marillat Tue, 19 Aug 2003 16:21:47 +0200 + +gthumb (3:2.1.4-0.2) unstable; urgency=low + + * NMU + * Improve 02_fPIC patch to fix linking problems + * Fix French translation (Closes: #176886) + + -- Christian Marillat Fri, 15 Aug 2003 16:40:49 +0200 + +gthumb (3:2.1.4-0.1) unstable; urgency=low + + * NMU + * Apparently gthumb doesn't like libpng12-0-dev, then little hack to build + against libpng10-dev and change Build-Depends (patch 01_configure) + * Add scrollkeeper in Build-Depends (Closes: #205245) + * Build modules with -fPIC (patch 02_fPIC) (Closes: #205219) + * Remove broken entries in that file ? + + -- Christian Marillat Thu, 14 Aug 2003 09:40:02 +0200 + +gthumb (3:2.1.4-0.0) unstable; urgency=low + + * NMU + * New upstream release (Closes: #201276) + * Build against latest libexif-dev (Closes: #204741, #204491) + * debian/control use dh_scrollkeeper and thus remove debian/postrm and + update debian/postinst and Build-Depends on debhelper (>= 4.1.54) (Closes: #202707) + * Package upstream changelog (Closes: #147548) + * Use debian/compat + * Upgraded standards version to 3.6.0 + * Remove generated files, may be dangerous. + + -- Christian Marillat Wed, 13 Aug 2003 11:50:44 +0200 + +gthumb (3:2.1.2-2) unstable; urgency=low + + * Changed section to gnome + * Add -fPIC to {src/jpegutils,libgthumb}/Makefile.in CFLAGS (shared lib) + + -- Remco van de Meent Sat, 21 Jun 2003 21:51:03 +0200 + +gthumb (3:2.1.2-1) unstable; urgency=low + + * New upstream release + * Updated to standards version 3.5.10 + * Fix linking problems in libgthumb/Makefile.in LDFLAGS (closes: #193779) + * Fix problems with Nautilus embedding (closes: #191759) + + -- Remco van de Meent Sun, 8 Jun 2003 22:51:12 +0200 + +gthumb (3:2.1.1-2) unstable; urgency=low + + * Replace #!/bin/sh -e with the better #!/bin/sh; set -e pair + * Do not mention schema as conffile twice + + -- Remco van de Meent Fri, 21 Mar 2003 23:09:45 +0100 + +gthumb (3:2.1.1-1) unstable; urgency=low + + * New upstream release + * Upgraded standards version to 3.5.9 + * Removed config.guess and config.sub + + -- Remco van de Meent Fri, 21 Mar 2003 16:16:00 +0100 + +gthumb (3:2.1.0-1) unstable; urgency=low + + * New upstream release (closes: #174911) + * Fix (build-)dependencies (closes: #178199, #180359, #180167, #182139) + * Rename gthumb2 to gthumb, Debian GNOME policy (closes: #182813) + + -- Remco van de Meent Mon, 3 Mar 2003 10:59:38 +0100 + +gthumb2 (2.0.1-4) unstable; urgency=low + + * More fixes to overcome build problems... + + -- Remco van de Meent Fri, 7 Feb 2003 10:17:37 +0100 + +gthumb2 (2.0.1-3) unstable; urgency=low + + * More fixes in build-deps + + -- Remco van de Meent Wed, 5 Feb 2003 13:08:25 +0100 + +gthumb2 (2.0.1-2) unstable; urgency=low + + * Added build-deps (gnomeprint, makeinfo) + + -- Remco van de Meent Wed, 5 Feb 2003 11:50:59 +0100 + +gthumb2 (2.0.1-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Tue, 4 Feb 2003 10:13:22 +0100 + +gthumb2 (1.107-1) unstable; urgency=low + + * New upstream release + * Changes to debian/rules to fix some building problems. + * Fix debian/copyright to include link to GPL etc. + + -- Remco van de Meent Thu, 2 Jan 2003 09:35:57 +0000 + +gthumb2 (1.105-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Mon, 18 Nov 2002 19:32:32 +0000 + +gthumb2 (1.104-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Tue, 1 Oct 2002 13:58:25 +0000 + +gthumb2 (1.103-3) unstable; urgency=low + + * Put gthumb-image-viewer in /usr/lib/gthumb (closes: #162687) + + -- Remco van de Meent Mon, 30 Sep 2002 10:55:38 +0000 + +gthumb2 (1.103-2) unstable; urgency=low + + * Convert LC_MESSAGES UTF-8 format (closes: #157981) + * ./usr/libexec/gthumb-image-viewer -> /usr/bin/gthumb-image-viewer + (closes: #162687, #160639) + + -- Remco van de Meent Mon, 30 Sep 2002 09:24:32 +0000 + +gthumb2 (1.103-1) unstable; urgency=low + + * New upstream release + * Rebuild for newer imlib/libpng (closes: #157126) + + -- Remco van de Meent Sun, 18 Aug 2002 10:42:06 +0000 + +gthumb2 (1.102-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Tue, 16 Jul 2002 12:12:49 +0000 + +gthumb2 (1.101-4) unstable; urgency=low + + * Fixed yet another build depends problem (closes: #151447) + + -- Remco van de Meent Sun, 30 Jun 2002 16:05:34 +0000 + +gthumb2 (1.101-3) unstable; urgency=low + + * Fix build depends + * Fixed debian/dirs + + -- Remco van de Meent Sun, 30 Jun 2002 15:10:58 +0000 + +gthumb2 (1.101-2) unstable; urgency=low + + * Really fix docbook bug (closes: #149078) + + -- Remco van de Meent Sun, 23 Jun 2002 12:57:42 +0000 + +gthumb2 (1.101-1) unstable; urgency=low + + * New upstream release + * Fix menu file (closes: #149453) + * Catch possible scrollkeeper-rebuilddb error in postinst (closes: + #149078) + * Recompile to solve binary compatibility problems with libbonobo + (closes: #150563) + + -- Remco van de Meent Fri, 21 Jun 2002 18:52:41 +0000 + +gthumb2 (1.100-2) unstable; urgency=low + + * Renamed to gthumb2 + + -- Remco van de Meent Sat, 25 May 2002 18:06:42 +0000 + +gthumb (1.100-1) unstable; urgency=low + + * New upstream release + * Updated build-depends; Gnome2 compatible (closes: #147467) + + -- Remco van de Meent Mon, 20 May 2002 11:41:00 +0000 + +gthumb (0.13-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sat, 18 May 2002 20:35:49 +0200 + +gthumb (0.12-3) unstable; urgency=low + + * Added orbit build-dep + + -- Remco van de Meent Sun, 21 Apr 2002 22:42:08 +0200 + +gthumb (0.12-2) unstable; urgency=low + + * Added src dep for bison + + -- Remco van de Meent Sun, 21 Apr 2002 18:18:38 +0200 + +gthumb (0.12-1) unstable; urgency=low + + * New upstream release (closes: #142986, #119182, #112363) + + -- Remco van de Meent Mon, 15 Apr 2002 14:20:22 +0200 + +gthumb (0.9.8-1) unstable; urgency=low + + * New upstream release + * Added build-depends libgnomeprint-dev + * Upgraded to standards-version 3.5.6 + + -- Remco van de Meent Mon, 17 Dec 2001 19:53:40 +0100 + +gthumb (0.9.5-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sun, 14 Oct 2001 19:40:44 +0200 + +gthumb (0.9.4-1) unstable; urgency=low + + * New upstream release (closes: #109271) + + -- Remco van de Meent Tue, 4 Sep 2001 12:51:09 +0200 + +gthumb (0.9-1) unstable; urgency=low + + * New upstream release + * Removed build-depends on libc6-dev + + -- Remco van de Meent Mon, 9 Jul 2001 17:24:27 +0200 + +gthumb (0.8.1-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Tue, 19 Jun 2001 19:44:56 +0200 + +gthumb (0.8-2) unstable; urgency=low + + * Added build-depends for libgnome-vfs-dev (closes: #100570) + + -- Remco van de Meent Tue, 12 Jun 2001 11:55:40 +0200 + +gthumb (0.8-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sun, 10 Jun 2001 20:18:15 +0200 + +gthumb (0.7.2-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sat, 2 Jun 2001 15:04:22 +0200 + +gthumb (0.7.1-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sat, 19 May 2001 22:26:09 +0200 + +gthumb (0.7-2) unstable; urgency=low + + * Added build-depends for gettext (closes: #97843) + + -- Remco van de Meent Thu, 17 May 2001 22:27:19 +0200 + +gthumb (0.7-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sat, 12 May 2001 23:57:31 +0200 + +gthumb (0.6.4-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Sun, 29 Apr 2001 18:53:46 +0200 + +gthumb (0.6-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Mon, 23 Apr 2001 23:08:08 +0200 + +gthumb (0.5.1-2) unstable; urgency=low + + * Fixed build-depends (closes: #94583) + * Added manual page gthumb.1 (closes: #92599) + + -- Remco van de Meent Fri, 20 Apr 2001 09:42:38 +0200 + +gthumb (0.5.1-1) unstable; urgency=low + + * New upstream release + + -- Remco van de Meent Wed, 18 Apr 2001 22:36:52 +0200 + +gthumb (0.4-1) unstable; urgency=low + + * New upstream release + * Added menu entry (closes: #92600) + + -- Remco van de Meent Sat, 7 Apr 2001 19:55:47 +0200 + +gthumb (0.3-1) unstable; urgency=low + + * New upstream release + * Added build-depends for libglade-gnome0-dev (closes: #92567) + + -- Remco van de Meent Mon, 2 Apr 2001 16:08:34 +0200 + +gthumb (0.2-1) unstable; urgency=low + + * Initial Release (closes: #91926) + + -- Remco van de Meent Tue, 27 Mar 2001 21:36:31 +0200 + +Local variables: +mode: debian-changelog +End: --- gthumb-2.10.11.orig/debian/gthumb.mime +++ gthumb-2.10.11/debian/gthumb.mime @@ -0,0 +1,3 @@ +image/jpeg; gthumb '%s'; test=test -n "$DISPLAY" +image/gif; gthumb '%s'; test=test -n "$DISPLAY" +image/png; gthumb '%s'; test=test -n "$DISPLAY" --- gthumb-2.10.11.orig/debian/gthumb.lintian-overrides +++ gthumb-2.10.11/debian/gthumb.lintian-overrides @@ -0,0 +1,2 @@ +# This is on gthumb-data, which we are depending on +gthumb: menu-icon-missing /usr/share/pixmaps/gthumb.xpm --- gthumb-2.10.11.orig/debian/watch +++ gthumb-2.10.11/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/gthumb/2.10/gthumb-([\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian uupdate --- gthumb-2.10.11.orig/debian/gthumb.xpm +++ gthumb-2.10.11/debian/gthumb.xpm @@ -0,0 +1,374 @@ +/* XPM */ +static char * gthumb_xpm[] = { +"32 32 339 2", +" c None", +". c #919191", +"+ c #C5C5C5", +"@ c #C1C1C1", +"# c #2F2F2F", +"$ c #B4B4B4", +"% c #FFFFFF", +"& c #FEFEFE", +"* c #FDFDFD", +"= c #EDEDED", +"- c #2E2E2E", +"; c #FCFCFC", +"> c #ECECEC", +", c #2C2C2C", +"' c #F6F6F6", +") c #C7C7C7", +"! c #C6C6C6", +"~ c #C4C4C4", +"{ c #C3C3C3", +"] c #E1E1E1", +"^ c #2B2B2B", +"/ c #E5E5E5", +"( c #4B4F4B", +"_ c #717670", +": c #5A5C4D", +"< c #3E3E30", +"[ c #413F31", +"} c #434134", +"| c #52503D", +"1 c #545344", +"2 c #44453A", +"3 c #494B3E", +"4 c #5F6257", +"5 c #6E7067", +"6 c #9A9B99", +"7 c #E6E6E6", +"8 c #505650", +"9 c #8D958B", +"0 c #5A5C4A", +"a c #3F3C22", +"b c #37341C", +"c c #544E31", +"d c #858164", +"e c #757158", +"f c #5A5842", +"g c #66634E", +"h c #737968", +"i c #626756", +"j c #8C8C8A", +"k c #B0B0B0", +"l c #3D3F3D", +"m c #727471", +"n c #404034", +"o c #322F1C", +"p c #242315", +"q c #48442D", +"r c #878269", +"s c #7C755C", +"t c #695C45", +"u c #B39D8A", +"v c #626659", +"w c #3C3F33", +"x c #898988", +"y c #555555", +"z c #8A8A8A", +"A c #B1B1B1", +"B c #EBEBEB", +"C c #393A38", +"D c #151611", +"E c #14140E", +"F c #1E1F13", +"G c #67624B", +"H c #8B7F6B", +"I c #705A43", +"J c #DACDC3", +"K c #959690", +"L c #2D3024", +"M c #878886", +"N c #626262", +"O c #999999", +"P c #CACACA", +"Q c #DDDDDD", +"R c #F2F2F2", +"S c #F9F9F9", +"T c #F8F8F8", +"U c #F4F4F4", +"V c #737370", +"W c #4F4D3E", +"X c #574E34", +"Y c #665F46", +"Z c #897464", +"` c #A27E65", +" . c #936C50", +".. c #CCB9AA", +"+. c #CFCBC6", +"@. c #55574B", +"#. c #8A8A89", +"$. c #7C7C7C", +"%. c #A8A8A8", +"&. c #DCDCDC", +"*. c #FAFAFA", +"=. c #F7F7F7", +"-. c #A9A9A8", +";. c #514B27", +">. c #9A8832", +",. c #B59F37", +"'. c #BFA83D", +"). c #C4AD42", +"!. c #CCB54B", +"~. c #CFB750", +"{. c #D6C060", +"]. c #E4D276", +"^. c #99978F", +"/. c #4E4E4E", +"(. c #939393", +"_. c #DBDBDB", +":. c #F1F1F1", +"<. c #FBFBFB", +"[. c #EAEAEA", +"}. c #C0C0C0", +"|. c #D3D3D3", +"1. c #4D503E", +"2. c #707238", +"3. c #888A42", +"4. c #9A994D", +"5. c #9E9C4B", +"6. c #9F9A45", +"7. c #A29D47", +"8. c #A9A34D", +"9. c #A9A242", +"0. c #929289", +"a. c #D2D2D2", +"b. c #CCCCCC", +"c. c #AEB0B0", +"d. c #848A8F", +"e. c #646E77", +"f. c #6B7783", +"g. c #7B8188", +"h. c #666965", +"i. c #344A2E", +"j. c #47603D", +"k. c #72815E", +"l. c #848C67", +"m. c #79845B", +"n. c #949D7B", +"o. c #B8BBA6", +"p. c #919B6C", +"q. c #90918D", +"r. c #F0F0F0", +"s. c #9E9E9D", +"t. c #807E7D", +"u. c #575859", +"v. c #393B3C", +"w. c #394046", +"x. c #586673", +"y. c #859EB4", +"z. c #697684", +"A. c #969696", +"B. c #9CA09B", +"C. c #B8BBB6", +"D. c #BEC0BB", +"E. c #BBBEB8", +"F. c #C1C3BF", +"G. c #C8C9C7", +"H. c #BEC2BC", +"I. c #D7D7D7", +"J. c #888888", +"K. c #E3E3E3", +"L. c #B8B8B8", +"M. c #9A9A9A", +"N. c #7B797A", +"O. c #817D7B", +"P. c #766E6B", +"Q. c #867E7A", +"R. c #AEB9C5", +"S. c #ADC1D4", +"T. c #ADBED1", +"U. c #9AAABB", +"V. c #5C6169", +"W. c #54555A", +"X. c #B0B0B1", +"Y. c #6C6C6C", +"Z. c #F5F5F5", +"`. c #E7E7E7", +" + c #4A4A4A", +".+ c #F3F3F3", +"++ c #9E9E9E", +"@+ c #787D85", +"#+ c #A2A5AD", +"$+ c #B8BBC5", +"%+ c #707175", +"&+ c #96979D", +"*+ c #EEE7E6", +"=+ c #F3F5F7", +"-+ c #FAFBFC", +";+ c #F5F7F9", +">+ c #E4E9EF", +",+ c #C0C7D2", +"'+ c #737986", +")+ c #E0E0E0", +"!+ c #B2B2B2", +"~+ c #E9E9E9", +"{+ c #CBCBCB", +"]+ c #C9C9C9", +"^+ c #787E89", +"/+ c #B4BCCC", +"(+ c #768291", +"_+ c #7A7D87", +":+ c #EEEDEF", +"<+ c #FDFDFE", +"[+ c #F9F9FA", +"}+ c #F3F3F5", +"|+ c #EFEFF2", +"1+ c #E2DCDC", +"2+ c #D0C0BE", +"3+ c #585454", +"4+ c #A1A1A1", +"5+ c #8B8B8B", +"6+ c #7F7F7F", +"7+ c #BEBEBE", +"8+ c #252525", +"9+ c #989898", +"0+ c #EAEAE9", +"a+ c #636A73", +"b+ c #9CABC2", +"c+ c #60646E", +"d+ c #B7B4BB", +"e+ c #FDFCFC", +"f+ c #FBF9F8", +"g+ c #FBF7F4", +"h+ c #F6F1EF", +"i+ c #C1C1C5", +"j+ c #86919F", +"k+ c #4A5B6B", +"l+ c #5A5A5A", +"m+ c #343434", +"n+ c #363636", +"o+ c #6B6B6B", +"p+ c #85868A", +"q+ c #9594A3", +"r+ c #5B5453", +"s+ c #F0E8E4", +"t+ c #F8F8F6", +"u+ c #EDEEED", +"v+ c #D3D9E0", +"w+ c #A5B8C8", +"x+ c #4E7591", +"y+ c #436C87", +"z+ c #315264", +"A+ c #1B2125", +"B+ c #CDCDCD", +"C+ c #414141", +"D+ c #AEACAC", +"E+ c #A18D8A", +"F+ c #4F4945", +"G+ c #EEE8E3", +"H+ c #F4F6F7", +"I+ c #ECEEEF", +"J+ c #E1E3E8", +"K+ c #D4DAE1", +"L+ c #A0B6C4", +"M+ c #668CA3", +"N+ c #40677B", +"O+ c #2A4A59", +"P+ c #2D3D46", +"Q+ c #1A1E20", +"R+ c #686868", +"S+ c #D0D0D0", +"T+ c #505963", +"U+ c #25323B", +"V+ c #7A90A1", +"W+ c #A9BAC6", +"X+ c #B3C3CE", +"Y+ c #9DB2BF", +"Z+ c #728B9C", +"`+ c #577080", +" @ c #697882", +".@ c #929598", +"+@ c #C6C6C7", +"@@ c #E4E4E4", +"#@ c #5D5D5D", +"$@ c #A3A3A3", +"%@ c #7D7D7D", +"&@ c #5B6166", +"*@ c #21323C", +"=@ c #3B596C", +"-@ c #3E5E73", +";@ c #4D6473", +">@ c #7E8890", +",@ c #A8AFB4", +"'@ c #CFD1D3", +")@ c #BFBFBF", +"!@ c #606060", +"~@ c #DADADA", +"{@ c #D4D4D4", +"]@ c #161616", +"^@ c #333333", +"/@ c #959595", +"(@ c #373F45", +"_@ c #292B2D", +":@ c #A9ABAB", +"<@ c #5B5B5B", +"[@ c #C2C2C2", +"}@ c #D9D9D9", +"|@ c #A2A2A2", +"1@ c #5C5C5C", +"2@ c #6F6F6F", +"3@ c #676767", +"4@ c #0F0F0F", +"5@ c #3F3F3F", +"6@ c #464646", +"7@ c #303030", +"8@ c #8C8C8C", +"9@ c #D6D6D6", +"0@ c #A4A4A4", +"a@ c #454545", +"b@ c #9F9F9F", +"c@ c #6E6E6E", +"d@ c #131313", +"e@ c #0D0D0D", +"f@ c #030303", +"g@ c #090909", +"h@ c #000000", +"i@ c #C8C8C8", +"j@ c #2A2A2A", +"k@ c #0C0C0C", +"l@ c #010101", +"m@ c #141414", +"n@ c #ABABAB", +"o@ c #707070", +"p@ c #0B0B0B", +"q@ c #3B3B3B", +"r@ c #191919", +"s@ c #373737", +"t@ c #151515", +"u@ c #383838", +"v@ c #181818", +"w@ c #0A0A0A", +"x@ c #0E0E0E", +" ", +" . + + + + + + + + + + + + + + @ # ", +" $ % % % % % % % % % % % & & * = - ", +" $ % % % % % % % % % % % & * ; > , ", +" $ ' ) ) ) ! ! ! + + ~ ~ { { ] = ^ ", +" $ / ( _ : < [ } | 1 2 3 4 5 6 = ^ ", +" $ 7 8 9 0 a b c d e f g h i j = ^ ", +" k ) l m n o p q r s t u v w x = ^ ", +" y z A B B C D E F G H I J K L M > ^ ", +" N O P Q R S T U V W X Y Z ` ...+.@.#.> ^ ", +" $.%.&.S ; *.S T T =.' -.;.>.,.'.).!.~.{.].^.> ^ ", +" /.(.@ _.:.& * <.<.*.S ' [.}.|.P 1.2.3.4.5.6.7.8.9.0.> ^ ", +" a.% % & * * ; T = b.c.d.e.f.g.B h.i.j.k.l.m.n.o.p.q.B ^ ", +" @ % % & ; r.|.s.t.u.v.w.x.y.z.[.A.h.B.C.D.E.F.G.H.I.[.^ ", +" J.; K.L.M.N.O.P.Q.R.S.T.U.V.W.X.|.Y.! :.S T =.' Z.U `.^ ", +" +.+++@+#+$+%+&+*+=+-+;+>+,+'+N )+Y.!+~+=.=.=.Z.Z.U 7 ^ ", +" {+]+^+/+(+_+:+& <+[+}+|+1+2+3+4+5+6+L.P b.{+{+P P 7+8+ ", +" 9+0+a+b+c+d+& & e+f+g+h+i+j+k+l+%.^ , m+n+n+n+n+n+m+ ", +" o+= p+q+r+s+& e+t+u+v+w+x+y+z+A+B+C+ ", +" a.D+E+F+G+H+I+J+K+L+M+N+O+P+Q+Q R+ ", +" k S+T+U+V+W+X+Y+Z+`+ @.@+@@@#@_.$@ ", +" %@~+&@*@=@-@;@>@,@'@~+' ' )@!@~@{@]@ ", +" ^@> /@(@_@:@/ =.=.' ' U 7 <@J.) $ # ", +" [@}@|@1@2@K.U U .+R &.3@4@5@6@7@ ", +" 8@Z.9@0@Y.a@J.b@9+c@d@e@f@g@h@ ", +" 3@[.~+i@/@o+j@k@l@l@h@h@f@- m@h@ ", +" n@0@o@j@p@h@h@h@ h@q@r@h@ ", +" s@t@ p@# d@h@ ", +" h@u@v@h@ ", +" w@x@ ", +" ", +" "}; --- gthumb-2.10.11.orig/debian/copyright +++ gthumb-2.10.11/debian/copyright @@ -0,0 +1,435 @@ +The source code was downloaded from ftp://ftp.gnome.org/pub/gnome/sources/gthumb/ + +Files: debian/* +Copyright: © 2008, David Paleino + © 2001-2007, Remco van de Meent +License: GPL-3+ + This program is free software: you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation, either version 3 + of the License, or (at your option) any later version. + +Files: * +Copyright: © 2001-2006, The Free Software Foundation, Inc. +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + +Files: libgthumb/gconf-utils.{c,h} +Copyright: © 2001-2002, The Free Software Foundation, Inc. + © 2000-2001, Eazel, Inc. +License: GPL-2+, LGPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + --- + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + +Files: libgthumb/pixbuf-utils.c +Copyright: © 1999-2003, The Free Software Foundation, Inc. + © 1999, Michael Zucchi + © 1999, Red Hat, Inc. + © 1995, Spencer Kimball and Peter Mattis +License: GPL-2+, LGPL-2+ + +Files: src/gtkcellrendererthreestates.{c,h} +Copyright: © 2001, The Free Software Foundation, Inc. + © 2000, Red Hat, Inc. - Jonathan Blandford +License: GPL-2+, LGPL-2+ + +Files: libgthumb/md5.{c,h} +Copyright: © 1995, Software Foundation, Inc. +License: GPL-2+ + +Files: src/albumtheme.c +Copyright: © 1984, 1989, 1990, 2000-2006, The Free Software Foundation, Inc. +License: GPL-2+ + +Files: libgthumb/eel-canvas-rect.{c,h} +Copyright: © 2002, Alexander Larsson +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + +Files: libgthumb/jpegutils/jpeg-marker.{c,h} + libgthumb/jpegutils/jpeg-data.{c,h} +Copyright: © 2001, Lutz Müller +License: LGPL-2+ + +Files: src/totem-scrsaver.{c,h} +Copyright: © 2004, 2005, Bastien Nocera +License: LGPL-2+ + +Files: doc/C/gthumb.xml +Copyright: © 2001-2004, 2006, Paolo Bacchilega +License: GFDL-1.1+ + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + +Files: doc/es/gthumb.xml +Copyright: © 2007, Jorge González + © 2001-2004, 2006, Paolo Bacchilega +License: GFDL-1.1+ + +Files: doc/fr/gthumb.xml +Copyright: © 2007, Bruno Brouard + © 2007, Claude Paroz + © 2001-2004, 2006, Paolo Bacchilega +License: GFDL-1.1+ + +Files: doc/sv/gthumb.xml +Copyright: © 2006-2007, Daniel Nylander + © 2001-2004, 2006, Paolo Bacchilega +License: GFDL-1.1+ + +On Debian systems, you can find the mentioned licenses: +GPLv2 - `/usr/share/common-licenses/GPL-2' +GPLv3 - `/usr/share/common-licenses/GPL-3' +LGPLv2 - `/usr/share/common-licenses/LGPL-2' + +GFDLv1.1: + + GNU Free Documentation License + Version 1.1, March 2000 + + + Copyright (C) 2000 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or other + written document "free" in the sense of freedom: to assure everyone + the effective freedom to copy and redistribute it, with or without + modifying it, either commercially or noncommercially. Secondarily, + this License preserves for the author and publisher a way to get + credit for their work, while not being considered responsible for + modifications made by others. + + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. It + complements the GNU General Public License, which is a copyleft + license designed for free software. + + We have designed this License in order to use it for manuals for free + software, because free software needs free documentation: a free + program should come with manuals providing the same freedoms that the + software does. But this License is not limited to software manuals; it + can be used for any textual work, regardless of subject matter or + whether it is published as a printed book. We recommend this License + principally for works whose purpose is instruction or reference. + + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work that contains a + notice placed by the copyright holder saying it can be distributed + under the terms of this License. The "Document", below, refers to any + such manual or work. Any member of the public is a licensee, and is + addressed as "you". + + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + + A "Secondary Section" is a named appendix or a front-matter section of + the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall subject + (or to related matters) and contains nothing that could fall directly + within that overall subject. (For example, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of legal, + commercial, philosophical, ethical or political position regarding them. + + The "Invariant Sections" are certain Secondary Sections whose titles are + designated, as being those of Invariant Sections, in the notice that says + that the Document is released under this License. + + The "Cover Texts" are certain short passages of text that are listed, as + Front-Cover Texts or Back-Cover Texts, in the notice that says that the + Document is released under this License. + + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the general + public, whose contents can be viewed and edited directly and + straightforwardly with generic text editors or (for images composed of + pixels) generic paint programs or (for drawings) some widely available + drawing editor, and that is suitable for input to text formatters or for + automatic translation to a variety of formats suitable for input to text + formatters. A copy made in an otherwise Transparent file format whose + markup has been designed to thwart or discourage subsequent modification + by readers is not Transparent. A copy that is not "Transparent" is + called "Opaque". + + Examples of suitable formats for Transparent copies include plain ASCII + without markup, Texinfo input format, LaTeX input format, SGML or XML + using a publicly available DTD, and standard-conforming simple HTML + designed for human modification. Opaque formats include PostScript, + PDF, proprietary formats that can be read and edited only by proprietary + word processors, SGML or XML for which the DTD and/or processing tools + are not generally available, and the machine-generated HTML produced by + some word processors for output purposes only. + + The "Title Page" means, for a printed book, the title page itself, plus + such following pages as are needed to hold, legibly, the material this + License requires to appear in the title page. For works in formats which + do not have any title page as such, "Title Page" means the text near the + most prominent appearance of the work's title, preceding the beginning of + the body of the text. + + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either commercially + or noncommercially, provided that this License, the copyright notices, and + the license notice saying this License applies to the Document are reproduced + in all copies, and that you add no other conditions whatsoever to those of + this License. You may not use technical measures to obstruct or control the + reading or further copying of the copies you make or distribute. However, you + may accept compensation in exchange for copies. If you distribute a large + enough number of copies you must also follow the conditions in section 3. + + You may also lend copies, under the same conditions stated above, and you may + publicly display copies. + + + 3. COPYING IN QUANTITY + + If you publish printed copies of the Document numbering more than 100, and the + Document's license notice requires Cover Texts, you must enclose the copies in + covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts + on the front cover, and Back-Cover Texts on the back cover. Both covers must also + clearly and legibly identify you as the publisher of these copies. The front cover + must present the full title with all words of the title equally prominent and + visible. You may add other material on the covers in addition. Copying with + changes limited to the covers, as long as they preserve the title of the Document + and satisfy these conditions, can be treated as verbatim copying in other respects. + + If the required texts for either cover are too voluminous to fit legibly, you + should put the first ones listed (as many as fit reasonably) on the actual cover, + and continue the rest onto adjacent pages. + + If you publish or distribute Opaque copies of the Document numbering more than 100, + you must either include a machine-readable Transparent copy along with each Opaque + copy, or state in or with each Opaque copy a publicly-accessible computer-network + location containing a complete Transparent copy of the Document, free of added + material, which the general network-using public has access to download anonymously + at no charge using public-standard network protocols. If you use the latter option, + you must take reasonably prudent steps, when you begin distribution of Opaque + copies in quantity, to ensure that this Transparent copy will remain thus + accessible at the stated location until at least one year after the last time you + distribute an Opaque copy (directly or through your agents or retailers) of that + edition to the public. + + It is requested, but not required, that you contact the authors of the Document + well before redistributing any large number of copies, to give them a chance to + provide you with an updated version of the Document. + + + 4. MODIFICATIONS + + You may copy and distribute a Modified Version of the Document under the conditions + of sections 2 and 3 above, provided that you release the Modified Version under + precisely this License, with the Modified Version filling the role of the Document, + thus licensing distribution and modification of the Modified Version to whoever + possesses a copy of it. In addition, you must do these things in the Modified Version: + + * A. Use in the Title Page (and on the covers, if any) a title distinct from that + of the Document, and from those of previous versions (which should, if there + were any, be listed in the History section of the Document). You may use the + same title as a previous version if the original publisher of that version + gives permission. + * B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified Version, + together with at least five of the principal authors of the Document (all of + its principal authors, if it has less than five). + * C. State on the Title page the name of the publisher of the Modified Version, + as the publisher. + * D. Preserve all the copyright notices of the Document. + * E. Add an appropriate copyright notice for your modifications adjacent to the + other copyright notices. + * F. Include, immediately after the copyright notices, a license notice giving + the public permission to use the Modified Version under the terms of this + License, in the form shown in the Addendum below. + * G. Preserve in that license notice the full lists of Invariant Sections and + required Cover Texts given in the Document's license notice. + * H. Include an unaltered copy of this License. + * I. Preserve the section entitled "History", and its title, and add to it an + item stating at least the title, year, new authors, and publisher of the + Modified Version as given on the Title Page. If there is no section + entitled "History" in the Document, create one stating the title, year, + authors, and publisher of the Document as given on its Title Page, then + add an item describing the Modified Version as stated in the previous + sentence. + * J. Preserve the network location, if any, given in the Document for public + access to a Transparent copy of the Document, and likewise the network + locations given in the Document for previous versions it was based on. + These may be placed in the "History" section. You may omit a network + location for a work that was published at least four years before the + Document itself, or if the original publisher of the version it refers + to gives permission. + * K. In any section entitled "Acknowledgements" or "Dedications", preserve + the section's title, and preserve in the section all the substance and + tone of each of the contributor acknowledgements and/or dedications given + therein. + * L. Preserve all the Invariant Sections of the Document, unaltered in their + text and in their titles. Section numbers or the equivalent are not + considered part of the section titles. + * M. Delete any section entitled "Endorsements". Such a section may not be + included in the Modified Version. + * N. Do not retitle any existing section as "Endorsements" or to conflict in + title with any Invariant Section. + + If the Modified Version includes new front-matter sections or appendices that + qualify as Secondary Sections and contain no material copied from the Document, + you may at your option designate some or all of these sections as invariant. To + do this, add their titles to the list of Invariant Sections in the Modified + Version's license notice. These titles must be distinct from any other section + titles. + + You may add a section entitled "Endorsements", provided it contains nothing but + endorsements of your Modified Version by various parties--for example, statements + of peer review or that the text has been approved by an organization as the + authoritative definition of a standard. + + You may add a passage of up to five words as a Front-Cover Text, and a passage of + up to 25 words as a Back-Cover Text, to the end of the list of Cover Texts in the + Modified Version. Only one passage of Front-Cover Text and one of Back-Cover Text + may be added by (or through arrangements made by) any one entity. If the Document + already includes a cover text for the same cover, previously added by you or by + arrangement made by the same entity you are acting on behalf of, you may not add + another; but you may replace the old one, on explicit permission from the previous + publisher that added the old one. + + The author(s) and publisher(s) of the Document do not by this License give permission + to use their names for publicity for or to assert or imply endorsement of any + Modified Version. + + + 5. COMBINING DOCUMENTS + + You may combine the Document with other documents released under this License, under + the terms defined in section 4 above for modified versions, provided that you include + in the combination all of the Invariant Sections of all of the original documents, + unmodified, and list them all as Invariant Sections of your combined work in its + license notice. + + The combined work need only contain one copy of this License, and multiple identical + Invariant Sections may be replaced with a single copy. If there are multiple Invariant + Sections with the same name but different contents, make the title of each such section + unique by adding at the end of it, in parentheses, the name of the original author or + publisher of that section if known, or else a unique number. Make the same adjustment + to the section titles in the list of Invariant Sections in the license notice of the + combined work. + + In the combination, you must combine any sections entitled "History" in the various + original documents, forming one section entitled "History"; likewise combine any + sections entitled "Acknowledgements", and any sections entitled "Dedications". You + must delete all sections entitled "Endorsements." + + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other documents released + under this License, and replace the individual copies of this License in the various + documents with a single copy that is included in the collection, provided that you + follow the rules of this License for verbatim copying of each of the documents in all + other respects. + + You may extract a single document from such a collection, and distribute it individually + under this License, provided you insert a copy of this License into the extracted + document, and follow this License in all other respects regarding verbatim copying + of that document. + + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with other separate and independent + documents or works, in or on a volume of a storage or distribution medium, does not + as a whole count as a Modified Version of the Document, provided no compilation + copyright is claimed for the compilation. Such a compilation is called an "aggregate", + and this License does not apply to the other self-contained works thus compiled with + the Document, on account of their being thus compiled, if they are not themselves + derivative works of the Document. + + If the Cover Text requirement of section 3 is applicable to these copies of the + Document, then if the Document is less than one quarter of the entire aggregate, + the Document's Cover Texts may be placed on covers that surround only the Document + within the aggregate. Otherwise they must appear on covers around the whole aggregate. + + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may distribute translations + of the Document under the terms of section 4. Replacing Invariant Sections with + translations requires special permission from their copyright holders, but you may + include translations of some or all Invariant Sections in addition to the original + versions of these Invariant Sections. You may include a translation of this License + provided that you also include the original English version of this License. In case + of a disagreement between the translation and the original English version of this + License, the original English version will prevail. + + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document except as expressly + provided for under this License. Any other attempt to copy, modify, sublicense or + distribute the Document is void, and will automatically terminate your rights under + this License. However, parties who have received copies, or rights, from you under + this License will not have their licenses terminated so long as such parties remain + in full compliance. + + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software Foundation may publish new, revised versions of the GNU Free + Documentation License from time to time. Such new versions will be similar in + spirit to the present version, but may differ in detail to address new problems + or concerns. See http://www.gnu.org/copyleft/. + + Each version of the License is given a distinguishing version number. If the + Document specifies that a particular numbered version of this License "or any later + version" applies to it, you have the option of following the terms and conditions + either of that specified version or of any later version that has been published + (not as a draft) by the Free Software Foundation. If the Document does not specify + a version number of this License, you may choose any version ever published (not + as a draft) by the Free Software Foundation. + + + How to use this License for your documents + + To use this License in a document you have written, include a copy of the License + in the document and put the following copyright and license notices just after the + title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + + If you have no Invariant Sections, write "with no Invariant Sections" instead of + saying which ones are invariant. If you have no Front-Cover Texts, write "no + Front-Cover Texts" instead of "Front-Cover Texts being LIST"; likewise for + Back-Cover Texts. + + If your document contains nontrivial examples of program code, we recommend + releasing these examples in parallel under your choice of free software license, + such as the GNU General Public License, to permit their use in free software. --- gthumb-2.10.11.orig/debian/gthumb.install +++ gthumb-2.10.11/debian/gthumb.install @@ -0,0 +1,5 @@ +usr/bin/* +usr/lib/bonobo +usr/lib/gthumb +usr/share/applications +usr/share/man --- gthumb-2.10.11.orig/debian/compat +++ gthumb-2.10.11/debian/compat @@ -0,0 +1 @@ +7 --- gthumb-2.10.11.orig/debian/README.source +++ gthumb-2.10.11/debian/README.source @@ -0,0 +1,11 @@ +gthumb for Debian +----------------- + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To read how to properly use quilt, please refer to the official documentation +available at /usr/share/doc/quilt/README.source + + -- David Paleino Sat, 21 Feb 2009 15:33:50 +0100 --- gthumb-2.10.11.orig/debian/gthumb-data.install +++ gthumb-2.10.11/debian/gthumb-data.install @@ -0,0 +1,7 @@ +usr/share/omf +usr/share/gnome +usr/share/icons +usr/share/gthumb +usr/share/locale +usr/share/gconf +../gthumb.xpm usr/share/pixmaps/ --- gthumb-2.10.11.orig/debian/gthumb.menu +++ gthumb-2.10.11/debian/gthumb.menu @@ -0,0 +1,3 @@ +?package(gthumb):needs="X11" section="Applications/Viewers" \ + title="gThumb Image Viewer" command="/usr/bin/gthumb" hints="Images" \ + icon="/usr/share/pixmaps/gthumb.xpm" --- gthumb-2.10.11.orig/debian/control +++ gthumb-2.10.11/debian/control @@ -0,0 +1,73 @@ +Source: gthumb +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: David Paleino +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7), + intltool, + libexif-dev (>= 0.6.13), + flex, + libtiff4-dev, + libpng12-dev, + libjpeg62-dev, + libgnomeprintui2.2-dev, + gconf2, + libbonoboui2-0, + libgnomeui-dev (>= 2.6.0), + scrollkeeper, + libgphoto2-2-dev, + automake, + autoconf, + quilt, + libtool, + gnome-doc-utils, + libgtk2.0-dev (>= 2.10.0), + libxml2-dev (>= 2.4.0), + libglib2.0-dev (>= 2.6.0), + libcairo2-dev, + libltdl3-dev, + libiptcdata0-dev, + libglade2-dev (>= 2.4.0), + liblaunchpad-integration-dev (>= 0.1.17), + libxrender-dev +Standards-Version: 3.8.1 +Homepage: http://gthumb.sourceforge.net +Vcs-Git: git://git.debian.org/git/collab-maint/gthumb.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/gthumb.git + +Package: gthumb +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gthumb-data (= ${source:Version}) +Recommends: gvfs-bin +Conflicts: gthumb2 +Provides: gthumb2 +Replaces: gthumb2 +Description: an image viewer and browser + gThumb is an advanced image viewer and browser. It has many useful + features, such as filesystem browsing, slide show, image catalogs, web + album creation, camera import, image CD burning, batch file operations and + quick image editing features like transformation and color manipulation. + . + It's designed for GNOME 2 desktop environment and uses its platform. For + camera import feature, the gPhoto2 library is used. + +Package: gthumb-data +Architecture: all +Conflicts: gthumb (<< 3:2.10.8-1) +Replaces: gthumb (<< 3:2.10.8-1) +Recommends: yelp +Depends: ${misc:Depends}, + scrollkeeper +Description: an image viewer and browser - arch-independent files + gThumb is an advanced image viewer and browser. It has many useful + features, such as filesystem browsing, slide show, image catalogs, web + album creation, camera import, image CD burning, batch file operations and + quick image editing features like transformation and color manipulation. + . + It's designed for GNOME 2 desktop environment and uses its platform. For + camera import feature, the gPhoto2 library is used. + . + This package contains the architecture-independent files needed by gthumb. --- gthumb-2.10.11.orig/debian/htaccess.tmpl +++ gthumb-2.10.11/debian/htaccess.tmpl @@ -0,0 +1 @@ +AddType "text/html; charset=@CHARSET@" html --- gthumb-2.10.11.orig/debian/patches/07-fix_zooms.patch +++ gthumb-2.10.11/debian/patches/07-fix_zooms.patch @@ -0,0 +1,47 @@ +Fix zoom to "fit always", not only "if larger" +http://bugzilla.gnome.org/show_bug.cgi?id=572683 +--- gthumb.orig/src/gth-window-actions-entries.h ++++ gthumb/src/gth-window-actions-entries.h +@@ -214,12 +214,12 @@ + { "View_ZoomFit", GTK_STOCK_ZOOM_FIT, + N_("Fit"), "", + N_("Zoom to fit window"), +- G_CALLBACK (gth_window_activate_action_view_zoom_fit_if_larger) }, ++ G_CALLBACK (gth_window_activate_action_view_zoom_fit) }, + + { "View_ZoomWidth", GTHUMB_STOCK_ZOOM_WIDTH, + N_("Width"), "", + N_("Zoom to fit width"), +- G_CALLBACK (gth_window_activate_action_view_zoom_to_width) }, ++ G_CALLBACK (gth_window_activate_action_view_zoom_to_width_always) }, + + { "View_StepAnimation", NULL, + N_("Step A_nimation"), "", +--- gthumb.orig/src/gth-window-actions-callbacks.c ++++ gthumb/src/gth-window-actions-callbacks.c +@@ -591,6 +591,15 @@ + + + void ++gth_window_activate_action_view_zoom_to_width_always (GtkAction *action, ++ gpointer data) ++{ ++ GthWindow *window = GTH_WINDOW (data); ++ image_viewer_set_fit_mode (gth_window_get_image_viewer (window), GTH_FIT_WIDTH); ++} ++ ++ ++void + gth_window_activate_action_view_zoom_out (GtkAction *action, + gpointer data) + { +--- gthumb.orig/src/gth-window-actions-callbacks.h ++++ gthumb/src/gth-window-actions-callbacks.h +@@ -63,6 +63,7 @@ + DEFINE_ACTION(gth_window_activate_action_view_zoom_fit) + DEFINE_ACTION(gth_window_activate_action_view_zoom_fit_if_larger) + DEFINE_ACTION(gth_window_activate_action_view_zoom_to_width) ++DEFINE_ACTION(gth_window_activate_action_view_zoom_to_width_always) + DEFINE_ACTION(gth_window_activate_action_view_fullscreen) + DEFINE_ACTION(gth_window_activate_action_view_exit_fullscreen) + DEFINE_ACTION(gth_window_activate_action_wallpaper_centered) --- gthumb-2.10.11.orig/debian/patches/05-fix_locales.patch +++ gthumb-2.10.11/debian/patches/05-fix_locales.patch @@ -0,0 +1,28 @@ +Fix some wrong localizations reported by users +--- + po/de.po | 2 +- + po/ru.po | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- gthumb.orig/po/ru.po ++++ gthumb/po/ru.po +@@ -2039,7 +2039,7 @@ msgstr "строк на страницу + + #: ../data/gthumb.desktop.in.h:1 + msgid "Image Viewer" +-msgstr "Просмотр изображений" ++msgstr "Просмотр изображений gThumb" + + #: ../data/gthumb.desktop.in.h:2 ../src/main.c:714 + msgid "View and organize your images" +--- gthumb.orig/po/de.po ++++ gthumb/po/de.po +@@ -2860,7 +2860,7 @@ msgstr "_Gehe zu" + #: ../src/gth-browser-actions-entries.h:495 + #: ../src/gth-viewer-actions-entries.h:40 + msgid "_Image" +-msgstr "_Bild" ++msgstr "B_ild" + + #: ../src/gth-browser-actions-entries.h:47 + msgid "_Bookmarks" --- gthumb-2.10.11.orig/debian/patches/03-libgthumb_moduledir.patch +++ gthumb-2.10.11/debian/patches/03-libgthumb_moduledir.patch @@ -0,0 +1,12 @@ +Fix libdir, since libgthumb.so is in /usr/lib/gthumb/ already +--- gthumb-2.10.7.orig/libgthumb/Makefile.am ++++ gthumb-2.10.7/libgthumb/Makefile.am +@@ -12,7 +12,7 @@ + INCLUDES = \ + $(EXIF_CFLAGS) \ + $(GTHUMB_CFLAGS) \ +- -DGTHUMB_MODULEDIR=\""$(libdir)/gthumb/modules"\" \ ++ -DGTHUMB_MODULEDIR=\""$(libdir)/modules"\" \ + -DGTHUMB_GLADEDIR=\""$(gladedir)"\" \ + $(LIBOPENRAW_CFLAGS) \ + $(DISABLE_DEPRECATED) --- gthumb-2.10.11.orig/debian/patches/04-fix-gvfs-umount.patch +++ gthumb-2.10.11/debian/patches/04-fix-gvfs-umount.patch @@ -0,0 +1,16 @@ +# Description: gvfs-mount -u %U does not work in GNOME 2.26 any more. Bandaid patch to fix it more. +# Ubuntu: https://launchpad.net/bugs/351122 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi +Index: gthumb-2.10.11/data/gthumb-import.desktop.in +=================================================================== +--- gthumb-2.10.11.orig/data/gthumb-import.desktop.in 2009-04-02 19:46:27.000000000 +0200 ++++ gthumb-2.10.11/data/gthumb-import.desktop.in 2009-04-02 19:52:00.000000000 +0200 +@@ -3,7 +3,7 @@ + _GenericName=Photo Import Tool + _Comment=Import the photos on your camera card + Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography; +-Exec=sh -c 'gvfs-mount -u "%U"; exec gthumb --import-photos' ++Exec=sh -c 'gvfs-mount -u ~/.gvfs/gphoto2*; exec gthumb --import-photos' + Icon=gthumb + MimeType=x-content/image-dcf;x-content/image-picturecd; + NoDisplay=true --- gthumb-2.10.11.orig/debian/patches/08-fix_preferences.patch +++ gthumb-2.10.11/debian/patches/08-fix_preferences.patch @@ -0,0 +1,36 @@ +Add "Fit always to window" in Preferences dialog +http://bugzilla.gnome.org/show_bug.cgi?id=572683 +--- + data/glade/gthumb_preferences.glade | 8 ++++++++ + src/dlg-preferences.c | 3 ++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +--- gthumb.orig/data/glade/gthumb_preferences.glade ++++ gthumb/data/glade/gthumb_preferences.glade +@@ -1574,6 +1574,14 @@ + True + + ++ ++ ++ ++ ++ True ++ Always fit to window ++ True ++ + + + +--- gthumb.orig/src/dlg-preferences.c ++++ gthumb/src/dlg-preferences.c +@@ -54,7 +54,8 @@ static int thumb_sizes = sizeof (thumb_s + static GthZoomChange zoom_change[] = { GTH_ZOOM_CHANGE_KEEP_PREV, + GTH_ZOOM_CHANGE_FIT_SIZE_IF_LARGER, + GTH_ZOOM_CHANGE_ACTUAL_SIZE, +- GTH_ZOOM_CHANGE_FIT_WIDTH_IF_LARGER }; ++ GTH_ZOOM_CHANGE_FIT_WIDTH_IF_LARGER, ++ GTH_ZOOM_CHANGE_FIT_SIZE}; + static int zoom_changes = sizeof (zoom_change) / sizeof (GthZoomChange); + + #define GLADE_PREF_FILE "gthumb_preferences.glade" --- gthumb-2.10.11.orig/debian/patches/series +++ gthumb-2.10.11/debian/patches/series @@ -0,0 +1,14 @@ +00-fix_ltmain.sh.patch +01-PIC.patch +02-preserve_gnome-doc-utils.make.patch +#03-libgthumb_moduledir.patch +04-fix-gvfs-umount.patch +05-fix_locales.patch +06-add_keybinding_DoNotSave.patch +07-fix_zooms.patch +08-fix_preferences.patch +09-fix_infinite_loop_dragging_parent_dir.patch +10-fix_POTFILES.skip.patch +11-fix_Film_on_import.patch +12-remove_Save_button_in_crop_dialog.patch +ubuntu-lpi.patch --- gthumb-2.10.11.orig/debian/patches/xx-MIME_types.dpatch +++ gthumb-2.10.11/debian/patches/xx-MIME_types.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_mime_types.dpatch by Remco van de Meent +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gthumb-2.6.1/data/gthumb.applications /tmp/dpep.ncAcg4/gthumb-2.6.1/data/gthumb.applications +--- gthumb-2.6.1/data/gthumb.applications 2004-11-20 21:26:54.000000000 +0100 ++++ /tmp/dpep.ncAcg4/gthumb-2.6.1/data/gthumb.applications 2004-12-01 10:19:23.000000000 +0100 +@@ -4,4 +4,4 @@ + can_open_multiple_files=true + expects_uris=false + requires_terminal=false +- mime_types=x-directory/normal,image/jpeg,image/gif,image/png,image/tiff,image/x-bmp,image/x-png,image/xpm,image/x-tga ++ mime_types=x-directory/normal,image/jpeg,image/gif,image/png,image/tiff,image/x-bmp,image/x-png,image/xpm,image/x-tga,image/svg+xml --- gthumb-2.10.11.orig/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch +++ gthumb-2.10.11/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch @@ -0,0 +1,21 @@ +--- gthumb.orig/src/Makefile.am ++++ gthumb/src/Makefile.am +@@ -223,5 +223,7 @@ + lex.albumtheme.c + + CLEANFILES = \ +- $(gnome_gthumb_idl_sources) \ ++ GNOME_GThumb-stubs.c \ ++ GNOME_GThumb-skels.c \ ++ GNOME_GThumb-common.c + gnome_gthumb_idl_stamp +--- gthumb.orig/src/GNOME_GThumb.h ++++ gthumb/src/GNOME_GThumb.h +@@ -14,7 +14,6 @@ + + + /** typedefs **/ +-#line 14 "/usr/share/idl/bonobo-2.0/Bonobo.idl" + #include + #if !defined(ORBIT_DECL_GNOME_GThumb_Application) && !defined(_GNOME_GThumb_Application_defined) + #define ORBIT_DECL_GNOME_GThumb_Application 1 --- gthumb-2.10.11.orig/debian/patches/xx-MAINTAINER_MODE.patch +++ gthumb-2.10.11/debian/patches/xx-MAINTAINER_MODE.patch @@ -0,0 +1,12 @@ +Index: gthumb-2.10.7/configure.in +=================================================================== +--- gthumb-2.10.7.orig/configure.in 2007-12-28 09:07:19.000000000 +0100 ++++ gthumb-2.10.7/configure.in 2007-12-28 09:07:38.000000000 +0100 +@@ -5,6 +5,7 @@ + AC_INIT(gthumb, 2.10.7, http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb) + AC_CONFIG_SRCDIR(src/main.c) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ++AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) + --- gthumb-2.10.11.orig/debian/patches/01-PIC.patch +++ gthumb-2.10.11/debian/patches/01-PIC.patch @@ -0,0 +1,11 @@ +Compile with PIC +http://bugzilla.gnome.org/show_bug.cgi?id=572685 +--- gthumb-2.10.7.orig/Makefile.am ++++ gthumb-2.10.7/Makefile.am +@@ -1,4 +1,6 @@ + ## Process this file with automake to produce Makefile.in. ++AMCFLAGS=-fPIC -DPIC ++ + SUBDIRS = \ + po \ + libgthumb \ --- gthumb-2.10.11.orig/debian/patches/10-fix_POTFILES.skip.patch +++ gthumb-2.10.11/debian/patches/10-fix_POTFILES.skip.patch @@ -0,0 +1,29 @@ +These files are private to quilt. I'm not even sure why intltool-extract is +seeing them. +--- + po/POTFILES.skip | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +Index: gthumb-2.10.11/po/POTFILES.skip +=================================================================== +--- gthumb-2.10.11.orig/po/POTFILES.skip 2009-02-24 11:18:20.000000000 +0100 ++++ gthumb-2.10.11/po/POTFILES.skip 2009-05-05 10:23:22.000000000 +0200 +@@ -1,2 +1,18 @@ + # List of source files that should NOT be translated. + # Please keep this file sorted alphabetically. ++ ++# These are the original files patched by quilt. ++.pc/06-add_keybinding_DoNotSave.patch/src/gth-browser.c ++.pc/06-add_keybinding_DoNotSave.patch/src/gth-viewer.c ++.pc/07-fix_zooms.patch/src/gth-window-actions-callbacks.c ++.pc/07-fix_zooms.patch/src/gth-window-actions-entries.h ++.pc/08-fix_preferences.patch/data/glade/gthumb_preferences.glade ++.pc/09-fix_infinite_loop_dragging_parent_dir.patch/src/gth-browser.c ++.pc/11-fix_Film_on_import.patch/src/dlg-photo-importer.c ++.pc/12-remove_Save_button_in_crop_dialog.patch/data/glade/gthumb_crop.glade ++.pc/12-remove_Save_button_in_crop_dialog.patch/src/dlg-crop.c ++.pc/04-fix-gvfs-umount.patch/data/gthumb-import.desktop.in ++.pc/ubuntu-lpi.patch/src/gth-browser.c ++ ++# This should be really fixed upstream ++data/gthumb-import.desktop.in --- gthumb-2.10.11.orig/debian/patches/02-preserve_gnome-doc-utils.make.patch +++ gthumb-2.10.11/debian/patches/02-preserve_gnome-doc-utils.make.patch @@ -0,0 +1,12 @@ +Don't remove gnome-doc-utils.make +--- gthumb-2.10.7.orig/Makefile.am ++++ gthumb-2.10.7/Makefile.am +@@ -30,7 +30,6 @@ + po/.intltool-merge-cache \ + intltool-extract \ + intltool-merge \ +- intltool-update \ +- gnome-doc-utils.make ++ intltool-update + + DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --- gthumb-2.10.11.orig/debian/patches/12-remove_Save_button_in_crop_dialog.patch +++ gthumb-2.10.11/debian/patches/12-remove_Save_button_in_crop_dialog.patch @@ -0,0 +1,60 @@ +Author: Arthur Marsh +Reason: remove "Save" button from Crop dialog, so as to +avoid unadverted overwriting of the original file (also the button on +the main window should be disabled/changed with "Save as") +--- + data/glade/gthumb_crop.glade | 13 ------------- + src/dlg-crop.c | 6 ------ + 2 files changed, 19 deletions(-) + +--- gthumb.orig/data/glade/gthumb_crop.glade ++++ gthumb/data/glade/gthumb_crop.glade +@@ -33,19 +33,6 @@ + GTK_BUTTONBOX_END + + +- +- True +- True +- True +- gtk-save +- True +- GTK_RELIEF_NORMAL +- True +- -5 +- +- +- +- + + True + True +--- gthumb.orig/src/dlg-crop.c ++++ gthumb/src/dlg-crop.c +@@ -451,7 +451,6 @@ dlg_crop (GthWindow *window) + { + DialogData *data; + GtkWidget *ok_button; +- GtkWidget *save_button; + GtkWidget *cancel_button; + GtkWidget *help_button; + GtkWidget *menu, *item; +@@ -498,7 +497,6 @@ dlg_crop (GthWindow *window) + data->mask_button = glade_xml_get_widget (data->gui, "crop_showmask_togglebutton"); + + ok_button = glade_xml_get_widget (data->gui, "crop_okbutton"); +- save_button = glade_xml_get_widget (data->gui, "crop_savebutton"); + cancel_button = glade_xml_get_widget (data->gui, "crop_cancelbutton"); + help_button = glade_xml_get_widget (data->gui, "crop_helpbutton"); + +@@ -572,10 +570,6 @@ dlg_crop (GthWindow *window) + "clicked", + G_CALLBACK (ok_cb), + data); +- g_signal_connect (G_OBJECT (save_button), +- "clicked", +- G_CALLBACK (save_cb), +- data); + g_signal_connect (G_OBJECT (help_button), + "clicked", + G_CALLBACK (help_cb), --- gthumb-2.10.11.orig/debian/patches/09-fix_infinite_loop_dragging_parent_dir.patch +++ gthumb-2.10.11/debian/patches/09-fix_infinite_loop_dragging_parent_dir.patch @@ -0,0 +1,34 @@ +Author: David Paleino +Reason: when dragging ".." from the left pane to the main widget (where thumbnails +appear), the parent directory is infinitely copied in a loop. Example: + +$ mkdir -p /tmp/example/ +$ gthumb +[ go in /tmp/example/ and drag ".." into the main window ] +[ at this point, you'll end up with /tmp/example/tmp/example/tmp/example/... ] + +See Debian bug #420195. +http://bugzilla.gnome.org/show_bug.cgi?id=572681 +--- + src/gth-browser.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- gthumb.orig/src/gth-browser.c ++++ gthumb/src/gth-browser.c +@@ -3971,6 +3971,16 @@ image_list_drag_data_received (GtkWidge + return; + } + ++ // Fix infinite loop when dragging ../ into CWD ++ const gchar *dragged = (gchar*) data->data; ++ const gchar *current = (gchar*) priv->dir_list->path; ++ const gchar *parent = (gchar*) g_path_get_dirname(current); ++ if (strcmp(dragged, parent) == 0) { ++ g_print ("Cannot drag .. into the current folder\n"); ++ return; ++ } ++ g_free(parent); ++ + if (! ((data->length >= 0) && (data->format == 8)) + || (((context->action & GDK_ACTION_COPY) != GDK_ACTION_COPY) + && ((context->action & GDK_ACTION_MOVE) != GDK_ACTION_MOVE))) { --- gthumb-2.10.11.orig/debian/patches/00-fix_ltmain.sh.patch +++ gthumb-2.10.11/debian/patches/00-fix_ltmain.sh.patch @@ -0,0 +1,36 @@ +This patch makes --as-needed work correctly. +Please see the patch in #347650 provided by Josselin Mouette . +--- + ltmain.sh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- gthumb.orig/ltmain.sh ++++ gthumb/ltmain.sh +@@ -1807,6 +1807,11 @@ EOF + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2150,6 +2155,15 @@ EOF + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- gthumb-2.10.11.orig/debian/patches/ubuntu-lpi.patch +++ gthumb-2.10.11/debian/patches/ubuntu-lpi.patch @@ -0,0 +1,44 @@ +Index: gthumb-2.10.11/configure.in +=================================================================== +--- gthumb-2.10.11.orig/configure.in 2009-02-24 11:18:20.000000000 +0100 ++++ gthumb-2.10.11/configure.in 2009-04-02 19:36:47.000000000 +0200 +@@ -59,6 +59,7 @@ + gthread-2.0 \ + gmodule-2.0 \ + gtk+-2.0 >= $GTK_REQUIRED \ ++ launchpad-integration \ + libgnome-2.0 >= $LIBGNOME_REQUIRED \ + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ + libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED \ +Index: gthumb-2.10.11/src/gth-browser.c +=================================================================== +--- gthumb-2.10.11.orig/src/gth-browser.c 2009-04-02 19:34:23.000000000 +0200 ++++ gthumb-2.10.11/src/gth-browser.c 2009-04-02 19:38:13.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -6563,6 +6564,7 @@ + } + #endif + gth_window_attach (GTH_WINDOW (browser), menubar, GTH_WINDOW_MENUBAR); ++ launchpad_integration_add_ui_with_separators (ui, "/MenuBar/Help/LaunchpadItems", FALSE, TRUE); + + priv->toolbar = toolbar = gtk_ui_manager_get_widget (ui, "/ToolBar"); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), TRUE); +Index: gthumb-2.10.11/src/gth-browser-ui.h +=================================================================== +--- gthumb-2.10.11.orig/src/gth-browser-ui.h 2009-02-24 11:18:11.000000000 +0100 ++++ gthumb-2.10.11/src/gth-browser-ui.h 2009-04-02 19:37:15.000000000 +0200 +@@ -195,6 +195,7 @@ + " " + " " + " " ++" " + " " + " " + " " --- gthumb-2.10.11.orig/debian/patches/11-fix_Film_on_import.patch +++ gthumb-2.10.11/debian/patches/11-fix_Film_on_import.patch @@ -0,0 +1,26 @@ +Author: Matijs van Zuijlen +See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510143 +--- + src/dlg-photo-importer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- gthumb.orig/src/dlg-photo-importer.c ++++ gthumb/src/dlg-photo-importer.c +@@ -1147,6 +1147,7 @@ get_folder_name (DialogData *data) + } + + film_name = _gtk_entry_get_filename_text (GTK_ENTRY (data->film_entry)); ++ eel_gconf_set_path (PREF_PHOTO_IMPORT_FILM, film_name); + if (! is_valid_filename (film_name)) { + time_t now; + struct tm *tm; +@@ -1159,8 +1160,7 @@ get_folder_name (DialogData *data) + strftime (time_txt, 50, "%Y-%m-%d--%H.%M.%S", tm); + + film_name = g_strdup (time_txt); +- } else +- eel_gconf_set_path (PREF_PHOTO_IMPORT_FILM, film_name); ++ } + + path = g_build_filename (destination, film_name, NULL); + g_free (film_name); --- gthumb-2.10.11.orig/debian/patches/06-add_keybinding_DoNotSave.patch +++ gthumb-2.10.11/debian/patches/06-add_keybinding_DoNotSave.patch @@ -0,0 +1,647 @@ +Add a keybinding to "Do Not Save" +http://bugzilla.gnome.org/show_bug.cgi?id=572684 +--- + po/ar.po | 2 +- + po/bg.po | 2 +- + po/ca.po | 2 +- + po/cs.po | 2 +- + po/da.po | 2 +- + po/de.po | 2 +- + po/dz.po | 2 +- + po/el.po | 2 +- + po/en_CA.po | 4 ++-- + po/en_GB.po | 4 ++-- + po/es.po | 2 +- + po/et.po | 2 +- + po/eu.po | 2 +- + po/fa.po | 2 +- + po/fi.po | 2 +- + po/fr.po | 2 +- + po/gl.po | 2 +- + po/gu.po | 2 +- + po/hi.po | 2 +- + po/hr.po | 2 +- + po/hu.po | 2 +- + po/id.po | 2 +- + po/it.po | 4 ++-- + po/ja.po | 2 +- + po/ko.po | 2 +- + po/lt.po | 2 +- + po/lv.po | 2 +- + po/mk.po | 2 +- + po/nb.po | 2 +- + po/ne.po | 2 +- + po/nl.po | 2 +- + po/nn.po | 2 +- + po/pa.po | 2 +- + po/pl.po | 2 +- + po/pt.po | 2 +- + po/pt_BR.po | 2 +- + po/ru.po | 2 +- + po/rw.po | 2 +- + po/sk.po | 2 +- + po/sq.po | 2 +- + po/sr.po | 2 +- + po/sr@Latn.po | 2 +- + po/sv.po | 2 +- + po/th.po | 2 +- + po/tr.po | 2 +- + po/uk.po | 2 +- + po/vi.po | 2 +- + po/xh.po | 2 +- + po/zh_CN.po | 2 +- + po/zh_HK.po | 2 +- + po/zh_TW.po | 2 +- + src/gth-browser.c | 2 +- + src/gth-viewer.c | 2 +- + 53 files changed, 56 insertions(+), 56 deletions(-) + +--- gthumb.orig/po/ar.po ++++ gthumb/po/ar.po +@@ -3405,7 +3405,7 @@ msgid "The current image has been modifi + msgstr "الصورة الحالية عُدّلت، هل تريد حفظها؟" + + #: ../src/gth-browser.c:1901 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "لا تحفظ" + + #: ../src/gth-browser.c:3617 +--- gthumb.orig/po/bg.po ++++ gthumb/po/bg.po +@@ -3323,7 +3323,7 @@ msgid "The current image has been modifi + msgstr "Текущото изображение беше променено, искате ли да го запазите?" + + #: ../src/gth-browser.c:1874 ../src/gth-viewer.c:889 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Да не се запазва" + + #: ../src/gth-browser.c:3473 +--- gthumb.orig/po/ca.po ++++ gthumb/po/ca.po +@@ -3444,7 +3444,7 @@ msgid "The current image has been modifi + msgstr "La imatge actual s'ha modificat, voleu desar-la?" + + #: ../src/gth-browser.c:1901 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "No la desis" + + #: ../src/gth-browser.c:3617 +--- gthumb.orig/po/cs.po ++++ gthumb/po/cs.po +@@ -3426,7 +3426,7 @@ msgid "The current image has been modifi + msgstr "Aktuální obrázek byl změněn, chcete jej uložit?" + + #: ../src/gth-browser.c:1901 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Neukládat" + + #: ../src/gth-browser.c:3617 +--- gthumb.orig/po/da.po ++++ gthumb/po/da.po +@@ -3439,7 +3439,7 @@ msgstr "Det nuværende billede er blevet + + #: ../src/gth-browser.c:1844 + #: ../src/gth-viewer.c:1007 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Gem ikke" + + #: ../src/gth-browser.c:3552 +--- gthumb.orig/po/de.po ++++ gthumb/po/de.po +@@ -3465,7 +3465,7 @@ msgid "The current image has been modifi + msgstr "Das momentan geöffnete Bild wurde verändert, wollen Sie es speichern?" + + #: ../src/gth-browser.c:1902 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Nicht speichern" + + #: ../src/gth-browser.c:3618 +--- gthumb.orig/po/dz.po ++++ gthumb/po/dz.po +@@ -3449,7 +3449,7 @@ msgstr "ད་ལྟོའི་གཟ + + #: ../src/gth-browser.c:1844 + #: ../src/gth-viewer.c:1007 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "སྲུངས་མ་འབད།" + + #: ../src/gth-browser.c:3552 +--- gthumb.orig/po/el.po ++++ gthumb/po/el.po +@@ -3405,7 +3405,7 @@ msgid "The current image has been modifi + msgstr "Η τρέχουσα εικόνα έχει τροποποιηθεί, θέλετε να την αποθηκεύσετε;" + + #: ../src/gth-browser.c:1835 ../src/gth-viewer.c:989 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Όχι αποθήκευση" + + #: ../src/gth-browser.c:3363 +--- gthumb.orig/po/en_CA.po ++++ gthumb/po/en_CA.po +@@ -3348,8 +3348,8 @@ msgid "The current image has been modifi + msgstr "The current image has been modified, do you want to save it?" + + #: ../src/gth-browser.c:1906 ../src/gth-viewer.c:975 +-msgid "Do Not Save" +-msgstr "Do Not Save" ++msgid "Do _Not Save" ++msgstr "Do _Not Save" + + #: ../src/gth-browser.c:3441 + msgid "Dragged Images" +--- gthumb.orig/po/en_GB.po ++++ gthumb/po/en_GB.po +@@ -3440,8 +3440,8 @@ msgstr "The current image has been modif + + #: ../src/gth-browser.c:1844 + #: ../src/gth-viewer.c:1007 +-msgid "Do Not Save" +-msgstr "Do Not Save" ++msgid "Do _Not Save" ++msgstr "Do _Not Save" + + #: ../src/gth-browser.c:3552 + msgid "Dragged Images" +--- gthumb.orig/po/es.po ++++ gthumb/po/es.po +@@ -3436,7 +3436,7 @@ msgid "The current image has been modifi + msgstr "La imagen actual ha sido modificada, ¿quiere guardarla?" + + #: ../src/gth-browser.c:1868 ../src/gth-viewer.c:1006 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "No guardar" + + #: ../src/gth-browser.c:3582 +--- gthumb.orig/po/et.po ++++ gthumb/po/et.po +@@ -3302,7 +3302,7 @@ msgid "The current image has been modifi + msgstr "Aktiivset pilti on muudetud, kas soovid muudatusi salvestada?" + + #: ../src/gth-browser.c:1844 ../src/gth-viewer.c:791 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Ära salvesta" + + #: ../src/gth-browser.c:3422 +--- gthumb.orig/po/eu.po ++++ gthumb/po/eu.po +@@ -3424,7 +3424,7 @@ msgid "The current image has been modifi + msgstr "Uneko irudia aldatua izan da, gorde nahi duzu?" + + #: ../src/gth-browser.c:1826 ../src/gth-viewer.c:996 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Ez gorde" + + #: ../src/gth-browser.c:3535 +--- gthumb.orig/po/fa.po ++++ gthumb/po/fa.po +@@ -3288,7 +3288,7 @@ msgid "The current image has been modifi + msgstr "تصویر فعلی تغییر کرده است، آیا می‌خواهید آن را ذخیره کنید؟" + + #: ../src/gth-browser.c:1777 ../src/gth-viewer.c:791 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "ذخیره نشود" + + #: ../src/gth-browser.c:3390 +--- gthumb.orig/po/fi.po ++++ gthumb/po/fi.po +@@ -3446,7 +3446,7 @@ msgid "The current image has been modifi + msgstr "Valittua kuvaa on muokattu. Tallennetaanko muutokset?" + + #: ../src/gth-browser.c:1868 ../src/gth-viewer.c:996 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Älä tallenna" + + #: ../src/gth-browser.c:3581 +--- gthumb.orig/po/fr.po ++++ gthumb/po/fr.po +@@ -3460,7 +3460,7 @@ msgid "The current image has been modifi + msgstr "L'image actuelle a été modifiée, voulez-vous l'enregistrer ?" + + #: ../src/gth-browser.c:1892 ../src/gth-viewer.c:996 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Ne pas enregistrer" + + #: ../src/gth-browser.c:3607 +--- gthumb.orig/po/gl.po ++++ gthumb/po/gl.po +@@ -3309,7 +3309,7 @@ msgid "The current image has been modifi + msgstr "A imaxe actual foi modificada, quere gardala?" + + #: ../src/gth-browser.c:1837 ../src/gth-viewer.c:987 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Non gardar" + + #: ../src/gth-browser.c:3432 +--- gthumb.orig/po/gu.po ++++ gthumb/po/gu.po +@@ -3368,7 +3368,7 @@ msgid "The current image has been modifi + msgstr "વર્તમાન ઈમેજ સુધારાઈ ગયેલ છે, શું તમે એને સંગ્રહવા માંગો છો?" + + #: ../src/gth-browser.c:1902 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "સંગ્રહો નહિં" + + #: ../src/gth-browser.c:3618 +--- gthumb.orig/po/hi.po ++++ gthumb/po/hi.po +@@ -3396,7 +3396,7 @@ msgid "The current image has been modifi + msgstr "" + + #: ../src/gth-browser.c:1902 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "" + + #: ../src/gth-browser.c:3618 +--- gthumb.orig/po/hr.po ++++ gthumb/po/hr.po +@@ -3687,7 +3687,7 @@ msgid "The current image has been modifi + msgstr "Trenutna slika je promijenjena, želite li ju spremiti?" + + #: src/gthumb-window.c:1679 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Nemoj sačuvati" + + #: src/gthumb-window.c:3247 +--- gthumb.orig/po/hu.po ++++ gthumb/po/hu.po +@@ -3383,7 +3383,7 @@ msgid "The current image has been modifi + msgstr "A jelenlegi kép megváltozott. Szeretné menteni?" + + #: ../src/gth-browser.c:1844 ../src/gth-viewer.c:1007 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Ne mentse" + + #: ../src/gth-browser.c:3552 +--- gthumb.orig/po/id.po ++++ gthumb/po/id.po +@@ -2775,7 +2775,7 @@ msgid "The current image has been modifi + msgstr "gambar sekarang telah diubah, anda ingin menyimpannya?" + + #: src/gthumb-window.c:1476 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Jangan Simpan" + + #: src/gthumb-window.c:3073 +--- gthumb.orig/po/it.po ++++ gthumb/po/it.po +@@ -2784,8 +2784,8 @@ msgid "The current image has been modifi + msgstr "L'immagine corrente è stata modificata, si vuole salvarla?" + + #: src/gthumb-window.c:1476 +-msgid "Do Not Save" +-msgstr "Non salvare" ++msgid "Do _Not Save" ++msgstr "_Non salvare" + + #: src/gthumb-window.c:3074 + msgid "Dragged Images" +--- gthumb.orig/po/ja.po ++++ gthumb/po/ja.po +@@ -3411,7 +3411,7 @@ msgid "The current image has been modifi + msgstr "この画像が変更されました。保存しますか？" + + #: ../src/gth-browser.c:1892 ../src/gth-viewer.c:996 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "保存しない" + + #: ../src/gth-browser.c:3607 +--- gthumb.orig/po/ko.po ++++ gthumb/po/ko.po +@@ -2757,7 +2757,7 @@ msgid "The current image has been modifi + msgstr "" + + #: src/gthumb-window.c:1609 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "" + + #: src/gthumb-window.c:3215 +--- gthumb.orig/po/lt.po ++++ gthumb/po/lt.po +@@ -3433,7 +3433,7 @@ msgid "The current image has been modifi + msgstr "Šis paveikslėlis buvo pakeistas. Ar norite jį įrašyti?" + + #: ../src/gth-browser.c:1902 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Neįrašyti" + + #: ../src/gth-browser.c:3618 +--- gthumb.orig/po/lv.po ++++ gthumb/po/lv.po +@@ -3373,7 +3373,7 @@ msgid "The current image has been modifi + msgstr "Pašreizējais attēls ir pārveidots, vai jūs vēlaties saglabāt to?" + + #: ../src/gth-browser.c:1844 ../src/gth-viewer.c:1007 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Nesaglabāt" + + #: ../src/gth-browser.c:3552 +--- gthumb.orig/po/mk.po ++++ gthumb/po/mk.po +@@ -3341,7 +3341,7 @@ msgid "The current image has been modifi + msgstr "Тековната слика е променета, дали сакате да ја зачувате?" + + #: ../src/gth-browser.c:1956 ../src/gth-viewer.c:991 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Не зачувувај" + + #: ../src/gth-browser.c:3501 +--- gthumb.orig/po/nb.po ++++ gthumb/po/nb.po +@@ -3376,7 +3376,7 @@ msgid "The current image has been modifi + msgstr "Denne siden er endret. Vil du lagre den?" + + #: ../src/gth-browser.c:1844 ../src/gth-viewer.c:1007 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Ikke lagre" + + #: ../src/gth-browser.c:3552 +--- gthumb.orig/po/ne.po ++++ gthumb/po/ne.po +@@ -3310,7 +3310,7 @@ msgid "The current image has been modifi + msgstr "हालको छवि परिमार्जित गरिएको छ, के तपाईँ यसलाई बचत गर्न चाहनुहुन्छ ?" + + #: ../src/gth-browser.c:1956 ../src/gth-viewer.c:991 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "बचत नगर्नुहोस्" + + #: ../src/gth-browser.c:3501 +--- gthumb.orig/po/nl.po ++++ gthumb/po/nl.po +@@ -3380,7 +3380,7 @@ msgid "The current image has been modifi + msgstr "De huidige afbeelding is veranderd, wilt u hem opslaan?" + + #: ../src/gth-browser.c:1908 ../src/gth-viewer.c:988 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Niet opslaan" + + #: ../src/gth-browser.c:3443 +--- gthumb.orig/po/nn.po ++++ gthumb/po/nn.po +@@ -3552,7 +3552,7 @@ msgstr "bilete lagra?" + + #: ../src/gth-browser.c:1908 ../src/gth-viewer.c:992 + #, fuzzy +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Lagra" + + #: ../src/gth-browser.c:3424 +--- gthumb.orig/po/pa.po ++++ gthumb/po/pa.po +@@ -3386,7 +3386,7 @@ msgid "The current image has been modifi + msgstr "ਮੌਜੂਦਾ ਚਿੱਤਰ ਸੋਧਿਆ ਗਿਆ ਹੈ, ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" + + #: ../src/gth-browser.c:1868 ../src/gth-viewer.c:1006 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "ਨਾ ਸੰਭਾਲੋ" + + #: ../src/gth-browser.c:3582 +--- gthumb.orig/po/pl.po ++++ gthumb/po/pl.po +@@ -2778,7 +2778,7 @@ msgid "The current image has been modifi + msgstr "Bieżący obraz został zmodyfikowany, czy chcesz go zapisać?" + + #: src/gthumb-window.c:1476 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Nie zapisuj" + + #: src/gthumb-window.c:3074 +--- gthumb.orig/po/pt.po ++++ gthumb/po/pt.po +@@ -3430,7 +3430,7 @@ msgid "The current image has been modifi + msgstr "A imagem actual foi alterada, deseja gravá-la?" + + #: ../src/gth-browser.c:1899 ../src/gth-viewer.c:996 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Não Gravar" + + #: ../src/gth-browser.c:3615 +--- gthumb.orig/po/pt_BR.po ++++ gthumb/po/pt_BR.po +@@ -3446,7 +3446,7 @@ msgid "The current image has been modifi + msgstr "A imagem atual foi modificada, você quer salvá-la?" + + #: ../src/gth-browser.c:1892 ../src/gth-viewer.c:996 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Não Salvar" + + #: ../src/gth-browser.c:3607 +--- gthumb.orig/po/ru.po ++++ gthumb/po/ru.po +@@ -3431,7 +3431,7 @@ msgid "The current image has been modifi + msgstr "Текущее изображение было изменено, сохранить его?" + + #: ../src/gth-browser.c:1902 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Не сохранять" + + #: ../src/gth-browser.c:3618 +--- gthumb.orig/po/rw.po ++++ gthumb/po/rw.po +@@ -3422,7 +3422,7 @@ msgid "The current image has been modifi + msgstr "KIGEZWEHO Ishusho Byahinduwe Kuri Kubika" + + #: src/gthumb-window.c:1623 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Ntubike" + + #: src/gthumb-window.c:3232 +--- gthumb.orig/po/sk.po ++++ gthumb/po/sk.po +@@ -3435,7 +3435,7 @@ msgid "The current image has been modifi + msgstr "Aktuálny obrázok bol zmenený, chcete ho uložiť?" + + #: ../src/gth-browser.c:1901 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Neukladať" + + #: ../src/gth-browser.c:3617 +--- gthumb.orig/po/sq.po ++++ gthumb/po/sq.po +@@ -3010,7 +3010,7 @@ msgstr "figurë ruaj?" + + #: src/gthumb-window.c:1476 + #, fuzzy +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Bëje Not Ruaj" + + #: src/gthumb-window.c:3074 +--- gthumb.orig/po/sr.po ++++ gthumb/po/sr.po +@@ -3318,7 +3318,7 @@ msgid "The current image has been modifi + msgstr "Текућа слика је измењена, желите ли да је сачувате?" + + #: ../src/gth-browser.c:1844 ../src/gth-viewer.c:791 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Не чувај" + + #: ../src/gth-browser.c:3422 +--- gthumb.orig/po/sr@Latn.po ++++ gthumb/po/sr@Latn.po +@@ -3318,7 +3318,7 @@ msgid "The current image has been modifi + msgstr "Tekuća slika je izmenjena, želite li da je sačuvate?" + + #: ../src/gth-browser.c:1844 ../src/gth-viewer.c:791 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Ne čuvaj" + + #: ../src/gth-browser.c:3422 +--- gthumb.orig/po/sv.po ++++ gthumb/po/sv.po +@@ -3448,7 +3448,7 @@ msgstr "Den aktuella bilden har ändrats + + #: ../src/gth-browser.c:1868 + #: ../src/gth-viewer.c:1006 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Spara inte" + + #: ../src/gth-browser.c:3575 +--- gthumb.orig/po/th.po ++++ gthumb/po/th.po +@@ -3387,7 +3387,7 @@ msgid "The current image has been modifi + msgstr "รูปที่แสดงอยู่นี้มีการเปลี่ยนแปลง ต้องการบันทึกหรือไม่?" + + #: ../src/gth-browser.c:1901 ../src/gth-viewer.c:998 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "ไม่ต้องบันทึก" + + #: ../src/gth-browser.c:3617 +--- gthumb.orig/po/tr.po ++++ gthumb/po/tr.po +@@ -2871,7 +2871,7 @@ msgid "The current image has been modifi + msgstr "Geçerli resim değiştirildi, kaydetmek ister misiniz?" + + #: src/gthumb-window.c:1482 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Kaydetme" + + #: src/gthumb-window.c:3066 +--- gthumb.orig/po/uk.po ++++ gthumb/po/uk.po +@@ -3439,7 +3439,7 @@ msgid "The current image has been modifi + msgstr "Поточне зображення було змінено, бажаєте його зберегти?" + + #: ../src/gth-browser.c:1899 ../src/gth-viewer.c:996 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Не зберігати" + + #: ../src/gth-browser.c:3615 +--- gthumb.orig/po/vi.po ++++ gthumb/po/vi.po +@@ -3616,7 +3616,7 @@ msgstr "Ảnh hiện thời đã bị s + + #: ../src/gth-browser.c:1868 + #: ../src/gth-viewer.c:1006 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Không lưu" + + #: ../src/gth-browser.c:3582 +--- gthumb.orig/po/xh.po ++++ gthumb/po/xh.po +@@ -2801,7 +2801,7 @@ msgid "The current image has been modifi + msgstr "Umfanekiso okhoyo ulungisiwe, ufuna ukuwugcina?" + + #: ../src/gthumb-window.c:1623 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "Sukugcina" + + #: ../src/gthumb-window.c:3232 +--- gthumb.orig/po/zh_CN.po ++++ gthumb/po/zh_CN.po +@@ -3331,7 +3331,7 @@ msgid "The current image has been modifi + msgstr "当前图像已修改，你要保存它吗？" + + #: ../src/gth-browser.c:1905 ../src/gth-viewer.c:988 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "不保存" + + #: ../src/gth-browser.c:3440 +--- gthumb.orig/po/zh_HK.po ++++ gthumb/po/zh_HK.po +@@ -3331,7 +3331,7 @@ msgid "The current image has been modifi + msgstr "目前的圖片檔已經修改，你要儲存它嗎？" + + #: ../src/gth-browser.c:1956 ../src/gth-viewer.c:991 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "不要儲存" + + #: ../src/gth-browser.c:3501 +--- gthumb.orig/po/zh_TW.po ++++ gthumb/po/zh_TW.po +@@ -3338,7 +3338,7 @@ msgid "The current image has been modifi + msgstr "目前的圖片檔已經修改，您要儲存它嗎？" + + #: ../src/gth-browser.c:1956 ../src/gth-viewer.c:991 +-msgid "Do Not Save" ++msgid "Do _Not Save" + msgstr "不要儲存" + + #: ../src/gth-browser.c:3501 +--- gthumb.orig/src/gth-browser.c ++++ gthumb/src/gth-browser.c +@@ -1899,7 +1899,7 @@ ask_whether_to_save (GthBrowser *bro + GTK_WINDOW (browser), + GTK_DIALOG_MODAL, + _("The current image has been modified, do you want to save it?"), +- _("Do Not Save"), ++ _("Do _Not Save"), + GTK_STOCK_SAVE_AS, + _("_Do not display this message again"), + PREF_MSG_SAVE_MODIFIED_IMAGE); +--- gthumb.orig/src/gth-viewer.c ++++ gthumb/src/gth-viewer.c +@@ -995,7 +995,7 @@ ask_whether_to_save (GthViewer *vie + GTK_WINDOW (viewer), + GTK_DIALOG_MODAL, + _("The current image has been modified, do you want to save it?"), +- _("Do Not Save"), ++ _("Do _Not Save"), + GTK_STOCK_SAVE_AS, + _("_Do not display this message again"), + PREF_MSG_SAVE_MODIFIED_IMAGE);