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

version 2.6.0
-------------
	* Updated translations.

version 2.5.7
-------------
	* Fixed bug #137183 (Crash when opening tar-file when using 24 hour
	  time.
  	  format).
	* Updated manual.
	* Added localized manuals for de, es, fr, it, ja, ko, sv,
	  zh_TW, zh_HK, zh_CN.

version 2.5.6
-------------
	* Use a better logic to parse the tar output.
	* Updated to work with the new filechooser api.

version 2.5.5
-------------
	* Use gtar if present, otherwise use tar.
        * Fix the "Zip Objects" command.
	* Remove C++ style comments.
	* Fix bug #133998 (schemas file must not be removed during distclean).
        * Updated manual.
	* Fix the password protected detection code.
	* Handle the delete_event event for the progress dialog.
	* Add a filter for the "save archive" and "new archive" dialogs,
	  simplify the filter for the "open archive" dialog.

version 2.5.4
-------------
	* Fix bug #105739 (Can't open tar.gz files on Solaris).
	* Fix bug #133358 (Small HIG fix for column header).
	* Allow to extract more archives at once with the "Extract Here"
	  command.
	* Use GType instead of guint.  Fixes segfaults on 64-bit architectures.
	* Do not show the new window until we are sure that the archive
          has been opened with success.

version 2.5.3
-------------
	* Simplify the "Load Options" and "Save Options" commands in the
	  Add dialog.
	* Make the path column visible only if the list mode is set to flat.
	* Fix the "Save as" dialog.
	* Updated the recent-files stuff from libegg.
        * Changed Nautilus context menu item to "Zip Objects" and simplied
	  the dialog.
	* Always use a close button in the error dialogs.

version 2.5.2
-------------
	* Replace GtkFileSelection with GtkFileChooser everywhere.
	* Use gnome_url_show instead of calling nautilus explicitly.
	* Do not use mkdtemp which does not exist on Solaris9.
	* Do not destroy the file selector is the archive was not created
          successfully.
	* Do not add the password argument if the password is an empty string.
	* Use the stock system for the commands Add, Extract and View.
        * Updated the egg_recent stuff.
	* Changed name to "Zip Creator" and category to System Utility.
        * The preferences dialog has been removed.
        * The add dialog has been simplyfied.
        * The extract dialog is a GtkFileChooser in folder mode now.

