update to 2.22.2

This switches to the gnome-2.22 release branch.

3 files changed, 14 insertions, 13 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index db49ca6c737..a4a1ac8dd68 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2008/03/06 14:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2008/04/15 18:49:00 drochner Exp $
 #
 
-DISTNAME=	file-roller-2.20.3
-PKGREVISION=	2
+DISTNAME=	file-roller-2.22.2
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -37,7 +36,7 @@ BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.4.0
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../sysutils/nautilus/buildlink3.mk"
+#.include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index 50f32ff7de0..d4cb4591cc1 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.26 2007/11/05 19:27:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.27 2008/04/15 18:49:00 drochner Exp $
 bin/file-roller
-lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 libexec/file-roller/isoinfo.sh
 share/applications/file-roller.desktop
 share/file-roller/glade/add-options.glade
@@ -10,6 +9,7 @@ share/file-roller/glade/delete.glade
 share/file-roller/glade/open-with.glade
 share/file-roller/glade/password.glade
 share/file-roller/glade/properties.glade
+share/file-roller/glade/update.glade
 share/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
 share/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png
 share/file-roller/icons/hicolor/16x16/actions/extract-archive.png
@@ -91,6 +91,7 @@ share/icons/hicolor/32x32/apps/file-roller.png
 share/icons/hicolor/scalable/apps/file-roller.svg
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
+share/locale/as/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
 share/locale/be/LC_MESSAGES/file-roller.mo
 share/locale/be@latin/LC_MESSAGES/file-roller.mo
@@ -165,6 +166,8 @@ share/locale/th/LC_MESSAGES/file-roller.mo
 share/locale/tk/LC_MESSAGES/file-roller.mo
 share/locale/tr/LC_MESSAGES/file-roller.mo
 share/locale/uk/LC_MESSAGES/file-roller.mo
+share/locale/ur/LC_MESSAGES/file-roller.mo
+share/locale/ur_PK/LC_MESSAGES/file-roller.mo
 share/locale/vi/LC_MESSAGES/file-roller.mo
 share/locale/xh/LC_MESSAGES/file-roller.mo
 share/locale/zh_CN/LC_MESSAGES/file-roller.mo
@@ -182,7 +185,7 @@ share/omf/file-roller/file-roller-ru.omf
 share/omf/file-roller/file-roller-sv.omf
 share/omf/file-roller/file-roller-uk.omf
 @dirrm share/omf/file-roller
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
@@ -223,4 +226,3 @@ share/omf/file-roller/file-roller-uk.omf
 @dirrm share/file-roller
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm libexec/file-roller
-@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 41ff648866b..ef712588605 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.35 2008/01/11 13:48:22 drochner Exp $
+$NetBSD: distinfo,v 1.36 2008/04/15 18:49:00 drochner Exp $
 
-SHA1 (file-roller-2.20.3.tar.bz2) = b8fce76408a86b0c6d2f45bb5aed5a6ead153f6c
-RMD160 (file-roller-2.20.3.tar.bz2) = fd2657cf7c68df0b1314d4fb831e6e70e901798a
-Size (file-roller-2.20.3.tar.bz2) = 1226251 bytes
+SHA1 (file-roller-2.22.2.tar.bz2) = 0cccbaf829342bb8da607a019d522d593c3a4d48
+RMD160 (file-roller-2.22.2.tar.bz2) = 6e40c761dd3a4e38e41db5b15dc3cc1c23a1365c
+Size (file-roller-2.22.2.tar.bz2) = 1269504 bytes
 SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf