Merge lp:~gilir/file-roller/fix-lp-705698 into lp:~ubuntu-desktop/file-roller/ubuntu

[Julien Lavergne]

This change fix the previous update, which introduce a regression.
See bug #705698 for detail
Update with upstream fix.

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-17 23:23:11 +0000
+++ debian/changelog	2011-02-11 20:34:15 +0000
@@ -1,3 +1,10 @@
+file-roller (2.32.1-0ubuntu3) natty; urgency=low
+
+  * debian/patches/91_zip_command_order.patch:
+   - From upstream, correctly set the order of arguments (LP: #705698)
+
+ -- Julien Lavergne <[e-mail]>  Sun, 23 Jan 2011 22:55:45 +0100
+
 file-roller (2.32.1-0ubuntu2) natty; urgency=low
 
   * debian/rules:

=== added file 'debian/patches/91_zip_command_order.patch'
--- debian/patches/91_zip_command_order.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/91_zip_command_order.patch	2011-02-11 20:34:15 +0000
@@ -0,0 +1,56 @@
+From 28436ba1c76541e29d930c3ee8e29805ac09259c Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <[e-mail]>
+Date: Fri, 11 Feb 2011 19:22:17 +0000
+Subject: zip: fixed -- position for the extraction command, added for list and test
+
+[bug #639664]
+---
+diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
+index 32c4410..8be5a1b 100644
+--- a/src/fr-command-zip.c
++++ b/src/fr-command-zip.c
+@@ -189,6 +189,7 @@ fr_command_zip_list (FrCommand  *comm)
+ 	fr_process_begin_command (comm->process, "unzip");
+ 	fr_process_set_begin_func (comm->process, list__begin, comm);
+ 	fr_process_add_arg (comm->process, "-ZTs");
++	fr_process_add_arg (comm->process, "--");
+ 	fr_process_add_arg (comm->process, comm->filename);
+ 	fr_process_end_command (comm->process);
+ 	fr_process_start (comm->process);
+@@ -253,6 +254,7 @@ fr_command_zip_add (FrCommand     *comm,
+ 
+ 	fr_process_add_arg (comm->process, comm->filename);
+ 	fr_process_add_arg (comm->process, "--");
++
+ 	for (scan = file_list; scan; scan = scan->next)
+ 		fr_process_add_arg (comm->process, scan->data);
+ 
+@@ -276,6 +278,7 @@ fr_command_zip_delete (FrCommand  *comm,
+ 
+ 	fr_process_add_arg (comm->process, comm->filename);
+ 	fr_process_add_arg (comm->process, "--");
++
+ 	for (scan = file_list; scan; scan = scan->next) {
+ 		char *escaped;
+ 
+@@ -319,8 +322,9 @@ fr_command_zip_extract (FrCommand  *comm,
+ 		fr_process_add_arg (comm->process, "-j");
+ 	add_password_arg (comm, comm->password);
+ 
+-	fr_process_add_arg (comm->process, comm->filename);
+ 	fr_process_add_arg (comm->process, "--");
++	fr_process_add_arg (comm->process, comm->filename);
++
+ 	for (scan = file_list; scan; scan = scan->next) {
+ 		char *escaped;
+ 
+@@ -339,6 +343,7 @@ fr_command_zip_test (FrCommand   *comm)
+ 	fr_process_begin_command (comm->process, "unzip");
+ 	fr_process_add_arg (comm->process, "-t");
+ 	add_password_arg (comm, comm->password);
++	fr_process_add_arg (comm->process, "--");
+ 	fr_process_add_arg (comm->process, comm->filename);
+ 	fr_process_end_command (comm->process);
+ }
+--
+cgit v0.8.3.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-17 23:23:11 +0000
+++ debian/patches/series	2011-02-11 20:34:15 +0000
@@ -2,4 +2,5 @@
 02_lpi.patch
 20_am-maintainer-mode.patch
 90_hyphen_archive_creation.patch
+91_zip_command_order.patch
 99_ltmain_as-needed.patch