Update to 2.6.0. Changes since previous stable branch (2.4.x):

Version 2.6.0
-------------
* General:
   - Fileselector opens non local URIs (Seth Nickell)
   - Italian documentation update (Lucca Feretti)
* Translation Updates:
  Andras Timar (hu), Arafat Medini (ar), Baris Cicek (tr), Dmitry G.
  Mastrukov (ru), Gareth Owen (en_GB), Guntupalli Karunakar (pa),
  Stanislav Visnovsky (sk), Telsa Gwynne (cy)

Version 2.5.91
--------------
* Translation Updates:
  Abel Cheung (zh_TW), Alastair McKinstry (ga),
  Alexander Winston (en_CA), Dafydd Harries (cy), Dinesh Nadarajah (ta),
  Francisco Javier F. Serrador (es), Gustavo Maciel Dias Vieira (pt_BR),
  Leonid Kanter (ru), Maxim Dziumanenko (uk), Miloslav Trmac (cs),
  Robert Sedak (hr), Sanlig Badral (mn), Sayamindu Dasgupta (bn)

Version 2.5.90
--------------
* General:
   - Documentation updates (Breda McColgan)
   - Translation markup fix (Ole Laursen) - #119170
   - File Selection fixes (Jan Arne Peterson, Jonathan Blandford,
     Jens) - #128396, #135816
* Collection:
   - New busy icon, borrowed from nautilus. - #134981
   - Thumbnail layout fixes.
* Translation Updates:
  Alastair McKinstry (ga), Ales Nyakhaychyk (be),
  Alessio Frusciante (it), Changwoo Ryu (ko), Christophe Merlet (fr),
  Duarte Loreto (pt), Francisco Javier F. Serrador (es), Guntupalli
  Karunakar (hi), Jarkko Ranta (fi), Jordi Mallach (ca),
  Kjartan Maraas (no), Kostas Papadimas (el), Miloslav Trmac (cs),
  Mugurel Tudor (ro), Mətin Əmirov (az), Ole Laursen (da),
  Paisa Seeluangsawat (th), Priit Laes (et), Takeshi AIHANA (ja),
  Vincent van Adrighem (nl), Yuriy Syrota (uk), Žygimantas Beručka (lt)

Version 2.5.6
-------------
* General:
   - Updated documentation (Breda McColgan)
   - Typo fixes (Alessio Frusciante)
   - AIX compilation fixes
   - Recent files update
* Collection:
   - Marked forgotten string for translation (Danilo Šegan)
* Translation Updates:
  Artur Flinta (pl), Christian Rose (sv), Danilo Šegan (sr),
  Francisco Javier F. Serrador (es), Hasbullah Bin Pit (ms),
  Jarkko Ranta (fi), Jens Finke (de), Kostas Papadimas (el),
  Laurent Dhima (sq), Miloslav Trmac (cs), Takeshi AIHANA (ja),
  Åsmund Skjæveland (nn)

Versino 2.5.5
-------------
* General:
  - Don't force file selector window size.
* Collection:
  - Save scroll position in exif data, when switching images.
    Fixes #123463.
* Translation Updates:
  Alastair McKinstry (ga), Arafat Medini (ar), Changwoo Ryu (ko),
  Christian Rose (sv), Danilo Šegan (sr, sr@Latn), Francisco
  Javier F. Serrador (es), Hasbullah Bin Pit (ms), Laurent Dhima (sq),
  Mətin Əmirov (az), Nikos Charonitakis (el), Takeshi AIHANA (ja),
  Vincent van Adrighem (nl)

Version 2.5.4
-------------
* General:
  - Recent files update (Jason Leach)
  - Compile fixes - #131766 (German Poo Caaman~o)
  - Crash fix for filenames with ':' - #130726
  - Close file dialog on cancel in all cases - #131654
    (Balamurali Viswanathan)
* Collection:
  - Display name of the directory shown - #132263
  - Fixed memory leaks.
  - Mnemonic for "View as Image Collection" in Nautilus - #128796
   (Christian Neumair)
