Redo some patches

i9fe
Sérgio M. Basto 7 years ago
parent d2543d8da2
commit 178154db11

@ -1,29 +1,22 @@
Index: p7zip-9.20.1~dfsg.1/man1/7z.1 --- p7zip_16.02/man1/7z.1.orig 2018-02-04 03:47:31.934553305 +0000
=================================================================== +++ p7zip_16.02/man1/7z.1 2018-02-04 03:54:22.504752021 +0000
--- p7zip-9.20.1~dfsg.1.orig/man1/7z.1 2011-08-03 12:39:44.000000000 +0200 @@ -12,7 +12,7 @@
+++ p7zip-9.20.1~dfsg.1/man1/7z.1 2011-08-03 12:39:51.000000000 +0200
@@ -10,7 +10,7 @@
.BR <ARGUMENTS>...
.PP
.SH DESCRIPTION .SH DESCRIPTION
-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. 7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm
+7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB,
.TP -RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO,
7z uses plugins to handle archives. +RAR (it was removed due a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO,
.PP most filesystem images and DEB formats.
Index: p7zip-9.20.1~dfsg.1/man1/7za.1 Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
===================================================================
--- p7zip-9.20.1~dfsg.1.orig/man1/7za.1 2011-08-03 12:39:45.000000000 +0200
+++ p7zip-9.20.1~dfsg.1/man1/7za.1 2011-08-03 12:40:25.000000000 +0200
@@ -10,9 +10,9 @@
.BR <ARGUMENTS>...
.PP .PP
--- p7zip_16.02/man1/7za.1.orig 2018-02-04 03:53:54.243463005 +0000
+++ p7zip_16.02/man1/7za.1 2018-02-04 03:55:12.645264785 +0000
@@ -12,7 +12,7 @@
.SH DESCRIPTION .SH DESCRIPTION
-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. 7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm
+7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB,
.TP -RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO,
-7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others. +RAR (it was removed due a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO,
+7za is a stand-alone executable. 7za handles less archive formats than 7z. most filesystem images and DEB formats.
Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
.PP .PP
.SH FUNCTION LETTERS
.TP

@ -1,96 +0,0 @@
From: Robert Luberda <robert@debian.org>
Date: Sun, 6 Mar 2016 13:16:16 +0100
Subject: Remove references to fm/ dir and license.htm
Remove references to fm/* which describes Windows GUI, which
is not available in this package.
Replace references to license.htm with references to copyright.
Drop .exe extension from 7z commands (LP: #181402).
Bugs-Ubuntu https://bugs.launchpad.net/ubuntu/+source/p7zip/+bug/181402
---
DOC/MANUAL/cmdline/index.htm | 10 +++++-----
DOC/MANUAL/cmdline/switches/sfx.htm | 2 +-
DOC/MANUAL/general/index.htm | 3 +--
DOC/MANUAL/start.htm | 3 +--
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/DOC/MANUAL/cmdline/index.htm b/DOC/MANUAL/cmdline/index.htm
index c3515a3..129c479 100644
--- a/DOC/MANUAL/cmdline/index.htm
+++ b/DOC/MANUAL/cmdline/index.htm
@@ -11,12 +11,12 @@
<H1>Command Line Version User's Guide</H1>
-<P>7z.exe is the command line version of 7-Zip. 7z.exe uses 7z.dll
-from the 7-Zip package. 7z.dll is used by the 7-Zip File Manager also.</LI>
+<P>7z is the command line version of 7-Zip. 7z uses 7z.so
+from the 7-Zip package.
-<P>7za.exe (a = alone) is a standalone version of 7-Zip.
-7za.exe supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats.
-7za.exe doesn't use external modules.</LI>
+<P>7za (a = alone) is a standalone version of 7-Zip.
+7za supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats.
+7za doesn't use external modules.
<UL>
<LI><A href = "syntax.htm">Command Line syntax</A></LI>
diff --git a/DOC/MANUAL/cmdline/switches/sfx.htm b/DOC/MANUAL/cmdline/switches/sfx.htm
index bed2f33..e93a284 100644
--- a/DOC/MANUAL/cmdline/switches/sfx.htm
+++ b/DOC/MANUAL/cmdline/switches/sfx.htm
@@ -22,7 +22,7 @@
<DT><A name="SFX_Module"></A>{SFX_Module}</DT>
<DD>
<P>Specifies the SFX module that will be combined with the archive.
- This module must be placed in the same directory as the 7z.exe.
+ This module must be placed in the same directory as the 7z.
If {SFX_Module} is not assigned, 7-Zip will use standard console
SFX module 7zCon.sfx.</P>
<TABLE>
diff --git a/DOC/MANUAL/general/index.htm b/DOC/MANUAL/general/index.htm
index 2e304a4..4c5e55a 100644
--- a/DOC/MANUAL/general/index.htm
+++ b/DOC/MANUAL/general/index.htm
@@ -13,7 +13,6 @@
<h4>The main features of 7-Zip</h4>
<UL>
- <LI><A href = "../fm/index.htm">Powerful file manager</A></LI>
<LI><A href = "performance.htm">High compression ratio and high speed</A></LI>
<LI><A href = "formats.htm">Big number of supported archive formats</A></LI>
<LI><A href = "../cmdline/index.htm">Additional command line version</A></LI>
@@ -21,7 +20,7 @@
<H4>See Also</H4>
<UL>
- <LI><A href = "license.htm">License for use and distribution</A></LI>
+ <LI><A href = "../../../copyright">License for use and distribution</A></LI>
</UL>
</BODY>
diff --git a/DOC/MANUAL/start.htm b/DOC/MANUAL/start.htm
index e4f96b4..e767c49 100644
--- a/DOC/MANUAL/start.htm
+++ b/DOC/MANUAL/start.htm
@@ -17,7 +17,6 @@
<UL>
<LI><A href = "general/index.htm">General information about 7-Zip</A></LI>
- <LI><A href = "fm/index.htm">User's Guide for 7-Zip File Manager</A></LI>
<LI><A href = "cmdline/index.htm">User's Guide for command line version</A></LI>
</UL>
@@ -25,7 +24,7 @@
<UL>
<LI><A href = "general/faq.htm">Frequently Asked Questions (FAQ)</A></LI>
- <!-- <LI><A href = "general/license.htm">License for use and distribution</A></LI> -->
+ <!-- <LI><A href = "../../copyright">License for use and distribution</A></LI> -->
</UL>
<HR>

@ -1,32 +1,80 @@
From: Robert Luberda <robert@debian.org> Join of 02-man.patch, 09-man-update.patch and 10-drop-fm-doc.patch from Debian
Date: Sun, 6 Mar 2016 12:52:49 +0100 diff -rup p7zip_16.02.orig/DOC/MANUAL/cmdline/index.htm p7zip_16.02/DOC/MANUAL/cmdline/index.htm
Subject: Update man pages --- p7zip_16.02.orig/DOC/MANUAL/cmdline/index.htm 2016-05-10 10:50:08.000000000 +0100
+++ p7zip_16.02/DOC/MANUAL/cmdline/index.htm 2018-02-04 03:32:41.200460969 +0000
@@ -11,12 +11,12 @@
<H1>Command Line Version User's Guide</H1>
Update 7z, 7za and 7zr man pages based on the usage output printed
by the commands.
Remove reference to -p{Password} option from the 7zr(1) page, as the -<P>7z.exe is the command line version of 7-Zip. 7z.exe uses 7z.dll
command does not support it (LP: 558609) -from the 7-Zip package. 7z.dll is used by the 7-Zip File Manager also.</LI>
+<P>7z is the command line version of 7-Zip. 7z uses 7z.so
+from the 7-Zip package.
Mention in 7z(1) that the 7z command might be slower than 7za (closes: #636667). -<P>7za.exe (a = alone) is a standalone version of 7-Zip.
-7za.exe supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats.
-7za.exe doesn't use external modules.</LI>
+<P>7za (a = alone) is a standalone version of 7-Zip.
+7za supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats.
+7za doesn't use external modules.
Replace "the highest compression ratio" with "high" or "very high" <UL>
and make sure the phrase refers to the 7z format, not to the archive <LI><A href = "syntax.htm">Command Line syntax</A></LI>
program itself (closes: #636179) diff -rup p7zip_16.02.orig/DOC/MANUAL/cmdline/switches/sfx.htm p7zip_16.02/DOC/MANUAL/cmdline/switches/sfx.htm
--- p7zip_16.02.orig/DOC/MANUAL/cmdline/switches/sfx.htm 2016-05-10 10:50:08.000000000 +0100
+++ p7zip_16.02/DOC/MANUAL/cmdline/switches/sfx.htm 2018-02-04 03:32:41.200460969 +0000
@@ -22,7 +22,7 @@
<DT><A name="SFX_Module"></A>{SFX_Module}</DT>
<DD>
<P>Specifies the SFX module that will be combined with the archive.
- This module must be placed in the same directory as the 7z.exe.
+ This module must be placed in the same directory as the 7z.
If {SFX_Module} is not assigned, 7-Zip will use standard console
SFX module 7zCon.sfx.</P>
<TABLE>
diff -rup p7zip_16.02.orig/DOC/MANUAL/general/index.htm p7zip_16.02/DOC/MANUAL/general/index.htm
--- p7zip_16.02.orig/DOC/MANUAL/general/index.htm 2016-05-10 10:50:08.000000000 +0100
+++ p7zip_16.02/DOC/MANUAL/general/index.htm 2018-02-04 03:32:41.200460969 +0000
@@ -13,7 +13,6 @@
<h4>The main features of 7-Zip</h4>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/p7zip/+bug/558609 <UL>
Bug-Debian: https://bugs.debian.org/636179 - <LI><A href = "../fm/index.htm">Powerful file manager</A></LI>
Bug-Debian: https://bugs.debian.org/636667 <LI><A href = "performance.htm">High compression ratio and high speed</A></LI>
--- <LI><A href = "formats.htm">Big number of supported archive formats</A></LI>
man1/7z.1 | 188 ++++++++++++++++++++++++++++++++++++++++++++--------------- <LI><A href = "../cmdline/index.htm">Additional command line version</A></LI>
man1/7za.1 | 185 ++++++++++++++++++++++++++++++++++++++++++++-------------- @@ -21,7 +20,7 @@
man1/7zr.1 | 192 +++++++++++++++++++++++++++++++++++++++++++++----------------
3 files changed, 426 insertions(+), 139 deletions(-)
diff --git a/man1/7z.1 b/man1/7z.1 <H4>See Also</H4>
index d2b7378..72e262b 100644 <UL>
--- a/man1/7z.1 - <LI><A href = "license.htm">License for use and distribution</A></LI>
+++ b/man1/7z.1 + <LI><A href = "../../../copyright">License for use and distribution</A></LI>
</UL>
</BODY>
diff -rup p7zip_16.02.orig/DOC/MANUAL/start.htm p7zip_16.02/DOC/MANUAL/start.htm
--- p7zip_16.02.orig/DOC/MANUAL/start.htm 2016-05-21 09:53:28.000000000 +0100
+++ p7zip_16.02/DOC/MANUAL/start.htm 2018-02-04 03:32:41.201460979 +0000
@@ -17,7 +17,6 @@
<UL>
<LI><A href = "general/index.htm">General information about 7-Zip</A></LI>
- <LI><A href = "fm/index.htm">User's Guide for 7-Zip File Manager</A></LI>
<LI><A href = "cmdline/index.htm">User's Guide for command line version</A></LI>
</UL>
@@ -25,7 +24,7 @@
<UL>
<LI><A href = "general/faq.htm">Frequently Asked Questions (FAQ)</A></LI>
- <!-- <LI><A href = "general/license.htm">License for use and distribution</A></LI> -->
+ <!-- <LI><A href = "../../copyright">License for use and distribution</A></LI> -->
</UL>
<HR>
diff -rup p7zip_16.02.orig/man1/7z.1 p7zip_16.02/man1/7z.1
--- p7zip_16.02.orig/man1/7z.1 2007-09-21 19:53:12.000000000 +0100
+++ p7zip_16.02/man1/7z.1 2018-02-04 03:33:07.305726696 +0000
@@ -1,97 +1,187 @@ @@ -1,97 +1,187 @@
-.TH 7z 1 "September 1 2006" "Mohammed Adnene Trojette" -.TH 7z 1 "September 1 2006" "Mohammed Adnene Trojette"
+.TH 7z 1 "March 6th, 2016" "7-Zip" +.TH 7z 1 "March 6th, 2016" "7-Zip"
@ -47,7 +95,7 @@ index d2b7378..72e262b 100644
+.RB [ <@listfiles> "... ]" +.RB [ <@listfiles> "... ]"
.PP .PP
.SH DESCRIPTION .SH DESCRIPTION
-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
-.TP -.TP
-7z uses plugins to handle archives. -7z uses plugins to handle archives.
+7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm +7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm
@ -143,7 +191,7 @@ index d2b7378..72e262b 100644
-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') -don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir')
-.TP -.TP
.B \-m{Parameters} .B \-m{Parameters}
-Set Compression Method (see /usr/share/doc/p7zip-full/DOC/MANUAL/cmdline/switches/method.htm for a list of methods) -Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods)
-.TP -.TP
-.B \-mhe=on|off -.B \-mhe=on|off
-7z format only : enables or disables archive header encryption (Default : off) -7z format only : enables or disables archive header encryption (Default : off)
@ -265,7 +313,7 @@ index d2b7378..72e262b 100644
.IP 2 .IP 2
Fatal error Fatal error
.IP 7 .IP 7
@@ -120,13 +211,13 @@ DO NOT USE the 7-zip format for backup purpose on Linux/Unix because : @@ -120,13 +211,13 @@ DO NOT USE the 7-zip format for backup p
.LP .LP
On Linux/Unix, in order to backup directories you must use tar : On Linux/Unix, in order to backup directories you must use tar :
@ -282,7 +330,7 @@ index d2b7378..72e262b 100644
.LP .LP
Do not use "\-r" because this flag does not do what you think. Do not use "\-r" because this flag does not do what you think.
@@ -165,10 +256,15 @@ add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX arc @@ -165,10 +256,15 @@ add all files from directory "dir1" to S
7z a \-mhe=on \-pmy_password archive.7z a_directory 7z a \-mhe=on \-pmy_password archive.7z a_directory
add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on)
.SH "SEE ALSO" .SH "SEE ALSO"
@ -295,15 +343,15 @@ index d2b7378..72e262b 100644
+.BR zip(1), +.BR zip(1),
.PP .PP
.SH "HTML Documentation" .SH "HTML Documentation"
/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm -{DEST_SHARE_DOC}/MANUAL/index.htm
+/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm
.SH AUTHOR .SH AUTHOR
.TP .TP
-Written for Debian by Mohammed Adnene Trojette. -Written for Debian by Mohammed Adnene Trojette.
+Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. +Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda.
diff --git a/man1/7za.1 b/man1/7za.1 diff -rup p7zip_16.02.orig/man1/7za.1 p7zip_16.02/man1/7za.1
index ae5730b..218e245 100644 --- p7zip_16.02.orig/man1/7za.1 2007-09-21 19:53:24.000000000 +0100
--- a/man1/7za.1 +++ p7zip_16.02/man1/7za.1 2018-02-04 03:33:07.305726696 +0000
+++ b/man1/7za.1
@@ -1,99 +1,190 @@ @@ -1,99 +1,190 @@
-.TH 7za 1 "September 1 2006" "Mohammed Adnene Trojette" -.TH 7za 1 "September 1 2006" "Mohammed Adnene Trojette"
+.TH 7za 1 "March 6th, 2016" "7-Zip" +.TH 7za 1 "March 6th, 2016" "7-Zip"
@ -324,9 +372,9 @@ index ae5730b..218e245 100644
+.RB [ <@listfiles> "... ]" +.RB [ <@listfiles> "... ]"
.PP .PP
.SH DESCRIPTION .SH DESCRIPTION
-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
-.TP -.TP
-7za is a stand-alone executable. 7za handles fewer archive formats than 7z. -7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others.
+7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm +7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm
+featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB,
+RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, +RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO,
@ -417,7 +465,7 @@ index ae5730b..218e245 100644
+Show execution time statistics +Show execution time statistics
.TP .TP
-.B \-m{Parameters} -.B \-m{Parameters}
-Set Compression Method (see /usr/share/doc/p7zip-full/DOC/MANUAL/cmdline/switches/method.htm for a list of methods) -Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods)
+.B \-i[r[\-|0]]{@listfile|!wildcard} +.B \-i[r[\-|0]]{@listfile|!wildcard}
+Include filenames +Include filenames
.TP .TP
@ -546,7 +594,7 @@ index ae5730b..218e245 100644
.IP 2 .IP 2
Fatal error Fatal error
.IP 7 .IP 7
@@ -165,10 +257,15 @@ add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX arc @@ -165,10 +257,15 @@ add all files from directory "dir1" to S
7za a \-mhe=on \-pmy_password archive.7z a_directory 7za a \-mhe=on \-pmy_password archive.7z a_directory
add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on)
.SH "SEE ALSO" .SH "SEE ALSO"
@ -559,15 +607,15 @@ index ae5730b..218e245 100644
+.BR zip(1), +.BR zip(1),
.PP .PP
.SH "HTML Documentation" .SH "HTML Documentation"
/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm -{DEST_SHARE_DOC}/MANUAL/index.htm
+/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm
.SH AUTHOR .SH AUTHOR
.TP .TP
-Written for Debian by Mohammed Adnene Trojette. -Written for Debian by Mohammed Adnene Trojette.
+Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. +Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda.
diff --git a/man1/7zr.1 b/man1/7zr.1 diff -rup p7zip_16.02.orig/man1/7zr.1 p7zip_16.02/man1/7zr.1
index fb2dcfd..494efc9 100644 --- p7zip_16.02.orig/man1/7zr.1 2007-09-21 19:53:34.000000000 +0100
--- a/man1/7zr.1 +++ p7zip_16.02/man1/7zr.1 2018-02-04 03:33:07.305726696 +0000
+++ b/man1/7zr.1
@@ -1,99 +1,192 @@ @@ -1,99 +1,192 @@
-.TH 7zr 1 "September 1 2006" "Mohammed Adnene Trojette" -.TH 7zr 1 "September 1 2006" "Mohammed Adnene Trojette"
+.TH 7zr 1 "March 6th, 2016" "7-Zip" +.TH 7zr 1 "March 6th, 2016" "7-Zip"
@ -588,9 +636,9 @@ index fb2dcfd..494efc9 100644
+.RB [ <@listfiles> "... ]" +.RB [ <@listfiles> "... ]"
.PP .PP
.SH DESCRIPTION .SH DESCRIPTION
-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
-.TP -.TP
-7zr is a stand-alone executable. 7zr handles fewer archive formats than 7z. 7zr is a "light-version" of 7za that only handles 7z archives. -7zr is a stand-alone executable. 7zr handles less archive formats than 7z, but does not need any others. 7zr is a "light-version" of 7za that only handles 7z archives.
+7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm +7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm
+featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB,
+RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, +RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO,
@ -676,21 +724,22 @@ index fb2dcfd..494efc9 100644
-Include filenames -Include filenames
+.B \-bs{o|e|p}{0|1|2} +.B \-bs{o|e|p}{0|1|2}
+Set output stream for output/error/progress line +Set output stream for output/error/progress line
+.TP
+.B \-bt
+Show execution time statistics
.TP .TP
-.B \-l -.B \-l
-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') -don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir')
+.B \-bt
+Show execution time statistics
.TP
-.B \-m{Parameters}
-Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods)
+.B \-i[r[\-|0]]{@listfile|!wildcard} +.B \-i[r[\-|0]]{@listfile|!wildcard}
+Include filenames +Include filenames
.TP .TP
.B \-m{Parameters}
Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods)
.TP
-.B \-mhe=on|off -.B \-mhe=on|off
-7z format only : enables or disables archive header encryption (Default : off) -7z format only : enables or disables archive header encryption (Default : off)
-.TP +.B \-m{Parameters}
+Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods)
.TP
.B \-o{Directory} .B \-o{Directory}
Set Output directory Set Output directory
.TP .TP
@ -812,6 +861,17 @@ index fb2dcfd..494efc9 100644
.IP 2 .IP 2
Fatal error Fatal error
.IP 7 .IP 7
@@ -117,8 +211,8 @@ DO NOT USE the 7-zip format for backup p
.LP
On Linux/Unix, in order to backup directories you must use tar :
- \- to backup a directory : tar cf - directory | 7zr a -si directory.tar.7z
- \- to restore your backup : 7zr x -so directory.tar.7z | tar xf -
+ \- to backup a directory : tar cf \- directory | 7zr a \-si directory.tar.7z
+ \- to restore your backup : 7zr x \-so directory.tar.7z | tar xf \-
If you want to send files and directories (not the owner of file)
to others Unix/MacOS/Windows users, you can use the 7-zip format.
@@ -156,16 +250,16 @@ solid archive = on @@ -156,16 +250,16 @@ solid archive = on
.B .B
7zr a \-sfx archive.exe dir1 7zr a \-sfx archive.exe dir1
@ -831,7 +891,8 @@ index fb2dcfd..494efc9 100644
+.BR zip(1), +.BR zip(1),
.PP .PP
.SH "HTML Documentation" .SH "HTML Documentation"
/usr/share/doc/p7zip/DOC/MANUAL/start.htm (avabilable when the p7zip-full package is installed) -{DEST_SHARE_DOC}/MANUAL/index.htm
+/usr/share/doc/p7zip/DOC/MANUAL/start.htm (avabilable when the p7zip-full package is installed)
.SH AUTHOR .SH AUTHOR
.TP .TP
-Written for Debian by Mohammed Adnene Trojette. -Written for Debian by Mohammed Adnene Trojette.

@ -22,11 +22,10 @@ URL: http://p7zip.sourceforge.net/
Source: p7zip_%{version}_src_all-norar.tar.bz2 Source: p7zip_%{version}_src_all-norar.tar.bz2
Patch0: p7zip_15.14-norar_cmake.patch Patch0: p7zip_15.14-norar_cmake.patch
# from Debain # from Debain
Patch4: p7zip-manpages.patch
Patch5: 02-man.patch Patch5: 02-man.patch
Patch6: CVE-2016-9296.patch Patch6: CVE-2016-9296.patch
Patch7: 05-hardening-flags.patch Patch7: 05-hardening-flags.patch
Patch8: 09-man-update.patch
Patch9: 10-drop-fm-doc.patch
Patch10: 13-CVE-2017-17969.patch Patch10: 13-CVE-2017-17969.patch
Patch11: 14-Fix-g++-warning.patch Patch11: 14-Fix-g++-warning.patch

Loading…
Cancel
Save