version 2.5.1
-------------
	* Fix crash upon LZH file opening (#129794).

version 2.5.0
-------------
        * Added unstuff and RPM support.
	* Added ability to rename files and folders.
	* Added Cut/Copy/Paste operations.
 	* Add files and folders to the current directory.
	* Added ability to go back and forward in location history.
        * Open the archive in a new window if the current window already has
          an archive opened.
	* Exit closes only the current window instead of closing all the
          windows.
	* Zip archives: ask to enter a password if the archive is password
          protected.
	* Remember extraction dialog options.
        * Substitute "Extract To.." with "Extract Here" in the Nautilus
          context menu.

5 files changed, 108 insertions, 58 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 3e2e142f40f..dc44e3516d4 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2004/03/26 02:27:34 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/01 18:56:04 jmmv Exp $
 #
 
-DISTNAME=	file-roller-2.4.4
-PKGREVISION=	5
+DISTNAME=	file-roller-2.6.0
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.6/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://fileroller.sourceforge.net/
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index b8f0320f0fd..dc5a590c387 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/01/05 21:59:46 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/01 18:56:04 jmmv Exp $
 bin/file-roller
 lib/bonobo/libfile-roller-component.a
 lib/bonobo/libfile-roller-component.la
@@ -9,22 +9,57 @@ share/applications/file-roller.desktop
 share/file-roller/glade/file_roller.glade
 share/file-roller/glade/file_roller_prop.glade
 share/gconf/schemas/file-roller.schemas
+share/gnome/help/file-roller/C/figures/file-roller_home.png
+share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_main_window.png
+share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/C/file-roller.xml
 share/gnome/help/file-roller/C/legal.xml
+share/gnome/help/file-roller/de/figures/file-roller_main_window.png
+share/gnome/help/file-roller/de/file-roller.xml
+share/gnome/help/file-roller/de/legal.xml
+share/gnome/help/file-roller/es/figures/file-roller_main_window.png
+share/gnome/help/file-roller/es/file-roller.xml
+share/gnome/help/file-roller/es/legal.xml
+share/gnome/help/file-roller/fr/figures/file-roller_main_window.png
+share/gnome/help/file-roller/fr/file-roller.xml
+share/gnome/help/file-roller/fr/legal.xml
+share/gnome/help/file-roller/it/figures/file-roller_main_window.png
+share/gnome/help/file-roller/it/file-roller.xml
+share/gnome/help/file-roller/it/legal.xml
+share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
+share/gnome/help/file-roller/ja/file-roller.xml
+share/gnome/help/file-roller/ja/legal.xml
+share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
+share/gnome/help/file-roller/ko/file-roller.xml
+share/gnome/help/file-roller/ko/legal.xml
 share/gnome/help/file-roller/ru/figures/fr-add-dialog.png
 share/gnome/help/file-roller/ru/figures/fr-extract.png
 share/gnome/help/file-roller/ru/figures/fr-mainwindow.png
 share/gnome/help/file-roller/ru/figures/fr-prefs.png
 share/gnome/help/file-roller/ru/file-roller.xml
 share/gnome/help/file-roller/ru/legal.xml
+share/gnome/help/file-roller/sv/figures/file-roller_main_window.png
+share/gnome/help/file-roller/sv/file-roller.xml
+share/gnome/help/file-roller/sv/legal.xml
 share/gnome/help/file-roller/uk/figures/fr-add-dialog.png
 share/gnome/help/file-roller/uk/figures/fr-extract.png
 share/gnome/help/file-roller/uk/figures/fr-mainwindow.png
 share/gnome/help/file-roller/uk/figures/fr-prefs.png
 share/gnome/help/file-roller/uk/file-roller.xml
 share/gnome/help/file-roller/uk/legal.xml
+share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_CN/file-roller.xml
+share/gnome/help/file-roller/zh_CN/legal.xml
+share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_HK/file-roller.xml
+share/gnome/help/file-roller/zh_HK/legal.xml
+share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_TW/file-roller.xml
+share/gnome/help/file-roller/zh_TW/legal.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/file-roller.mo
@@ -35,6 +70,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/file-roller.mo
@@ -44,6 +80,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/file-roller.mo
@@ -60,6 +97,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/file-roller.mo
@@ -70,6 +108,7 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/file-roller.mo
@@ -81,24 +120,55 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/file-roller.mo
 share/mime-info/file-roller.keys
 share/mime-info/file-roller.mime
 share/omf/file-roller/file-roller-C.omf
+share/omf/file-roller/file-roller-de.omf
+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-ja.omf
+share/omf/file-roller/file-roller-ko.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
+share/omf/file-roller/file-roller-zh_CN.omf
+share/omf/file-roller/file-roller-zh_HK.omf
+share/omf/file-roller/file-roller-zh_TW.omf
 share/pixmaps/file-roller.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/file-roller
 @comment in scrollkeeper: @dirrm share/omf
-@comment in gnome-dirs: @dirrm share/mime-info
+@comment in xdg-dirs: @dirrm share/mime-info
+@dirrm share/gnome/help/file-roller/zh_TW/figures
+@dirrm share/gnome/help/file-roller/zh_TW
+@dirrm share/gnome/help/file-roller/zh_HK/figures
+@dirrm share/gnome/help/file-roller/zh_HK
+@dirrm share/gnome/help/file-roller/zh_CN/figures
+@dirrm share/gnome/help/file-roller/zh_CN
 @dirrm share/gnome/help/file-roller/uk/figures
 @dirrm share/gnome/help/file-roller/uk
+@dirrm share/gnome/help/file-roller/sv/figures
+@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/ko/figures
+@dirrm share/gnome/help/file-roller/ko
+@dirrm share/gnome/help/file-roller/ja/figures
+@dirrm share/gnome/help/file-roller/ja
+@dirrm share/gnome/help/file-roller/it/figures
+@dirrm share/gnome/help/file-roller/it
+@dirrm share/gnome/help/file-roller/fr/figures
+@dirrm share/gnome/help/file-roller/fr
+@dirrm share/gnome/help/file-roller/es/figures
+@dirrm share/gnome/help/file-roller/es
+@dirrm share/gnome/help/file-roller/de/figures
+@dirrm share/gnome/help/file-roller/de
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller
-@comment in gnome-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/file-roller/glade
 @dirrm share/file-roller
-@comment in gnome2-dirs: @dirrm share/applications
-@comment in gnome2-dirs: @dirrm share/application-registry
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry
 @comment in libbonobo: @dirrm lib/bonobo/servers
 @comment in libbonobo: @dirrm lib/bonobo
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 374e0878fc5..aba3fb7a50c 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2004/02/10 11:52:05 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/04/01 18:56:04 jmmv Exp $
 
-SHA1 (file-roller-2.4.4.tar.gz) = ba60bc2240ccda621dc8a9003c8407778d31a7fa
-Size (file-roller-2.4.4.tar.gz) = 1118488 bytes
-SHA1 (patch-aa) = cad25eaa8080edf1f148e8cec186235895e75490
-SHA1 (patch-ab) = b6f2ee00e38b648728610c0bccc297143d03493d
+SHA1 (file-roller-2.6.0.tar.bz2) = d2133fc45c008513eef4f8b275c060a37bed2407
+Size (file-roller-2.6.0.tar.bz2) = 1241766 bytes
+SHA1 (patch-aa) = 19a6c63c0b943a40c0b2e91fbad4fde54566f5fd
+SHA1 (patch-ab) = 849a501e0bb6b3babc6a1247945c81ba1310e274
diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa
index c1b56526a6d..492b84b0096 100644
--- a/archivers/file-roller/patches/patch-aa
+++ b/archivers/file-roller/patches/patch-aa
@@ -1,40 +1,20 @@
-$NetBSD: patch-aa,v 1.1 2004/02/10 11:52:05 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/01 18:56:04 jmmv Exp $
 
---- src/fr-command-tar.c.orig	2004-01-26 12:31:55.000000000 +0100
+--- src/fr-command-tar.c.orig	2004-03-08 10:20:07.000000000 +0100
 +++ src/fr-command-tar.c
-@@ -177,7 +177,7 @@ fr_command_tar_list (FRCommand *comm)
- 				      comm);
- 
- 	fr_process_clear (comm->process);
--	fr_process_begin_command (comm->process, "tar");
-+	fr_process_begin_command (comm->process, FILEROLLER_TAR);
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-tvf");
- 	fr_process_add_arg (comm->process, comm->e_filename);
-@@ -235,7 +235,7 @@ fr_command_tar_add (FRCommand     *comm,
- 				      process_line__add,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "tar");
+@@ -294,14 +294,7 @@ add_compress_arg (FRCommand *comm)
+ static void
+ begin_tar_command (FRCommand *comm)
+ {
+-	char *path = NULL;
+-
+-	path = g_find_program_in_path ("gtar");
+-	if (path != NULL)
+-		fr_process_begin_command (comm->process, "gtar");
+-	else
+-		fr_process_begin_command (comm->process, "tar");
+-	g_free (path);
 +	fr_process_begin_command (comm->process, FILEROLLER_TAR);
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-v");
+ }
  
