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

[Julien Lavergne]

This merge request include 3 fixes/changes :
- bug 148084 : Enable pakagekit support, provided by sessioninstaller, to be able to install missing packages.
To test it, you need the version of sessioninstaller on bug 703330 which include fixes for natty.
- bug 689317 : See bug report for detail. This one re-enable ISO support by default. As long as file-roller depends on zip/unzip firstly instead of p7zip, the ISO support is lost.
- bug 671691: Backport a patch from file-roller master, originaly posted on the bug report.

[lp:~gilir/file-roller/fix-lp-148084]

44. By Julien Lavergne on 2011-01-16

Depends on genisoimage to fix support for iso archive by default
(LP: #689317)

45. By Julien Lavergne on 2011-01-17

* debian/patches/90_hyphen_archive_creation.patch
 - From upstream, fix archive creation with an hyphen in the name
   (LP: #671691)

[Robert Ancell (robert-ancell)]

Tested the PackageKit installation with rar and it works. It requires the changes in bug 703330

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-15 21:54:03 +0000
+++ debian/changelog	2011-01-17 23:30:22 +0000
@@ -1,3 +1,17 @@
+file-roller (2.32.1-0ubuntu2) natty; urgency=low
+
+  * debian/rules:
+   - Enable packagekit support (LP: #148084)
+  * debian/control
+   - Recommends sessioninstaller | packagekit.
+   - Depends on genisoimage to fix support for iso archive by default
+     (LP: #689317)
+  * debian/patches/90_hyphen_archive_creation.patch
+   - From upstream, fix archive creation with an hyphen in the name
+     (LP: #671691)
+
+ -- Julien Lavergne <[e-mail]>  Fri, 14 Jan 2011 22:46:35 +0100
+
 file-roller (2.32.1-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-08-17 01:43:51 +0000
+++ debian/control	2011-01-17 23:30:22 +0000
@@ -36,12 +36,14 @@
          bzip2 (>= 1.0.1),
          gzip (>= 1.3.2),
          unzip | p7zip-full,
-         zip | p7zip-full
+         zip | p7zip-full,
+         genisoimage
 Conflicts: file-roller2
 Replaces: gnome-icon-theme (<< 2.14)
 Recommends: gnome-icon-theme (>= 2.18),
             lzma,
-            gvfs
+            gvfs,
+            sessioninstaller | packagekit
 Suggests: lha,
           unrar | p7zip-rar,
           sharutils,

=== modified file 'debian/control.in'
--- debian/control.in	2010-08-17 01:43:51 +0000
+++ debian/control.in	2011-01-17 23:30:22 +0000
@@ -31,12 +31,14 @@
          bzip2 (>= 1.0.1),
          gzip (>= 1.3.2),
          unzip | p7zip-full,
-         zip | p7zip-full
+         zip | p7zip-full,
+         genisoimage
 Conflicts: file-roller2
 Replaces: gnome-icon-theme (<< 2.14)
 Recommends: gnome-icon-theme (>= 2.18),
             lzma,
-            gvfs
+            gvfs,
+            sessioninstaller | packagekit
 Suggests: lha,
           unrar | p7zip-rar,
           sharutils,

=== added file 'debian/patches/90_hyphen_archive_creation.patch'
--- debian/patches/90_hyphen_archive_creation.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/90_hyphen_archive_creation.patch	2011-01-17 23:30:22 +0000
@@ -0,0 +1,37 @@
+From db930e241d450a068e25a9cecb175ea96f787375 Mon Sep 17 00:00:00 2001
+From: Dmitri Bachtin <[e-mail]>
+Date: Mon, 17 Jan 2011 09:52:59 +0000
+Subject: fixed error when creating zip archives with files starting with an hyphen
+
+[bug #639664]
+---
+diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
+index b2157f2..32c4410 100644
+--- a/src/fr-command-zip.c
++++ b/src/fr-command-zip.c
+@@ -252,6 +252,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);
+ 
+@@ -274,6 +275,7 @@ fr_command_zip_delete (FrCommand  *comm,
+ 	fr_process_add_arg (comm->process, "-d");
+ 
+ 	fr_process_add_arg (comm->process, comm->filename);
++	fr_process_add_arg (comm->process, "--");
+ 	for (scan = file_list; scan; scan = scan->next) {
+ 		char *escaped;
+ 
+@@ -318,6 +320,7 @@ fr_command_zip_extract (FrCommand  *comm,
+ 	add_password_arg (comm, comm->password);
+ 
+ 	fr_process_add_arg (comm->process, comm->filename);
++	fr_process_add_arg (comm->process, "--");
+ 	for (scan = file_list; scan; scan = scan->next) {
+ 		char *escaped;
+ 
+--
+cgit v0.8.3.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-17 01:43:51 +0000
+++ debian/patches/series	2011-01-17 23:30:22 +0000
@@ -1,4 +1,5 @@
 01_menu_change.patch
 02_lpi.patch
 20_am-maintainer-mode.patch
+90_hyphen_archive_creation.patch
 99_ltmain_as-needed.patch

=== modified file 'debian/rules'
--- debian/rules	2010-08-09 07:03:10 +0000
+++ debian/rules	2011-01-17 23:30:22 +0000
@@ -10,8 +10,7 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
-			     --disable-packagekit
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 
 DEB_DH_MAKESHLIBS_ARGS += --no-act