Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / engrampa
Commits:
-
076256bb
by Mike Gabriel at 2024-01-31T13:30:46+01:00
-
4a882b49
by Mike Gabriel at 2024-01-31T13:33:05+01:00
-
ec927cff
by Mike Gabriel at 2024-01-31T13:53:23+01:00
-
29113d53
by Mike Gabriel at 2024-01-31T13:54:14+01:00
5 changed files:
- debian/changelog
- debian/copyright
- + debian/patches/0003_7z-Fix-accepting-RAR-archives-when-unar-open-zip-tru.patch
- + debian/patches/0004_Add-MIME-aliases-for-gzip-and-bzip2.patch
- debian/patches/series
Changes:
1 | +engrampa (1.26.1-4) unstable; urgency=medium
|
|
2 | + |
|
3 | + * debian/patches:
|
|
4 | + + Add 004_Add-MIME-aliases-for-gzip-and-bzip2.patch. Add MIME type aliases
|
|
5 | + for application/bzip2, application/x-bzip2 and application/gzip.
|
|
6 | + + Add 0003_7z-Fix-accepting-RAR-archives-when-unar-open-zip-tru.patch. Fix
|
|
7 | + accepting RAR archives when unar-open-zip=true.
|
|
8 | + * debian/copyright:
|
|
9 | + + Update copyright attribution for debian/.
|
|
10 | + |
|
11 | + -- Mike Gabriel <sunweaver@debian.org> Wed, 31 Jan 2024 13:33:31 +0100
|
|
12 | + |
|
1 | 13 | engrampa (1.26.1-3) unstable; urgency=medium
|
2 | 14 | |
3 | 15 | * debian/patches:
|
... | ... | @@ -278,7 +278,7 @@ License: public-domain |
278 | 278 | |
279 | 279 | Files: debian/*
|
280 | 280 | Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
|
281 | - 2014-2023, Mike Gabriel <sunweaver@debian.org>
|
|
281 | + 2014-2024, Mike Gabriel <sunweaver@debian.org>
|
|
282 | 282 | License: GPL-2+ or LGPL-2+
|
283 | 283 | |
284 | 284 | License: GPL-2+
|
1 | +From 01a64cddcd20b8b6647962e1336a3bb608d39a02 Mon Sep 17 00:00:00 2001
|
|
2 | +From: Colomban Wendling <cwendling@hypra.fr>
|
|
3 | +Date: Tue, 23 Jan 2024 19:20:11 +0100
|
|
4 | +Subject: [PATCH] 7z: Fix accepting RAR archives when unar-open-zip=true
|
|
5 | + |
|
6 | +Offset was not properly updated when adding support for EPUB+ZIP in
|
|
7 | +84fb5cfe96263f79e50b68a5a6996e40c514cf74, leading to disabling both ZIP
|
|
8 | +and RAR when the option unar-open-zip was enabled.
|
|
9 | + |
|
10 | +Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
11 | +---
|
|
12 | + src/fr-command-7z.c | 2 +-
|
|
13 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
14 | + |
|
15 | +--- a/src/fr-command-7z.c
|
|
16 | ++++ b/src/fr-command-7z.c
|
|
17 | +@@ -611,7 +611,7 @@
|
|
18 | +
|
|
19 | + if (g_settings_get_boolean (settings, "unar-open-zip") &&
|
|
20 | + is_program_in_path ("unar") && is_program_in_path ("lsar"))
|
|
21 | +- sevenz_mime_types [8] = NULL;
|
|
22 | ++ sevenz_mime_types [9] = NULL;
|
|
23 | + else
|
|
24 | + g_settings_set_boolean (settings, "unar-open-zip", FALSE);
|
|
25 | + |
1 | +From 2cd5fa803bba18be69a06d6b1342491a7524e0a1 Mon Sep 17 00:00:00 2001
|
|
2 | +From: Guido Berhoerster <guido+freiesoftware@berhoerster.name>
|
|
3 | +Date: Mon, 8 May 2023 13:45:15 +0200
|
|
4 | +Subject: [PATCH] Add MIME aliases for gzip and bzip2
|
|
5 | + |
|
6 | +The application/gzip alias is e.g. provided by FileRoller and Ark,
|
|
7 | +application/bzip2 is provided by FileRoller.
|
|
8 | + |
|
9 | +Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
10 | +---
|
|
11 | + data/engrampa.desktop.in.in | 2 +-
|
|
12 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
13 | + |
|
14 | +--- a/data/engrampa.desktop.in.in
|
|
15 | ++++ b/data/engrampa.desktop.in.in
|
|
16 | +@@ -11,7 +11,7 @@
|
|
17 | + Icon=engrampa
|
|
18 | + # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
|
|
19 | + Categories=GTK;Utility;Archiving;Compression;
|
|
20 | +-MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
|
|
21 | ++MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip2;application/bzip2;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
|
|
22 | + # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
|
|
23 | + Keywords=MATE;archive;manager;compression;
|
|
24 | + X-MATE-DocPath=engrampa/engrampa.xml |
... | ... | @@ -2,3 +2,5 @@ |
2 | 2 | 1001_add-shebang-to-isoinfo-script.patch
|
3 | 3 | 0001_fix-segfault-on-opening-deb-files.patch
|
4 | 4 | 0002_7zip.patch
|
5 | +0003_7z-Fix-accepting-RAR-archives-when-unar-open-zip-tru.patch
|
|
6 | +0004_Add-MIME-aliases-for-gzip-and-bzip2.patch |