Changes 2.5.1:

  - Support lossless saving of jpeg files
  - Select last viewed slideshow image when returning from fullscreen
  - Display image file size
  - Ask user before overwriting files
  - Translation Updates

4 files changed, 42 insertions, 22 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index c48615ad5e1..eb05dbcf0e8 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2003/12/15 00:00:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2003/12/18 14:18:16 adam Exp $
 #
 
-DISTNAME=		eog-2.4.1
-CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/2.4/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	eog-2.5.1
+CATEGORIES=	graphics gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.5/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Eye of GNOME: an image viewing and cataloging program
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.gnome.org/
+COMMENT=	Eye of GNOME: an image viewing and cataloging program
 
 BUILD_USES_MSGFMT=	YES
 DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
@@ -21,19 +21,19 @@ USE_PKGLOCALEDIR=	YES
 
 GCONF2_SCHEMAS= 	eog.schemas
 
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../print/libgnomeprint/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/schemas.mk"
+.include "../../devel/eel2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/libbonoboui/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/eel2/buildlink2.mk"
-.include "../../graphics/libexif/buildlink2.mk"
-.include "../../graphics/librsvg2/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/libexif/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
+.include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../print/libgnomeprintui/buildlink2.mk"
+.include "../../print/libgnomeprint/buildlink2.mk"
+.include "../../textproc/intltool/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/eog2/PLIST b/graphics/eog2/PLIST
index 21b203bc735..df4c5c58c9a 100644
--- a/graphics/eog2/PLIST
+++ b/graphics/eog2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/25 16:59:25 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/12/18 14:18:16 adam Exp $
 bin/eog
 lib/bonobo/servers/GNOME_EOG.server
 lib/bonobo/servers/GNOME_EOG_Collection.server
@@ -51,6 +51,7 @@ ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/eog.mo
+${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
@@ -62,6 +63,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/eog.mo
 ${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/hu/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/eog.mo
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index d3fea3ba44f..b7b2f4d07e0 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2003/12/15 00:00:25 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2003/12/18 14:18:16 adam Exp $
 
-SHA1 (eog-2.4.1.tar.bz2) = 6d38684c85620c101cf1c99ed54eb558d252e59f
-Size (eog-2.4.1.tar.bz2) = 696930 bytes
+SHA1 (eog-2.5.1.tar.bz2) = fa05eedee4b4172fe00baabc929ec6ca99f5a5f6
+Size (eog-2.5.1.tar.bz2) = 728430 bytes
 SHA1 (patch-aa) = b28deb8fdf3b876e0812f2fdaf4db3b98aa99a1b
+SHA1 (patch-ab) = d59b28e78e66406c624968d72cece1ca60a68684
diff --git a/graphics/eog2/patches/patch-ab b/graphics/eog2/patches/patch-ab
new file mode 100644
index 00000000000..e644947f15a
--- /dev/null
+++ b/graphics/eog2/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2003/12/18 14:18:16 adam Exp $
+
+--- configure.orig	2003-12-08 18:54:07.000000000 +0000
++++ configure
+@@ -4388,9 +4388,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+ 
+ # Use the tools built into the package, not the ones that are installed.
+ 
+-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
++INTLTOOL_EXTRACT='${PREFIX}/bin/intltool-extract'
++INTLTOOL_MERGE='${PREFIX}/bin/intltool-merge'
++INTLTOOL_UPDATE='${PREFIX}/bin/intltool-update'
+ 
+ 
+