-@@ -286,7 +286,7 @@ fr_command_tar_delete (FRCommand *comm,
- 				      process_line__delete,
- 				      comm);
  
--	fr_process_begin_command (comm->process, "tar");
-+	fr_process_begin_command (comm->process, FILEROLLER_TAR);
- 	fr_process_set_begin_func (comm->process, begin_func__delete, comm);
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-v");
-@@ -323,7 +323,7 @@ fr_command_tar_extract (FRCommand  *comm
- 				      process_line__extract,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "tar");
-+	fr_process_begin_command (comm->process, FILEROLLER_TAR);
- 	fr_process_add_arg (comm->process, "--force-local");
- 	fr_process_add_arg (comm->process, "-v");
- 	fr_process_add_arg (comm->process, "-xf");
diff --git a/archivers/file-roller/patches/patch-ab b/archivers/file-roller/patches/patch-ab
index 711136adeb2..4940d0eeb04 100644
--- a/archivers/file-roller/patches/patch-ab
+++ b/archivers/file-roller/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2004/02/10 11:52:05 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/01 18:56:04 jmmv Exp $
 
---- src/fr-command-zip.c.orig	2004-01-26 12:31:55.000000000 +0100
+--- src/fr-command-zip.c.orig	2004-03-08 10:20:07.000000000 +0100
 +++ src/fr-command-zip.c
-@@ -221,7 +221,7 @@ fr_command_zip_list (FRCommand *comm)
+@@ -225,7 +225,7 @@ fr_command_zip_list (FRCommand *comm)
+ 				      list__process_line,
  				      comm);
  
- 	fr_process_clear (comm->process);
 -	fr_process_begin_command (comm->process, "unzip");
 +	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
  	fr_process_add_arg (comm->process, "-qq");
  	fr_process_add_arg (comm->process, "-v");
  	fr_process_add_arg (comm->process, "-l");
-@@ -264,7 +264,7 @@ fr_command_zip_add (FRCommand     *comm,
+@@ -268,7 +268,7 @@ fr_command_zip_add (FRCommand     *comm,
  				      process_line__common,
  				      comm);
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1 2004/02/10 11:52:05 jmmv Exp $
  
  	if (base_dir != NULL) 
  		fr_process_set_working_dir (comm->process, base_dir);
-@@ -310,7 +310,7 @@ fr_command_zip_delete (FRCommand *comm,
+@@ -314,7 +314,7 @@ fr_command_zip_delete (FRCommand *comm,
  				      process_line__common,
  				      comm);
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.1 2004/02/10 11:52:05 jmmv Exp $
  	fr_process_add_arg (comm->process, "-d");
  	add_filename_arg (comm);
  
-@@ -339,7 +339,7 @@ fr_command_zip_extract (FRCommand  *comm
+@@ -343,7 +343,7 @@ fr_command_zip_extract (FRCommand  *comm
  				      process_line__common,
  				      comm);
  
@@ -38,12 +38,12 @@ $NetBSD: patch-ab,v 1.1 2004/02/10 11:52:05 jmmv Exp $
  	
  	if (dest_dir != NULL) {
  		char *e_dest_dir = shell_escape (dest_dir);
-@@ -377,7 +377,7 @@ static void
+@@ -381,7 +381,7 @@ static void
  fr_command_zip_test (FRCommand   *comm,
  		     const char  *password)
  {
 -	fr_process_begin_command (comm->process, "unzip");
 +	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
  	fr_process_add_arg (comm->process, "-t");
- 	add_password_arg (comm, password);
+ 	add_password_arg (comm, password, TRUE);
  	add_filename_arg (comm);