From 58e965e5213c3136c980a567d6210d4e8d1d93b7 Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 5 Nov 2007 19:26:20 +0000 Subject: update to 2.20.1 This switches to the new gnome-2.20 branch. --- archivers/file-roller/Makefile | 7 +++---- archivers/file-roller/PLIST | 22 ++++++++++++++++++---- archivers/file-roller/distinfo | 10 +++++----- archivers/file-roller/patches/patch-aa | 10 +++++----- 4 files changed, 31 insertions(+), 18 deletions(-) (limited to 'archivers/file-roller') diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 4d2bdb0313b..153baaf8794 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:25 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2007/11/05 19:27:29 drochner Exp $ # -DISTNAME= file-roller-2.18.4 -PKGREVISION= 4 +DISTNAME= file-roller-2.20.1 CATEGORIES= archivers gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.18/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.20/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST index 0262e0e552a..50f32ff7de0 100644 --- a/archivers/file-roller/PLIST +++ b/archivers/file-roller/PLIST @@ -1,11 +1,15 @@ -@comment $NetBSD: PLIST,v 1.25 2007/09/25 10:54:09 hira Exp $ +@comment $NetBSD: PLIST,v 1.26 2007/11/05 19:27:29 drochner Exp $ bin/file-roller lib/nautilus/extensions-1.0/libnautilus-fileroller.la libexec/file-roller/isoinfo.sh -libexec/file-roller/move-here.sh share/applications/file-roller.desktop -share/file-roller/glade/ask-password.glade -share/file-roller/glade/file-roller.glade +share/file-roller/glade/add-options.glade +share/file-roller/glade/batch-add-files.glade +share/file-roller/glade/batch-password.glade +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/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 @@ -57,6 +61,12 @@ share/gnome/help/file-roller/nl/figures/file-roller_main_window.png share/gnome/help/file-roller/nl/figures/file-roller_rightarrow.png share/gnome/help/file-roller/nl/figures/file-roller_uparrow.png share/gnome/help/file-roller/nl/file-roller.xml +share/gnome/help/file-roller/oc/figures/file-roller_home.png +share/gnome/help/file-roller/oc/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/oc/figures/file-roller_main_window.png +share/gnome/help/file-roller/oc/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/oc/figures/file-roller_uparrow.png +share/gnome/help/file-roller/oc/file-roller.xml share/gnome/help/file-roller/ru/figures/file-roller_home.png share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png share/gnome/help/file-roller/ru/figures/file-roller_main_window.png @@ -141,6 +151,7 @@ share/locale/pt_BR/LC_MESSAGES/file-roller.mo share/locale/ro/LC_MESSAGES/file-roller.mo share/locale/ru/LC_MESSAGES/file-roller.mo share/locale/rw/LC_MESSAGES/file-roller.mo +share/locale/si/LC_MESSAGES/file-roller.mo share/locale/sk/LC_MESSAGES/file-roller.mo share/locale/sl/LC_MESSAGES/file-roller.mo share/locale/sq/LC_MESSAGES/file-roller.mo @@ -166,6 +177,7 @@ share/omf/file-roller/file-roller-es.omf share/omf/file-roller/file-roller-fr.omf share/omf/file-roller/file-roller-it.omf share/omf/file-roller/file-roller-nl.omf +share/omf/file-roller/file-roller-oc.omf share/omf/file-roller/file-roller-ru.omf share/omf/file-roller/file-roller-sv.omf share/omf/file-roller/file-roller-uk.omf @@ -182,6 +194,8 @@ share/omf/file-roller/file-roller-uk.omf @dirrm share/gnome/help/file-roller/sv @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru +@dirrm share/gnome/help/file-roller/oc/figures +@dirrm share/gnome/help/file-roller/oc @dirrm share/gnome/help/file-roller/nl/figures @dirrm share/gnome/help/file-roller/nl @dirrm share/gnome/help/file-roller/it/figures diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index d84091cfda9..4c986774f7e 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.32 2007/07/13 16:28:39 drochner Exp $ +$NetBSD: distinfo,v 1.33 2007/11/05 19:27:29 drochner Exp $ -SHA1 (file-roller-2.18.4.tar.bz2) = 062ab5f46e4b95a1b55cbcb16c778c4b28c08d75 -RMD160 (file-roller-2.18.4.tar.bz2) = 07dfaeac5618032eb01d10a998b7bc80ed96c6da -Size (file-roller-2.18.4.tar.bz2) = 1175112 bytes -SHA1 (patch-aa) = 7e6773de99b4277874ce5b01530de357848b2d69 +SHA1 (file-roller-2.20.1.tar.bz2) = 34d6ebb8297497ccc7ce585d2a622d94505815bf +RMD160 (file-roller-2.20.1.tar.bz2) = 3bc9c14db78db53f196cfd9a585f25222e760ec0 +Size (file-roller-2.20.1.tar.bz2) = 1223800 bytes +SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa index 610e76962a0..9f34d0a104a 100644 --- a/archivers/file-roller/patches/patch-aa +++ b/archivers/file-roller/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.9 2007/04/11 18:20:38 drochner Exp $ +$NetBSD: patch-aa,v 1.10 2007/11/05 19:27:29 drochner Exp $ ---- data/Makefile.in.orig 2007-03-12 20:26:05.000000000 +0100 +--- data/Makefile.in.orig 2007-09-17 21:40:34.000000000 +0200 +++ data/Makefile.in -@@ -596,7 +596,6 @@ install-data-local: - @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) +@@ -623,7 +623,6 @@ uninstall-hook: update-icon-cache + update-icon-cache: if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ else \ - echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ echo "*** $(gtk_update_icon_cache)"; \ -- cgit v1.2.3