* Translation Updates:
  Changwoo Ryu (ko), Laurent Dhima (sq), Christophe Merlet (fr),
  Miloslav Trmac (cs), Takeshi AIHANA (ja), Kostas Papadimas (el),
  Robert Sedak (hr), Sanlig Badral (mn), Jens Finke (de),
  Artur Flinta (pl), Vincent van Adrighem (nl), Francisco Javier F.
  Serrador (es), Žygimantas Beručka (lt), Duarte Loreto (pt),
  Ole Laursen (da), Hasbullah Bin Pit (ms), Kjartan Maraas (no),
  Andras Timar (hu), Mətin Əmirov (az), Åsmund Skjæveland (nn),
  Danilo Šegan (sr)

Version 2.5.3
-------------
* General:
  - Preview of images in the fileselector if an thumbnail
    already exists.
  - 'eog *.jpg' works again and give you a nice collection view
  - Handle spaces in filenames.
* Translation Updates:
  Žygimantas Beručka (lt), Miloslav Trmac (cs), Francisco Javier
  F. Serrador (es), Taneem Ahmed (bn), Danilo Šegan (sr, sr@Latn),
  Robert Sedak (hr), Duarte Loreto (pt), Christophe Merlet (fr),
  Åsmund Skjæveland (nn), Laurent Dhima (sq), Jordi
  Mallach (ca), Roozbeh Pournader (fa), Kjartan Maraas (no),
  Artur Flinta (pl), Arafat Medini (ar)

Version 2.5.2.1
---------------
* General:
  - Intltool build fix (#130062)
* Collection:
  - Indicate modified images by bold caption
  - Better caption wrapping
* Translation Updates:
   Laurent Dhima (sq), Gustavo Noronha Silva (pt_BR),
   Takeshi AIHANA (ja), Miloslav Trmac (cs),
   Åsmund Skjæveland (nn), Duarte Loreto (pt),
   Artur Flinta (pl)

Version 2.5.2
-------------
* General:
  - Use new GTK file chooser (Jan Arne Petersen)
  - Compilation fixes (Kaushal Kumar)
  - Build fix (Thomas Vander Stichele)
  - Multiple save-issues fixed
  - Fullscreen mode crash fixed
  - 0-byte file issue fixed
* Collection:
  - Show only image files, which can actully loaded by GdkPixbuf
* Translation Updates:
  Jens Finke (de), Danilo Šegan (sr, sr@Latn), Francisco Javier
  F. Serrador (sp), Miloslav Trmac (cs), Kjartan Maraas (no),
  Changwoo Ryu (ko), Takeshi AIHANA (jp), Arafat Medini (ar),
  Vincent van Adrighem (nl), Laurent Dhima (sq), Kjartan Maraas (no)

Version 2.5.1
-------------
* General:
  - Support lossless saving of jpeg files (Jens)
* Collection:
  - Select last viewed slideshow image when returning from fullscreen
    (Jens) - #118617
* Viewer:
  - Display image file size (Jens)
  - Ask user before overwriting files (pasupathi.duraisamy@wipro.com)
    #119469
* Translation Updates:
  Laurent Dhima (sq), Paisa Seeluangsawat (th), Vincent van Adrighem
  (nl), Miloslav Trmac (cs), Žygimantas Beručka (lt), Danilo Šegan
   Šegan (sr), Ole Laursen (da), Jordi Mallach (ca), Kostas Papadimas
  (el), Francisco Javier F. Serrador (es)

Version 2.5.0.1
---------------
* General:
  - Cache recently loaded images.
  - Use exif loader from libexif >= 0.5.12.
  - Reworked image loading status cycle
  - Made fullscreen shortcut key F11 work on Solaris (Shivaram
    Upadhyayula, Jens) - #104805
  - Updated help (Breda McColgan)
* Collection:
  - Don't include auto-generated files in tarball - #125118
  - New model implementation (EogImageList)
  - Mem leak fix
  - Slideshow: automatic switching after user determined timeout.
  - Slideshow: determine upscale status for small images by config
    key.
* Shell:
  - Consider gconf key 'open_new_window' - #91189
  - Tool-/statusbar hiding (Kaushal Kumar, Jens) - #114231

* Translation Updates:
  Danilo Šegan (sr, sr@Latn), Åsmund Skjæveland (nn), Kostas Papadimas (el),
  KAMAGASAKO Masatoshi (ja), Jordi Mallach (ca), Vincent van Adrighem (nl),
  Hasbullah Bin Pit (ms)

Version 2.5.0 (changes since 2.4.0)
-------------
* General:
  - Better filename -> UTF-8 translation - #122671, #117838 (Jens,
    Hidetoshi Tajima)
  - configure switch to disable libexif support
  - Added X-GNOME-DocPath to .desktop file - #124196
* Collection:
  - Fixed crash on shutdown
  - Fixed crash when libexif is not available
  - Fixed duplicate size entries in info view
  - Update image infos on modification
  - Much better thumbnail layout
  - Mark status message for translation
  - Don't show frame around temporary icons
* Translation Updates:
  Pablo Saratxaga (wa), Gustavo Maciel Dias Vieira (pt_BR),
  Žygimantas Beručka (lt), toivo@linux.ee (et), Jordi Mallach (ca),
  Christian Rose (sv), Pablo Gonzalo del Campo (es),
  Vincent van Adrighem (nl), Danilo Šegan (sr), Jens Finke (de)

3 files changed, 20 insertions, 8 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 0d2bba55a5e..915764a984d 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/03/26 02:27:41 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/01 18:54:30 jmmv Exp $
 #
 
-DISTNAME=	eog-2.5.1
-PKGREVISION=	7
+DISTNAME=	eog-2.6.0
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.5/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
diff --git a/graphics/eog2/PLIST b/graphics/eog2/PLIST
index df4c5c58c9a..2630cb10d7f 100644
--- a/graphics/eog2/PLIST
+++ b/graphics/eog2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/12/18 14:18:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/01 18:54:30 jmmv Exp $
 bin/eog
 lib/bonobo/servers/GNOME_EOG.server
 lib/bonobo/servers/GNOME_EOG_Collection.server
@@ -55,6 +55,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/eog.mo
@@ -64,6 +66,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/eog.mo
@@ -80,6 +83,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/eog.mo
@@ -110,6 +114,7 @@ share/omf/eog/eog-sv.omf
 share/omf/eog/eog-zh_CN.omf
 share/omf/eog/eog-zh_TW.omf
 share/pixmaps/eog/down-right.png
+share/pixmaps/eog/loading.png
 share/pixmaps/eog/orient-horizontal.png
 share/pixmaps/eog/orient-vertical.png
 share/pixmaps/eog/right-down.png
@@ -118,7 +123,10 @@ share/pixmaps/eog/stock-rotate-270-16.png
 share/pixmaps/eog/stock-rotate-90-16.png
 share/pixmaps/gnome-eog.png
 @dirrm share/pixmaps/eog
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/eog
+@comment in scrollkeeper: @dirrm share/omf
+@comment in ORBit2: @dirrm share/idl
 @dirrm share/gnome/help/eog/zh_TW/figures
 @dirrm share/gnome/help/eog/zh_TW
 @dirrm share/gnome/help/eog/zh_CN/figures
@@ -140,5 +148,10 @@ share/pixmaps/gnome-eog.png
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
+@comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/eog/glade
 @dirrm share/eog
+@comment in xdg-dirs: @dirrm share/applications
+@comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index b7b2f4d07e0..c7e548fef4a 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/12/18 14:18:16 adam Exp $
+$NetBSD: distinfo,v 1.8 2004/04/01 18:54:30 jmmv Exp $
 
-SHA1 (eog-2.5.1.tar.bz2) = fa05eedee4b4172fe00baabc929ec6ca99f5a5f6
-Size (eog-2.5.1.tar.bz2) = 728430 bytes
+SHA1 (eog-2.6.0.tar.bz2) = cdb5f312ab0b24885e4d74670134cd054bfb4c9d
+Size (eog-2.6.0.tar.bz2) = 809205 bytes
 SHA1 (patch-aa) = b28deb8fdf3b876e0812f2fdaf4db3b98aa99a1b
 SHA1 (patch-ab) = d59b28e78e66406c624968d72cece1ca60a68684