[Pkg-mc-commits] r286 - in trunk/debian/patches: . bugs debian

[Denis Briand]

Author: narcan-guest
Date: 2009-10-27 21:51:20 +0000 (Tue, 27 Oct 2009)
New Revision: 286

Added:
   trunk/debian/patches/debian/09_uzip_broken_528239.patch
Removed:
   trunk/debian/patches/bugs/02_uzip_broken_528239.patch
Modified:
   trunk/debian/patches/series
Log:
move uzip_broken patch from patches/bugs to patches/debian


Deleted: trunk/debian/patches/bugs/02_uzip_broken_528239.patch
===================================================================
--- trunk/debian/patches/bugs/02_uzip_broken_528239.patch	2009-10-25 11:45:50 UTC (rev 285)
+++ trunk/debian/patches/bugs/02_uzip_broken_528239.patch	2009-10-27 21:51:20 UTC (rev 286)
@@ -1,16 +0,0 @@
-Fix fails to display zipfile contents after unzip update
-Bug #528239 mc: extfs/uzip broken after update to unzip-6.0
-thanks to Johannes Stezenbach for this patch.
-Index: mc-4.6.2~git20090529/vfs/extfs/uzip.in
-===================================================================
---- mc-4.6.2~git20090529.orig/vfs/extfs/uzip.in	2009-05-30 20:48:26.000000000 +0200
-+++ mc-4.6.2~git20090529/vfs/extfs/uzip.in	2009-05-30 20:49:08.000000000 +0200
-@@ -19,7 +19,7 @@
- # Location of the unzip program
- my $app_unzip = "@UNZIP@";
- # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
--my $op_has_zipinfo = @HAVE_ZIPINFO@;
-+my $op_has_zipinfo = 1;
- 
- # Command used to list archives (zipinfo mode)
- my $cmd_list_zi = "$app_unzip -Z -l -T";

Copied: trunk/debian/patches/debian/09_uzip_broken_528239.patch (from rev 285, trunk/debian/patches/bugs/02_uzip_broken_528239.patch)
===================================================================
--- trunk/debian/patches/debian/09_uzip_broken_528239.patch	                        (rev 0)
+++ trunk/debian/patches/debian/09_uzip_broken_528239.patch	2009-10-27 21:51:20 UTC (rev 286)
@@ -0,0 +1,16 @@
+Fix fails to display zipfile contents after unzip update
+Bug #528239 mc: extfs/uzip broken after update to unzip-6.0
+thanks to Johannes Stezenbach for this patch.
+Index: mc-4.6.2~git20090529/vfs/extfs/uzip.in
+===================================================================
+--- mc-4.6.2~git20090529.orig/vfs/extfs/uzip.in	2009-05-30 20:48:26.000000000 +0200
++++ mc-4.6.2~git20090529/vfs/extfs/uzip.in	2009-05-30 20:49:08.000000000 +0200
+@@ -19,7 +19,7 @@
+ # Location of the unzip program
+ my $app_unzip = "@UNZIP@";
+ # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
+-my $op_has_zipinfo = @HAVE_ZIPINFO@;
++my $op_has_zipinfo = 1;
+ 
+ # Command used to list archives (zipinfo mode)
+ my $cmd_list_zi = "$app_unzip -Z -l -T";

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-10-25 11:45:50 UTC (rev 285)
+++ trunk/debian/patches/series	2009-10-27 21:51:20 UTC (rev 286)
@@ -4,7 +4,7 @@
 debian/05_disable_internal_editor.patch
 vfs/01_ftpfs_symlink.patch
 vfs/02_ignore_ftp_chmod_error.patch
-bugs/02_uzip_broken_528239.patch
+debian/09_uzip_broken_528239.patch
 bugs/1462_fix_wrong_path_to_wrapper_script_540238.patch
 debian/06_use_default_pdf_viewer.patch
 debian/07_use_default_images_viewer.patch