--- eog-2.14.1.orig/debian/NEWS +++ eog-2.14.1/debian/NEWS @@ -0,0 +1,14 @@ +eog (2.8.1-1) experimental; urgency=low + + * The Nautilus "View as Collection" component isn't available anymore. + + The release note explanations: + + The by far biggest change for the default GNOME image viewer is the removal + of the bonobo components. It comes now as a monolithic program again and + makes use of the new wonderful GtkUIManager API. This change leads to great + speed improvements and a much better user interface. On the shadow side the + Nautilus "View as Collection" component isn't available anymore. It's + planned to provide a new Nautilus extension in the future as a replacement. + + - Sebastien Bacher Mon, 25 Oct 2004 22:03:56 +0200 --- eog-2.14.1.orig/debian/changelog +++ eog-2.14.1/debian/changelog @@ -0,0 +1,420 @@ +eog (2.14.1-0ubuntu2) dapper; urgency=low + + * debian/patches/04_no_profile_message_on_command_line.patch: + - stop flooding the command line with messages "No profile, not correcting" + * debian/patches/05_from_cvs_respect_save_to_disk_lockdown_key.patch: + - patch from CVS, make it respect the save_to_disk lockdown gconf key + (GNOME: #341862) + * debian/patches/06_from_cvs_partial_fix_slideshow_canceling_crasher.patch: + - patch from CVS, partial fix for the crasher when canceling slideshow + or fullscreen presentation (Ubuntu: #43322) + * debian/patches/07_from_cvs_set_progressbar_height.patch: + - patch from CVS, set a fixed height for the progressbar so there is no + need to rezoom after loading + + -- Sebastien Bacher Sun, 21 May 2006 11:36:30 +0200 + +eog (2.14.1-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Use the directory of the currently viewed image as file chooser + initial location + - Avoid setting the error twice in thumbnail code + - Checks mimetype before trying to include new detected files on image + list + - Updated translations: et, pt_BR,or, dz, fr, id, ka, dz, cs. + * Resynchronized with Debian, only Ubuntu changes are: + - debian/control.in, debian/patches/01_lpi.patch, + debian/patches/02_autoconf.patch: Launchpad Integration. + + -- Daniel Holbach Tue, 11 Apr 2006 09:16:12 +0200 + +eog (2.14.0-1) unstable; urgency=low + + Oystein Gisnas : + * New upstream release + - Print preview bugs fixed (Closes: #247544) + - Can display on multiple displays (Closes: #275693) + - Can display SVG images (Closes: #280922) + - Hides information sidebar as default (Closes: #292447) + - Fixes crash opening some SVGs (Closes: #322879) + * Update libgtk2.0-dev build depenency to (>= 2.7.1) + * Add build dependencies liblcms-dev, libart-2.0-dev (>= 2.3.16), + libgnome-desktop-dev (>= 2.10.0) + * Update watch file + + * Segfaults when opening two jpeg files are no longer reproducible. + (Closes: #358372) + * Full-screen can be left by pressing F11 again. (Closes: #307716) + + -- J.H.M. Dassen (Ray) Sat, 1 Apr 2006 21:08:21 +0200 + +eog (2.12.3-1) unstable; urgency=low + + * New upstream release (bug fixes and translation updates). + * [debian/rules] Have the linker work harder to produce a faster loading + binary and to trim down unneeded direct dependencies. + + Josselin Mouette : + * Recommend librsvg2-common. + + -- J.H.M. Dassen (Ray) Wed, 8 Feb 2006 20:54:57 +0100 + +eog (2.12.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 14:24:29 +0100 + +eog (2.12.2-1) experimental; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release + - Fixes some crashes (Closes: #322879) + * debian/patches/02_svg.diff: dropped; applied upstream + + [ Loic Minier ] + * Comment out scrollkeeper-update calls. + [debian/patches/10_no_scrollkeeper_update.patch] + + -- Loic Minier Sun, 4 Dec 2005 22:02:02 +0100 + +eog (2.12.1-1) experimental; urgency=low + + * New upstream release + * debian/watch: + - added to help tracking upstream + * debian/patches/00_overwrite_error.diff: + - removed, the relevant code has been rewritten, the patch no + longer applies (in both senses) + * debian/patches/02_svg.diff: + - updated to the new upstream version + * debian/patches/01_threads.diff: + - removed; issue fixed upstream with a different patch + * debian/control.in: + - added Build-Depends to libglade2-dev, libgnomeprint{,ui}2.2-dev + based on pkg-config requirements + + -- Gustavo Noronha Silva Fri, 14 Oct 2005 12:13:19 -0300 + +eog (2.10.2-3) unstable; urgency=medium + + [ Guilherme de S. Pastore ] + * debian/control.in: + - added ${misc:Depends} dependency (higher urgency) + - bumped standards-version to 3.6.2.1 with no changes + + [ Sebastien Bacher ] + * debian/patches/02_svg.diff + - open svg files (Closes: #306188) + + -- Guilherme de S. Pastore Thu, 13 Oct 2005 14:25:20 -0300 + +eog (2.10.2-2) unstable; urgency=low + + * debian/patches/00_overwrite_error.diff: + - apply patch from Gustavo Noronha Silva + to fix the error message displayed when overwriting a file. + Thanks! (Closes: #287980) + * debian/patches/01_threads.diff: + - don't create threads as joinable if we're not going to join + them, otherwise we end up with huge memory usage and even + crashes (Closes: #288163) + * debian/eog-collection-view.1: + - removed, there's only one binary that handles this on the UI now + * debian/control.in: + - updated my e-mail address + + -- Guilherme de S. Pastore Wed, 10 Aug 2005 19:46:22 -0300 + +eog (2.10.2-1) unstable; urgency=low + + * New maintainer (Closes: #322092) + * Acknowledge NMUs (Closes: #223366, #237201, #253005, #289293, #321312) + * debian/control.in: + - Added, to auto-generate debian/control + - Added the Debian GNOME Team to Uploaders: + + Added Build-Dependency on gnome-pkg-tools + - Updated to Standards-Version 3.6.2 with no changes + * debian/copyright: + - Updated list of Upstream Authors + - Fixed Copyright and License notices + - Updated the URL from which tarball was downloaded + * debian/dirs: + - Removed + * debian/eog.1: + - Escaped all hyphens + * debian/eog.install: + - Install gnome-eog.xpm, the Debian menu icon + * debian/rules: + - Include uploaders.mk from gnome-pkg-tools + - Clean the clean:: target up, as most of the removals are already + handled by CDBS itself + + -- Guilherme de S. Pastore Mon, 8 Aug 2005 22:14:55 -0300 + +eog (2.10.2-0.2) unstable; urgency=low + + * Non-maintainer upload by the GNOME team. + * Build-depend on libexif-dev 0.6.12 (closes: #321312) + + -- Ross Burton Mon, 8 Aug 2005 09:14:04 +0100 + +eog (2.10.2-0.1) unstable; urgency=low + + * Non-maintainer upload by the GNOME team. + * New upstream release. + + -- Jordi Mallach Thu, 7 Jul 2005 19:38:12 +0200 + +eog (2.10.0-0.2) unstable; urgency=low + + * Non-maintainer upload by the GNOME team. + * Upload to unstable. + * debian/control: drop gettext, add cdbs and bump debhelper for + build-depends. + * debian/rules: rewrite to use cdbs. + - cdbs doesn't use dh_installmanpages (closes: #289293). + + -- Jordi Mallach Fri, 10 Jun 2005 17:12:43 +0200 + +eog (2.10.0-0.1) experimental; urgency=low + + * GNOME team upload for GNOME 2.10. + * New upstream release. + * debian/control: updated Build-Depends. + + -- Jordi Mallach Mon, 9 May 2005 16:45:11 +0200 + +eog (2.8.2-0.1) unstable; urgency=low + + * Non-Maintainer upload. + * New upstream release. + * po/ca.po: fix a bad translation. + + -- Jordi Mallach Wed, 29 Dec 2004 21:02:36 +0100 + +eog (2.8.1-1.1) unstable; urgency=low + + * NMU for GNOME 2.8 in unstable. + * Upload to unstable. + * debian/control: + - Build-Depends on libxml-parser-perl. + + -- Sebastien Bacher Wed, 24 Nov 2004 16:39:09 +0100 + +eog (2.8.1-1) experimental; urgency=low + + * NMU with maintainer approval. + * New upstream release: + - the Nautilus "View as Collection" component isn't available anymore. + (Closes: #223366). + - fix the image collection mode (Closes: #253005). + - fix the problem with fix/normal buttons (Closes: #237201). + * debian/compat: + - added. + * debian/control: + - updated Standards-Version to 3.6.1.0. + - updated the Build-Depends. + * debian/postinst, debian/postrm: + - removed, dh_gconf handles this. + * debian/NEWS: + - added a note about the removal of the nautilus view. + * debian/rules: + - added a call to dh_gconf and dh_desktop. + + -- Sebastien Bacher Mon, 25 Oct 2004 22:03:56 +0200 + +eog (2.6.1-2) unstable; urgency=high + + * Rebuilt without libexif support to let collection view mode work + properly, it'll be readded in the future, thanks Paul Brossier. + closes: #253005, #267869. + + -- Davide Puricelli (evo) Sat, 4 Sep 2004 18:05:26 +0200 + +eog (2.6.1-1) unstable; urgency=low + + * Acknowledge NMUs, thanks Sebastien. + closes: #245329, #255186, #228639. + * Fixed wrong manpage header; closes: #261034. + * debian/menu: used a xpm file; closes: #265940. + + -- Davide Puricelli (evo) Sun, 22 Aug 2004 17:31:59 +0200 + +eog (2.6.1-0.4) unstable; urgency=high + + * NMU + * Fixed the FTBFS with the new libexif (Closes: #255186). + * debian/control: + - updated the Build-Depends on libexif-dev. + + -- Sebastien Bacher Sat, 26 Jun 2004 14:24:01 +0200 + +eog (2.6.1-0.3) unstable; urgency=low + + * NMU + * Updated build depends. + + -- Sebastien Bacher Fri, 28 May 2004 22:55:17 +0200 + +eog (2.6.1-0.2) unstable; urgency=low + + * Non-Maintainer Upload. + * Upload to unstable. + + -- Jordi Mallach Fri, 28 May 2004 12:36:04 +0200 + +eog (2.6.1-0.1) experimental; urgency=low + + * NMU. + * New upstream release. + * debian/control.in + + updated Build-Depends (Closes: #245329). + * debian/menu: + + updated menu entry with Luca Capello suggestions + (Closes: #228639). + + -- Sebastien Bacher Sun, 16 May 2004 14:28:53 +0200 + +eog (2.6.0-1) experimental; urgency=low + + * New upstream release; closes: #242060. + + -- Davide Puricelli (evo) Sun, 18 Apr 2004 11:55:33 +0200 + +eog (2.4.1-2) unstable; urgency=high + + * Added a missing Build-Depends on libgnomeprintui2.2-dev. + + -- Davide Puricelli (evo) Sat, 25 Oct 2003 15:22:48 +0200 + +eog (2.4.1-1) unstable; urgency=low + + * New upstream version. + * Fixed an issue on viewing some pictures twice, closes: #190889. + * "Load image" file selector is no longer case sensitive, closes: #199431. + * Added .jpeg support, closes: #208359. + * Removed useless Build-Depends on liblinc-dev, closes: #214819. + + -- Davide Puricelli (evo) Fri, 24 Oct 2003 18:41:44 +0200 + +eog (2.2.2-2) unstable; urgency=high + + * Added a missing Build-Depends on libeel2-dev. + + -- Davide Puricelli (evo) Sat, 7 Jun 2003 10:22:39 +0200 + +eog (2.2.2-1) unstable; urgency=high + + * New upstream version: + - fixed "GNOME's Eye Of Gnome incorrect file name handling" + (http://marc.theaimsgroup.com/?l=bugtraq&m=104887189724146&w=2) + closes: #189002. + * Added support for "image/svg+xml" too, closes: #192421. + * Fixed a typo into xmldocs.make (now it's a tab and not eight spaces). + closes: #195668. + + -- Davide Puricelli (evo) Fri, 6 Jun 2003 22:22:19 +0200 + +eog (2.2.0-1) unstable; urgency=low + + * New upstream version. + + -- Davide Puricelli (evo) Mon, 10 Feb 2003 19:46:06 +0100 + +eog (1.1.4-1) unstable; urgency=low + + * New upstream version. + * Segfault on Edit/Preferences is not reproducible, please try this + version; closes: #166689. + * Removed an old Depends on libgnomeprint2-0; closes: #177328. + * eog is not a core app, I think that 1.1 branch is really better than + Gnome 2.0.x version, so I'll continue to package it; closes: #170404. + + -- Davide Puricelli (evo) Sat, 18 Jan 2003 23:36:32 +0100 + +eog (1.1.0-2) unstable; urgency=low + + * First upload to unstable! + + -- Davide Puricelli (evo) Sat, 26 Oct 2002 23:31:04 +0200 + +eog2 (1.1.0-1) experimental; urgency=low + + * New upstream version. + + -- Davide Puricelli (evo) Fri, 18 Oct 2002 15:25:12 +0200 + +eog2 (1.0.3-3) experimental; urgency=low + + * Removed the 2 suffix from the binary package name. + + -- Davide Puricelli (evo) Sat, 5 Oct 2002 12:55:32 +0200 + +eog2 (1.0.3-2) experimental; urgency=low + + * Removed any external DTD call in xml files; closes: #161883. + + -- Davide Puricelli (evo) Sat, 28 Sep 2002 12:09:32 +0200 + +eog2 (1.0.3-1) experimental; urgency=low + + * New upstream version. + + -- Davide Puricelli (evo) Fri, 13 Sep 2002 14:23:12 +0200 + +eog2 (1.0.1-5) experimental; urgency=low + + * Recompiled against gnome-vfs2 2.0.2-4. + + -- Davide Puricelli (evo) Wed, 14 Aug 2002 17:41:06 +0200 + +eog2 (1.0.1-4) experimental; urgency=low + + * Recompiled against libpng3 and libgtk2.0-0png3. + + -- Davide Puricelli (evo) Tue, 13 Aug 2002 11:46:01 +0200 + +eog2 (1.0.1-3) experimental; urgency=low + + * Now we don't ship /etc/gconf/gconf.xml.defaults, it's generated by + gconftool; closes: #151856. + + -- Davide Puricelli (evo) Fri, 12 Jul 2002 19:01:13 +0200 + +eog2 (1.0.1-2) experimental; urgency=low + + * Recompiled against librsvg2-2. + + -- Davide Puricelli (evo) Mon, 1 Jul 2002 11:01:47 +0200 + +eog2 (1.0.1-1) experimental; urgency=low + + * New upstream version. + + -- Davide Puricelli (evo) Sat, 22 Jun 2002 11:49:19 +0200 + +eog2 (0.118.0-1) experimental; urgency=low + + * New upstream version. + + -- Davide Puricelli (evo) Sat, 25 May 2002 15:03:53 +0200 + +eog2 (0.116.1-1) experimental; urgency=low + + * New upstream version. + + -- Davide Puricelli (evo) Thu, 25 Apr 2002 15:32:27 +0200 + +eog2 (0.115.0-1) experimental; urgency=low + + * New upstream version. + + -- Davide Puricelli (evo) Sun, 31 Mar 2002 21:40:36 +0200 + +eog2 (0.114.0-1) experimental; urgency=low + + * Initial Release, closes: #130119. + + -- Davide Puricelli (evo) Sun, 17 Mar 2002 12:49:05 +0100 --- eog-2.14.1.orig/debian/menu +++ eog-2.14.1/debian/menu @@ -0,0 +1,4 @@ +?package(eog):needs="X11" section="Apps/Viewers" \ + title="Eye of GNOME" hints="Images" command="/usr/bin/eog" \ + longtitle="View many different types of images" \ + icon="/usr/share/pixmaps/gnome-eog.xpm" --- eog-2.14.1.orig/debian/eog.manpages +++ eog-2.14.1/debian/eog.manpages @@ -0,0 +1,3 @@ +debian/eog.1 +debian/eog-collection-view.1 +debian/eog-image-viewer.1 --- eog-2.14.1.orig/debian/control +++ eog-2.14.1/debian/control @@ -0,0 +1,18 @@ +Source: eog +Section: gnome +Priority: optional +Maintainer: Guilherme de S. Pastore +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sebastien Bacher , Sjoerd Simons , Takuo KITAME +Standards-Version: 3.6.2.1 +Build-Depends: cdbs (>= 0.4.24), debhelper (>= 4.2.27), libgconf2-dev (>= 2.6.1-2), libgnomecanvas2-dev (>= 2.6.1.1-2), libgnomeui-dev (>= 2.6.1.1-2), libgnomevfs2-dev (>= 2.6.1.1-3), libgnomeprintui2.2-dev, libgnomeprint2.2-dev, libgtk2.0-dev (>= 2.7.1), libglade2-dev (>= 2.3.6), libxml2-dev, scrollkeeper, libjpeg62-dev, libpng12-dev, zlib1g-dev, libexif-dev (>= 0.6.12), libxt-dev, libxml-parser-perl, gnome-pkg-tools, liblcms-dev, libart-2.0-dev (>= 2.3.16), libgnome-desktop-dev (>= 2.10.0), liblaunchpad-integration-dev + +Package: eog +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: librsvg2-common +Conflicts: eog2 +Description: Eye of Gnome graphics viewer program + eog or the Eye of Gnome is a graphics viewer for GNOME which uses the + gdk-pixbuf library. It can deal with large images, and zoom and + scroll with constant memory usage. The goal is a standard graphics + viewer for future releases of Gnome. --- eog-2.14.1.orig/debian/eog.1 +++ eog-2.14.1/debian/eog.1 @@ -0,0 +1,62 @@ +.\" -*- nroff -*- +.TH EOG 1 "April 22, 2000" +.SH "NAME" +eog \- a GNOME image viewer +.SH "SYNOPSIS" +.B eog +.RI [ options ] " files" ... +.SH "DESCRIPTION" +An image viewer for GNOME which uses gdk_pixbuf +.SH "USAGE" +Usage: eog [OPTION...] +.PP +GNOME Options + \-\-disable\-sound Disable sound server usage + \-\-enable\-sound Enable sound server usage + \-\-espeaker=HOSTNAME:PORT Host:port on which the sound + server to use is running + \-\-version +.PP +Help options + \-?, \-\-help Show this help message + \-\-usage Display brief usage message +.PP +GTK options + \-\-gdk-debug=FLAGS Gdk debugging flags to set + \-\-gdk-no-debug=FLAGS Gdk debugging flags to unset + \-\-display=DISPLAY X display to use + \-\-sync Make X calls synchronous + \-\-no-xshm Don't use X shared + memory extension + \-\-name=NAME Program name as used by the + window manager + \-\-class=CLASS Program class as used by the + window manager + \-\-gxid_host=HOST + \-\-gxid_port=PORT + \-\-xim\-preedit=STYLE + \-\-xim\-status=STYLE + \-\-gtk\-debug=FLAGS Gtk+ debugging flags to set + \-\-gtk\-no\-debug=FLAGS Gtk+ debugging flags + to unset + \-\-g\-fatal\-warnings Make all warnings fatal + \-\-gtk\-module=MODULE Load an additional + Gtk module +.PP +GNOME GUI options + \-\-disable\-crash\-dialog +.PP +Session management options + \-\-sm\-client\-id=ID Specify session management ID + \-\-sm\-config\-prefix=PREFIX Specify prefix of saved + configuration + \-\-sm-disable Disable connection to + session manager + + +.SH AUTHOR +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +This manual page was written by Dan Nguyen , +for the Debian GNU/Linux system (but may be used by others). --- eog-2.14.1.orig/debian/gnome-eog.xpm +++ eog-2.14.1/debian/gnome-eog.xpm @@ -0,0 +1,392 @@ +/* XPM */ +static char * gnome_eog_xpm[] = { +"32 32 357 2", +" c None", +". c #0E0000", +"+ c #040000", +"@ c #010000", +"# c #1D0B0B", +"$ c #461515", +"% c #0E0404", +"& c #020000", +"* c #0B0303", +"= c #1D0C0C", +"- c #331A1A", +"; c #6B2929", +"> c #933434", +", c #511D1D", +"' c #080404", +") c #160606", +"! c #4E1D1D", +"~ c #7D3E3E", +"{ c #9C5454", +"] c #B25C5C", +"^ c #A33434", +"/ c #852626", +"( c #1F0A0A", +"_ c #070101", +": c #2B0D0D", +"< c #7A2C2C", +"[ c #9C4343", +"} c #B56060", +"| c #B96464", +"1 c #B15151", +"2 c #A23232", +"3 c #7D1E1E", +"4 c #481212", +"5 c #020101", +"6 c #260B0B", +"7 c #732A2A", +"8 c #A24A4A", +"9 c #B66161", +"0 c #BE6A6A", +"a c #B15656", +"b c #9D3535", +"c c #872121", +"d c #6B1F1F", +"e c #220909", +"f c #110606", +"g c #7A3131", +"h c #A64D4D", +"i c #BE6B6B", +"j c #C47474", +"k c #B05555", +"l c #A33C3C", +"m c #912626", +"n c #7B1F1F", +"o c #571919", +"p c #270D0D", +"q c #050101", +"r c #411616", +"s c #A44C4C", +"t c #B55C5C", +"u c #BA6666", +"v c #B76060", +"w c #A94848", +"x c #A33636", +"y c #882525", +"z c #732121", +"A c #3B1414", +"B c #240E0E", +"C c #1E0707", +"D c #813434", +"E c #B86363", +"F c #C97B7B", +"G c #C06E6E", +"H c #A53C3C", +"I c #A03232", +"J c #551818", +"K c #3B1515", +"L c #431B1B", +"M c #411515", +"N c #9A4B4B", +"O c #C67777", +"P c #CC7F7F", +"Q c #B96363", +"R c #AD4E4E", +"S c #9F2E2E", +"T c #942424", +"U c #782222", +"V c #421313", +"W c #481B1B", +"X c #542323", +"Y c #170909", +"Z c #762525", +"` c #B16060", +" . c #BF6C6C", +".. c #BD6969", +"+. c #AD5151", +"@. c #A84444", +"#. c #A52D2D", +"$. c #992C2C", +"%. c #6D2121", +"&. c #461818", +"*. c #4C2020", +"=. c #4D2020", +"-. c #3E1A1A", +";. c #090404", +">. c #1A0404", +",. c #812525", +"'. c #BF6B6B", +"). c #C47373", +"!. c #B76161", +"~. c #AE5151", +"{. c #AC3C3C", +"]. c #A52C2C", +"^. c #962F2F", +"/. c #6C2020", +"(. c #511C1C", +"_. c #4F2121", +":. c #491E1E", +"<. c #160909", +"[. c #370808", +"}. c #8F3434", +"|. c #C16E6E", +"1. c #C16F6F", +"2. c #B65E5E", +"3. c #B24F4F", +"4. c #A93030", +"5. c #9D2929", +"6. c #8A2828", +"7. c #701E1E", +"8. c #631F1F", +"9. c #4E2020", +"0. c #4C1D1D", +"a. c #110707", +"b. c #000000", +"c. c #490B0B", +"d. c #A44848", +"e. c #BC6868", +"f. c #B55D5D", +"g. c #AC4A4A", +"h. c #A72F2F", +"i. c #A12C2C", +"j. c #8D2626", +"k. c #7E1E1E", +"l. c #721E1E", +"m. c #521B1B", +"n. c #512121", +"o. c #562424", +"p. c #532222", +"q. c #3E1919", +"r. c #090303", +"s. c #050000", +"t. c #080101", +"u. c #0D0707", +"v. c #450F0F", +"w. c #A04949", +"x. c #CB7A7A", +"y. c #C46E6E", +"z. c #B75959", +"A. c #AC4848", +"B. c #A83737", +"C. c #A02828", +"D. c #8B2323", +"E. c #7E2121", +"F. c #7E2525", +"G. c #622626", +"H. c #532323", +"I. c #401A1A", +"J. c #290808", +"K. c #410505", +"L. c #550606", +"M. c #230000", +"N. c #190404", +"O. c #592A2A", +"P. c #9A6A6A", +"Q. c #5F4343", +"R. c #331313", +"S. c #4A2424", +"T. c #6C2929", +"U. c #822727", +"V. c #982E2E", +"W. c #9F2626", +"X. c #922828", +"Y. c #862929", +"Z. c #7F2A2A", +"`. c #682727", +" + c #2F1414", +".+ c #1E0A0A", +"++ c #420E0E", +"@+ c #610707", +"#+ c #680202", +"$+ c #670101", +"%+ c #2D0000", +"&+ c #230404", +"*+ c #7B3434", +"=+ c #BA5C5C", +"-+ c #CE7373", +";+ c #D89090", +">+ c #D29191", +",+ c #815353", +"'+ c #4E2E2E", +")+ c #401E1E", +"!+ c #421D1D", +"~+ c #4A1D1D", +"{+ c #5B1E1E", +"]+ c #651E1E", +"^+ c #541717", +"/+ c #551212", +"(+ c #6D1515", +"_+ c #7C1717", +":+ c #7A1414", +"<+ c #680505", +"[+ c #550505", +"}+ c #370202", +"|+ c #0B0000", +"1+ c #1E0202", +"2+ c #431515", +"3+ c #A55252", +"4+ c #C05F5F", +"5+ c #C56262", +"6+ c #C96666", +"7+ c #CD6C6C", +"8+ c #CE6C6C", +"9+ c #C66060", +"0+ c #BB5555", +"a+ c #B65050", +"b+ c #A64040", +"c+ c #952F2F", +"d+ c #973131", +"e+ c #862020", +"f+ c #7B1717", +"g+ c #631111", +"h+ c #360606", +"i+ c #1F0000", +"j+ c #130606", +"k+ c #3C3C3C", +"l+ c #171717", +"m+ c #363232", +"n+ c #625555", +"o+ c #3E3838", +"p+ c #361C1C", +"q+ c #4A2525", +"r+ c #572B2B", +"s+ c #653232", +"t+ c #834343", +"u+ c #854343", +"v+ c #793838", +"w+ c #702F2F", +"x+ c #5D2525", +"y+ c #401818", +"z+ c #0E0506", +"A+ c #020303", +"B+ c #121718", +"C+ c #0D0F10", +"D+ c #525454", +"E+ c #B8B8B8", +"F+ c #989898", +"G+ c #353535", +"H+ c #585858", +"I+ c #EBEBEB", +"J+ c #DDDDDD", +"K+ c #131D1D", +"L+ c #2F4A4A", +"M+ c #111B1C", +"N+ c #3F3F3F", +"O+ c #5A5959", +"P+ c #302F2F", +"Q+ c #030101", +"R+ c #040101", +"S+ c #111D22", +"T+ c #204154", +"U+ c #284B61", +"V+ c #17252D", +"W+ c #858989", +"X+ c #A5A5A5", +"Y+ c #868686", +"Z+ c #343434", +"`+ c #282828", +" @ c #DADADA", +".@ c #E7E7E7", +"+@ c #233337", +"@@ c #53808E", +"#@ c #1C2628", +"$@ c #AAABAB", +"%@ c #CFCFCF", +"&@ c #2C2C2C", +"*@ c #081519", +"=@ c #19404F", +"-@ c #265062", +";@ c #112025", +">@ c #717474", +",@ c #848484", +"'@ c #636363", +")@ c #1E1E1E", +"!@ c #0B0B0B", +"~@ c #B7B7B7", +"{@ c #C8C8C8", +"]@ c #434B4E", +"^@ c #2E5460", +"/@ c #0C1A1B", +"(@ c #757676", +"_@ c #727272", +":@ c #050505", +"<@ c #182D2F", +"[@ c #3D6C6E", +"}@ c #294C4D", +"|@ c #111919", +"1@ c #6E7171", +"2@ c #333333", +"3@ c #0F0F0F", +"4@ c #3E3E3E", +"5@ c #8F8F8F", +"6@ c #636464", +"7@ c #243839", +"8@ c #254957", +"9@ c #04090D", +"0@ c #010101", +"a@ c #000101", +"b@ c #162224", +"c@ c #0A242F", +"d@ c #22424C", +"e@ c #2E3838", +"f@ c #313434", +"g@ c #4A4A4A", +"h@ c #2E2E2E", +"i@ c #121212", +"j@ c #505050", +"k@ c #2B2F32", +"l@ c #2E526C", +"m@ c #254758", +"n@ c #040607", +"o@ c #010202", +"p@ c #010303", +"q@ c #12272B", +"r@ c #335A6B", +"s@ c #315569", +"t@ c #091920", +"u@ c #232C2C", +"v@ c #3C3E3E", +"w@ c #151515", +"x@ c #030303", +"y@ c #040404", +"z@ c #1B1B1B", +"A@ c #282C2D", +"B@ c #4A5F61", +"C@ c #3E5962", +"D@ c #243A3E", +"E@ c #2C4449", +"F@ c #19363C", +"G@ c #1C3941", +"H@ c #163543", +"I@ c #213644", +"J@ c #101718", +"K@ c #060606", +"L@ c #0E0E0E", +"M@ c #101617", +"N@ c #0D1213", +"O@ c #0B1011", +"P@ c #030607", +" ", +" ", +" ", +" ", +" . + ", +" @ # $ % ", +" & * = - ; > , ' ", +" @ ) ! ~ { ] ^ / ( ", +" _ : < [ } | 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 ", +" C D E F G i H I 3 J K L @ ", +" M N O P Q R S T U V W X Y ", +" q Z ` ...+.@.#.$.%.&.*.=.-.;. ", +" >.,.'.).!.~.{.].^./.(._._.:.<. ", +" [.}.|.1.2.3.4.5.6.7.8.! =.9.0.a. ", +" b. c.d.F e.f.g.h.i.j.k.l.m.n.o.p.q.r.b.s. ", +" t.u.# v.w.x.y.z.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.`. +p .+++@+#+$+%+ ", +" &+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+ ", +" 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+C+D+E+F+G+ ", +" H+I+J+K+L+M+N+O+P+5 Q+R+b.S+T+U+V+W+X+Y+Z+ ", +" `+ @.@+@@@#@$@%@&@b.b.b.b.*@=@-@;@>@,@'@)@ ", +" !@~@{@]@^@/@(@_@b.b.:@b.b.<@[@}@|@1@'@2@3@ ", +" 4@5@6@7@8@9@0@0@b.b.a@b@c@d@e@f@g@h@ ", +" i@&@j@k@l@m@n@o@a@p@q@r@s@t@u@v@w@x@ ", +" y@z@A@B@C@D@E@F@G@H@I@J@K@0@ ", +" L@M@N@O@P@o@A+ ", +" ", +" "}; --- eog-2.14.1.orig/debian/rules +++ eog-2.14.1/debian/rules @@ -0,0 +1,11 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + +DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1 -Wl,--as-needed" + +clean:: + rm -f eog.desktop eog.schemas --- eog-2.14.1.orig/debian/watch +++ eog-2.14.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/eog/2.14/ \ + eog-(.*)\.tar\.gz \ + debian uupdate --- eog-2.14.1.orig/debian/eog-image-viewer.1 +++ eog-2.14.1/debian/eog-image-viewer.1 @@ -0,0 +1,107 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH EOG-IMAGE-VIEWER 1 "April 2001" +.SH NAME +eog-image-viewer \- a GNOME image viewer +.SH SYNOPSIS +.B eog-image-viewer +[\fIOPTION\fR...] +.SH DESCRIPTION +GNOME options +.TP +\fB\-\-disable\-sound\fR +Disable sound server usage +.TP +\fB\-\-enable\-sound\fR +Enable sound server usage +.TP +\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT +Host:port on which the sound server to use is +running +.HP +\fB\-\-version\fR +.PP +Help options +.TP +-?, \fB\-\-help\fR +Show this help message +.TP +\fB\-\-usage\fR +Display brief usage message +.PP +GTK options +.TP +\fB\-\-gdk\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.TP +\fB\-\-sync\fR +Make X calls synchronous +.TP +\fB\-\-no\-xshm\fR +Don't use X shared memory extension +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the window manager +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the window manager +.HP +\fB\-\-gxid_host\fR=\fIHOST\fR +.HP +\fB\-\-gxid_port\fR=\fIPORT\fR +.HP +\fB\-\-xim\-preedit\fR=\fISTYLE\fR +.HP +\fB\-\-xim\-status\fR=\fISTYLE\fR +.TP +\fB\-\-gtk\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal +.TP +\fB\-\-gtk\-module\fR=\fIMODULE\fR +Load an additional Gtk module +.PP +GNOME GUI options +.HP +\fB\-\-disable\-crash\-dialog\fR +.PP +Session management options +.TP +\fB\-\-sm\-client\-id\fR=\fIID\fR +Specify session management ID +.TP +\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR +Specify prefix of saved configuration +.TP +\fB\-\-sm\-disable\fR +Disable connection to session manager +.PP +eog-image-viewer options +.TP +\fB\-\-oaf\-od\-ior\fR=\fIIOR\fR +Object directory to use when registering servers +.TP +\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR +File descriptor to print IOR on +.TP +\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR +IID to activate +.TP +\fB\-\-oaf\-private\fR +Prevent registering of server with OAF +.SH AUTHOR +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +This manual page was written by Davide Puricelli , +for the Debian GNU/Linux system (but may be used by others). --- eog-2.14.1.orig/debian/eog-collection-view.1 +++ eog-2.14.1/debian/eog-collection-view.1 @@ -0,0 +1,52 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. +.TH eog-collection-view "1" "October 2003" "eog-collection-view" "User Commands" +.SH NAME +eog-collection-view \- manual page for Gnome eog-collection-view +.SH SYNOPSIS +.B eog-collection-view +[\fIOPTION\fR...] +.SH DESCRIPTION +.TP +\fB\-\-load\-modules\fR=\fIMODULE1\fR,MODULE2,... +Dynamic modules to load +.PP +Help options +.TP +-?, \fB\-\-help\fR +Show this help message +.TP +\fB\-\-usage\fR +Display brief usage message +.PP +Bonobo activation Support +.TP +\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR +File descriptor to print IOR on +.TP +\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR +IID to activate +.TP +\fB\-\-oaf\-private\fR +Prevent registering of server with OAF +.PP +GNOME GConf Support +.PP +GNOME Library +.TP +\fB\-\-disable\-sound\fR +Disable sound server usage +.TP +\fB\-\-enable\-sound\fR +Enable sound server usage +.TP +\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT +Host:port on which the sound server +to use is running +.HP +\fB\-\-version\fR +.SH AUTHOR +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +This manual page was written by Davide Puricelli , +for the Debian GNU/Linux system (but may be used by others). --- eog-2.14.1.orig/debian/eog.install +++ eog-2.14.1/debian/eog.install @@ -0,0 +1 @@ +debian/gnome-eog.xpm usr/share/pixmaps --- eog-2.14.1.orig/debian/compat +++ eog-2.14.1/debian/compat @@ -0,0 +1 @@ +4 --- eog-2.14.1.orig/debian/control.in +++ eog-2.14.1/debian/control.in @@ -0,0 +1,18 @@ +Source: eog +Section: gnome +Priority: optional +Maintainer: Guilherme de S. Pastore +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.6.2.1 +Build-Depends: cdbs (>= 0.4.24), debhelper (>= 4.2.27), libgconf2-dev (>= 2.6.1-2), libgnomecanvas2-dev (>= 2.6.1.1-2), libgnomeui-dev (>= 2.6.1.1-2), libgnomevfs2-dev (>= 2.6.1.1-3), libgnomeprintui2.2-dev, libgnomeprint2.2-dev, libgtk2.0-dev (>= 2.7.1), libglade2-dev (>= 2.3.6), libxml2-dev, scrollkeeper, libjpeg62-dev, libpng12-dev, zlib1g-dev, libexif-dev (>= 0.6.12), libxt-dev, libxml-parser-perl, gnome-pkg-tools, liblcms-dev, libart-2.0-dev (>= 2.3.16), libgnome-desktop-dev (>= 2.10.0), liblaunchpad-integration-dev + +Package: eog +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: librsvg2-common +Conflicts: eog2 +Description: Eye of Gnome graphics viewer program + eog or the Eye of Gnome is a graphics viewer for GNOME which uses the + gdk-pixbuf library. It can deal with large images, and zoom and + scroll with constant memory usage. The goal is a standard graphics + viewer for future releases of Gnome. --- eog-2.14.1.orig/debian/patches/04_no_profile_message_on_command_line.patch +++ eog-2.14.1/debian/patches/04_no_profile_message_on_command_line.patch @@ -0,0 +1,13 @@ +diff -Nur eog-2.14.1/shell/eog-window.c eog-2.14.1.new/shell/eog-window.c +--- eog-2.14.1/shell/eog-window.c 2006-05-21 11:35:42.000000000 +0200 ++++ eog-2.14.1.new/shell/eog-window.c 2006-05-21 11:36:10.000000000 +0200 +@@ -3027,7 +3027,9 @@ + XFree (str); + return profile; + } else { ++#ifdef DEBUG + g_printerr("No profile, not correcting\n"); ++#endif + return NULL; + } + } --- eog-2.14.1.orig/debian/patches/10_no_scrollkeeper_update.patch +++ eog-2.14.1/debian/patches/10_no_scrollkeeper_update.patch @@ -0,0 +1,273 @@ +diff -urN eog-2.12.2.orig/help/C/Makefile.in eog-2.12.2/help/C/Makefile.in +--- eog-2.12.2.orig/help/C/Makefile.in 2005-11-28 20:02:41.000000000 +0100 ++++ eog-2.12.2/help/C/Makefile.in 2005-12-04 21:58:44.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/de/Makefile.in eog-2.12.2/help/de/Makefile.in +--- eog-2.12.2.orig/help/de/Makefile.in 2005-11-28 20:02:42.000000000 +0100 ++++ eog-2.12.2/help/de/Makefile.in 2005-12-04 21:58:53.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/es/Makefile.in eog-2.12.2/help/es/Makefile.in +--- eog-2.12.2.orig/help/es/Makefile.in 2005-11-28 20:02:42.000000000 +0100 ++++ eog-2.12.2/help/es/Makefile.in 2005-12-04 21:59:03.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/eu/Makefile.in eog-2.12.2/help/eu/Makefile.in +--- eog-2.12.2.orig/help/eu/Makefile.in 2005-11-28 20:02:43.000000000 +0100 ++++ eog-2.12.2/help/eu/Makefile.in 2005-12-04 21:59:11.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/fr/Makefile.in eog-2.12.2/help/fr/Makefile.in +--- eog-2.12.2.orig/help/fr/Makefile.in 2005-11-28 20:02:43.000000000 +0100 ++++ eog-2.12.2/help/fr/Makefile.in 2005-12-04 21:59:21.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/it/Makefile.in eog-2.12.2/help/it/Makefile.in +--- eog-2.12.2.orig/help/it/Makefile.in 2005-11-28 20:02:43.000000000 +0100 ++++ eog-2.12.2/help/it/Makefile.in 2005-12-04 21:59:26.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/ja/Makefile.in eog-2.12.2/help/ja/Makefile.in +--- eog-2.12.2.orig/help/ja/Makefile.in 2005-11-28 20:02:43.000000000 +0100 ++++ eog-2.12.2/help/ja/Makefile.in 2005-12-04 21:59:41.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/ko/Makefile.in eog-2.12.2/help/ko/Makefile.in +--- eog-2.12.2.orig/help/ko/Makefile.in 2005-11-28 20:02:44.000000000 +0100 ++++ eog-2.12.2/help/ko/Makefile.in 2005-12-04 21:59:50.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/sv/Makefile.in eog-2.12.2/help/sv/Makefile.in +--- eog-2.12.2.orig/help/sv/Makefile.in 2005-11-28 20:02:44.000000000 +0100 ++++ eog-2.12.2/help/sv/Makefile.in 2005-12-04 21:59:33.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/uk/Makefile.in eog-2.12.2/help/uk/Makefile.in +--- eog-2.12.2.orig/help/uk/Makefile.in 2005-11-28 20:02:44.000000000 +0100 ++++ eog-2.12.2/help/uk/Makefile.in 2005-12-04 21:59:56.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/zh_CN/Makefile.in eog-2.12.2/help/zh_CN/Makefile.in +--- eog-2.12.2.orig/help/zh_CN/Makefile.in 2005-11-28 20:02:45.000000000 +0100 ++++ eog-2.12.2/help/zh_CN/Makefile.in 2005-12-04 22:00:07.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/help/zh_TW/Makefile.in eog-2.12.2/help/zh_TW/Makefile.in +--- eog-2.12.2.orig/help/zh_TW/Makefile.in 2005-11-28 20:02:45.000000000 +0100 ++++ eog-2.12.2/help/zh_TW/Makefile.in 2005-12-04 22:00:15.000000000 +0100 +@@ -443,7 +443,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -451,7 +451,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ +diff -urN eog-2.12.2.orig/omf.make eog-2.12.2/omf.make +--- eog-2.12.2.orig/omf.make 2005-11-28 20:02:33.000000000 +0100 ++++ eog-2.12.2/omf.make 2005-12-04 22:00:21.000000000 +0100 +@@ -45,7 +45,7 @@ + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ +@@ -53,7 +53,7 @@ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ + done + -rmdir $(DESTDIR)$(omf_dest_dir) +- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++ #-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + clean-local-omf: + -for file in $(omffile); do \ --- eog-2.14.1.orig/debian/patches/01_lpi.patch +++ eog-2.14.1/debian/patches/01_lpi.patch @@ -0,0 +1,46 @@ +diff -Nur eog-2.13.2.orig/configure.in eog-2.13.2/configure.in +--- eog-2.13.2.orig/configure.in 2005-11-06 15:57:59.000000000 +0100 ++++ eog-2.13.2/configure.in 2005-11-13 21:18:05.000000000 +0100 +@@ -52,7 +52,7 @@ + + dnl ================= gnome libs check ==================================== + +-EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libart-2.0 >= $LIBART_REQUIRED libgnomeprintui-2.2 libgnomeprint-2.2 gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED" ++EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libart-2.0 >= $LIBART_REQUIRED libgnomeprintui-2.2 libgnomeprint-2.2 gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED" + + dnl ============== optional exif support ==================== + +diff -Nur eog-2.13.2.orig/shell/eog-gtk-ui.xml eog-2.13.2/shell/eog-gtk-ui.xml +--- eog-2.13.2.orig/shell/eog-gtk-ui.xml 2005-11-13 17:17:12.000000000 +0100 ++++ eog-2.13.2/shell/eog-gtk-ui.xml 2005-11-13 21:17:23.000000000 +0100 +@@ -52,6 +52,9 @@ + + + ++ ++ ++ + + + +diff -Nur eog-2.13.2.orig/shell/eog-window.c eog-2.13.2/shell/eog-window.c +--- eog-2.13.2.orig/shell/eog-window.c 2005-11-13 20:01:31.000000000 +0100 ++++ eog-2.13.2/shell/eog-window.c 2005-11-13 21:17:23.000000000 +0100 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "eog-window.h" + #include "util.h" + #include "zoom.h" +@@ -3453,6 +3454,9 @@ + if (merge_id == 0) + return FALSE; + ++ launchpad_integration_add_ui (priv->ui_mgr, ++ "/MainMenu/HelpMenu/LaunchpadItems"); ++ + /* show menu tooltips in the statusbar */ + g_signal_connect (priv->ui_mgr, "connect_proxy", + G_CALLBACK (connect_proxy_cb), window); --- eog-2.14.1.orig/debian/patches/02_autoconf.patch +++ eog-2.14.1/debian/patches/02_autoconf.patch @@ -0,0 +1,606 @@ +diff -Nur eog-2.13.2.orig/configure eog-2.13.2/configure +--- eog-2.13.2.orig/configure 2005-11-13 20:06:32.000000000 +0100 ++++ eog-2.13.2/configure 2005-11-13 21:19:51.000000000 +0100 +@@ -1003,7 +1003,7 @@ + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -2401,8 +2401,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2460,8 +2459,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2577,8 +2575,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2632,8 +2629,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2678,8 +2674,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2723,8 +2718,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2976,8 +2970,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3031,8 +3024,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3347,8 +3339,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3609,8 +3600,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3678,8 +3668,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3824,8 +3813,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3896,8 +3884,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4041,8 +4028,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4100,8 +4086,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4198,8 +4183,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4278,8 +4262,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4343,8 +4326,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4408,8 +4390,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4486,8 +4467,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4551,8 +4531,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4668,8 +4647,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4836,8 +4814,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4970,8 +4947,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5056,8 +5032,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5566,8 +5541,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5648,7 +5622,7 @@ + + + +-EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libart-2.0 >= $LIBART_REQUIRED libgnomeprintui-2.2 libgnomeprint-2.2 gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED" ++EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libart-2.0 >= $LIBART_REQUIRED libgnomeprintui-2.2 libgnomeprint-2.2 gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED" + + + +@@ -5946,8 +5920,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6071,8 +6044,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6384,9 +6356,12 @@ + esac + + if test $pango_omitted_x_deps = yes ; then +- echo "$as_me:$LINENO: checking for X" >&5 ++ ++if test "x$ac_path_x_has_been_run" != xyes; then ++ echo "$as_me:$LINENO: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + ++ac_path_x_has_been_run=yes + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -6479,7 +6454,7 @@ + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for a specified header file. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -6487,7 +6462,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -6514,7 +6489,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -6528,18 +6503,18 @@ + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" ++ LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -6553,8 +6528,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6578,7 +6552,7 @@ + do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do +- if test -r $ac_dir/libXt.$ac_extension; then ++ if test -r $ac_dir/libX11.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 + fi +@@ -6614,10 +6588,15 @@ + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 ++ # It might be that x_includes is empty (headers are found in the ++ # standard search path. Then output the corresponding message ++ ac_out_x_includes=$x_includes ++ test "x$x_includes" = x && ac_out_x_includes="in standard search path" ++ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + fi + ++fi + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +@@ -6665,8 +6644,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6717,8 +6695,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6794,8 +6771,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6850,8 +6826,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6919,8 +6894,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7028,8 +7002,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7093,8 +7066,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7162,8 +7134,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7267,8 +7238,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7332,8 +7302,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7430,8 +7399,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7495,8 +7463,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7593,8 +7560,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7658,8 +7624,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7738,8 +7703,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7819,8 +7783,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8008,8 +7971,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8081,8 +8043,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9099,11 +9060,6 @@ + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -9142,6 +9098,12 @@ + fi;; + esac + done` || { (exit 1); exit 1; } ++ ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub --- eog-2.14.1.orig/debian/patches/03_hide_menu_item.patch +++ eog-2.14.1/debian/patches/03_hide_menu_item.patch @@ -0,0 +1,11 @@ +diff -Nur eog-2.13.2.orig/eog.desktop.in.in eog-2.13.2/eog.desktop.in.in +--- eog-2.13.2.orig/eog.desktop.in.in 2005-10-28 16:26:04.000000000 +0200 ++++ eog-2.13.2/eog.desktop.in.in 2005-11-13 21:15:20.000000000 +0100 +@@ -5,6 +5,7 @@ + TryExec=eog + Exec=eog %U + Icon=image-viewer.png ++NoDisplay=true + StartupNotify=true + Terminal=false + Type=Application --- eog-2.14.1.orig/debian/patches/07_from_cvs_set_progressbar_height.patch +++ eog-2.14.1/debian/patches/07_from_cvs_set_progressbar_height.patch @@ -0,0 +1,26 @@ +=================================================================== +RCS file: /cvs/gnome/eog/shell/eog-statusbar.c,v +retrieving revision 1.1 +retrieving revision 1.1.8.1 +diff -u -r1.1 -r1.1.8.1 +--- eog-statusbar.c 2005/07/02 01:37:32 1.1 ++++ eog/shell/eog-statusbar.c 2006/05/19 17:24:24 1.1.8.1 +@@ -66,6 +66,8 @@ + static void + eog_statusbar_init (EogStatusbar *statusbar) + { ++ GtkRequisition requisition; ++ + statusbar->priv = EOG_STATUSBAR_GET_PRIVATE (statusbar); + + gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (statusbar), FALSE); +@@ -86,6 +88,9 @@ + statusbar->priv->progressbar, + FALSE, TRUE, 0); + gtk_widget_hide (statusbar->priv->progressbar); ++ ++ gtk_widget_set_size_request (statusbar->priv->progressbar, ++ -1, 10); + } + + GtkWidget * --- eog-2.14.1.orig/debian/patches/05_from_cvs_respect_save_to_disk_lockdown_key.patch +++ eog-2.14.1/debian/patches/05_from_cvs_respect_save_to_disk_lockdown_key.patch @@ -0,0 +1,62 @@ +=================================================================== +RCS file: /cvs/gnome/eog/libeog/eog-config-keys.h,v +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -r1.6 -r1.7 +--- eog-config-keys.h 2005/11/13 18:25:08 1.6 ++++ eog/libeog/eog-config-keys.h 2006/05/18 03:51:28 1.7 +@@ -3,6 +3,8 @@ + + #define EOG_CONF_DIR "/apps/eog" + ++#define EOG_CONF_DESKTOP_CAN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk" ++ + #define EOG_CONF_VIEW_DIR "/apps/eog/view" + #define EOG_CONF_VIEW_INTERPOLATE "/apps/eog/view/interpolate" + #define EOG_CONF_VIEW_TRANSPARENCY "/apps/eog/view/transparency" +=================================================================== +RCS file: /cvs/gnome/eog/shell/eog-window.c,v +retrieving revision 1.189 +retrieving revision 1.190 +diff -u -r1.189 -r1.190 +--- eog-window.c 2006/03/27 01:29:14 1.189 ++++ eog/shell/eog-window.c 2006/05/18 03:51:28 1.190 +@@ -2655,8 +2655,11 @@ + int n_images = 0; + gboolean show_info_pane = TRUE; + gboolean show_image_collection = FALSE; ++ gboolean save_disabled = FALSE; + GtkAction *action_fscreen; + GtkAction *action_sshow; ++ GtkAction *action_save; ++ GtkAction *action_save_as; + + g_return_if_fail (EOG_IS_WINDOW (window)); + +@@ -2668,8 +2671,12 @@ + + action_fscreen = gtk_action_group_get_action (priv->actions_image, "ViewFullscreen"); + action_sshow = gtk_action_group_get_action (priv->actions_image, "ViewSlideshow"); ++ action_save = gtk_action_group_get_action (priv->actions_image, "FileSave"); ++ action_save_as = gtk_action_group_get_action (priv->actions_image, "FileSaveAs"); + g_assert (action_fscreen != NULL); + g_assert (action_sshow != NULL); ++ g_assert (action_save != NULL); ++ g_assert (action_save_as != NULL); + + if (n_images == 0) { + /* update window content */ +@@ -2736,6 +2743,13 @@ + + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_info_pane); + } ++ ++ save_disabled = gconf_client_get_bool (priv->client, EOG_CONF_DESKTOP_CAN_SAVE, NULL); ++ ++ if (save_disabled) { ++ gtk_action_set_sensitive (action_save, FALSE); ++ gtk_action_set_sensitive (action_save_as, FALSE); ++ } + } + + static void --- eog-2.14.1.orig/debian/patches/06_from_cvs_partial_fix_slideshow_canceling_crasher.patch +++ eog-2.14.1/debian/patches/06_from_cvs_partial_fix_slideshow_canceling_crasher.patch @@ -0,0 +1,32 @@ +=================================================================== +RCS file: /cvs/gnome/eog/libeog/eog-full-screen.c,v +retrieving revision 1.34 +retrieving revision 1.34.2.1 +diff -u -r1.34 -r1.34.2.1 +--- eog-full-screen.c 2006/03/02 19:14:51 1.34 ++++ libeog/eog-full-screen.c 2006/05/21 04:51:55 1.34.2.1 +@@ -538,6 +538,11 @@ + } + + if (do_hide) { ++ cancel_load_by_iter (priv->list, priv->preload); ++ if (priv->preload != NULL) { ++ g_free (priv->preload); ++ priv->preload = NULL; ++ } + gtk_widget_hide (widget); + } + +@@ -692,6 +697,12 @@ + EogImage *current_img; + EogImage *preload_img; + ++ if (eog_job_get_status (job) == EOG_JOB_STATUS_CANCELED) { ++ g_object_set_qdata (G_OBJECT (image), JOB_ID_QUARK, NULL); ++ eog_image_data_unref (image); ++ return; ++ } ++ + if (eog_job_get_success (job)) + eog_image_cache_add (priv->cache, image); + --- eog-2.14.1.orig/debian/copyright +++ eog-2.14.1/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Guilherme de S. Pastore on +Mon, 8 Aug 2005 22:14:55 -0300. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/eog/ + +Upstream Authors: Tim Gerla + Philip Van Hoof + Paolo Borelli + Jens Finke + Federico Mena Quintero + Arik Devens + Michael Meeks + Martin Baulig + +Copyright: + +Copyright (C) 2000-2004 The Free Software Foundation + +License: + + 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + On Debian Systems, the full text of the license can be found on + /usr/share/common-licenses/GPL