From c8665be751fed52d22d263e3b1a02cec4ac1aa34 Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Fri, 22 Feb 2019 10:19:33 -0500 Subject: Support .udeb package format This enables support for udeb (micro-deb) files, which are a package format used during bootstrapping a Debian installation. They have the same mimetype as regular deb files. --- src/fr-command-ar.c | 6 +++--- src/fr-command-dpkg.c | 2 +- src/fr-init.c | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/fr-command-ar.c b/src/fr-command-ar.c index 09d7640..dbc4320 100644 --- a/src/fr-command-ar.c +++ b/src/fr-command-ar.c @@ -277,8 +277,8 @@ fr_command_ar_handle_error (FrCommand *comm, } -const char *ar_mime_type[] = { "application/x-ar", - "application/x-deb", +const char *ar_mime_type[] = { "application/x-ar", + "application/vnd.debian.binary-package", NULL }; @@ -298,7 +298,7 @@ fr_command_ar_get_capabilities (FrCommand *comm, capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; if (is_program_available ("ar", check_command)) { - if (is_mime_type (mime_type, "application/x-deb")) + if (is_mime_type (mime_type, "application/vnd.debian.binary-package")) capabilities |= FR_COMMAND_CAN_READ; else if (is_mime_type (mime_type, "application/x-ar")) capabilities |= FR_COMMAND_CAN_READ_WRITE; diff --git a/src/fr-command-dpkg.c b/src/fr-command-dpkg.c index 184da01..39d09c7 100644 --- a/src/fr-command-dpkg.c +++ b/src/fr-command-dpkg.c @@ -209,7 +209,7 @@ fr_command_dpkg_extract (FrCommand *comm, } -const char *dpkg_mime_type[] = { "application/x-deb", NULL }; +const char *dpkg_mime_type[] = { "application/vnd.debian.binary-package", NULL }; static const char ** diff --git a/src/fr-init.c b/src/fr-init.c index 016375c..c7c1995 100644 --- a/src/fr-init.c +++ b/src/fr-init.c @@ -58,6 +58,8 @@ /* The capabilities are computed automatically in * compute_supported_archive_types() so it's correct to initialize to 0 here. */ FrMimeTypeDescription mime_type_desc[] = { + { "application/vnd.debian.binary-package", ".deb", N_("Debian package (.deb)"), 0 }, + { "application/vnd.debian.binary-package", ".udeb", N_("Debian package (.udeb)"), 0 }, { "application/vnd.ms-cab-compressed", ".cab", N_("Cabinet (.cab)"), 0 }, { "application/vnd.oasis.opendocument.presentation", ".odp", N_("OpenDocument Presentation (.odp)"), 0 }, { "application/vnd.oasis.opendocument.spreadsheet", ".ods", N_("OpenDocument Spreadsheet (.ods)"), 0 }, @@ -84,7 +86,6 @@ FrMimeTypeDescription mime_type_desc[] = { { "application/x-compress", ".Z", N_("Unix Compressed Archive file (.Z)"), 0 }, { "application/x-compressed-tar", ".tar.gz", N_("Tar compressed with gzip (.tar.gz)"), 0 }, { "application/x-cpio", ".cpio", N_("Unix CPIO Archive (.cpio)"), 0 }, - { "application/x-deb", ".deb", N_("Debian package (.deb)"), 0 }, { "application/x-ear", ".ear", N_("Ear (.ear)"), 0 }, { "application/x-gzip", ".gz", N_("GZip compressed file (.gz)"), 0 }, { "application/x-java-archive", ".jar", N_("Jar (.jar)"), 0 }, @@ -128,7 +129,7 @@ FrExtensionType file_ext_type[] = { { ".cbr", "application/x-cbr" }, { ".cbz", "application/x-cbz" }, { ".cpio", "application/x-cpio" }, - { ".deb", "application/x-deb" }, + { ".deb", "application/vnd.debian.binary-package" }, { ".ear", "application/x-ear" }, { ".exe", "application/x-ms-dos-executable" }, { ".gz", "application/x-gzip" }, @@ -171,6 +172,7 @@ FrExtensionType file_ext_type[] = { { ".txz", "application/x-xz-compressed-tar" }, { ".tzma", "application/x-lzma-compressed-tar" }, { ".tzo", "application/x-lzop-compressed-tar" }, + { ".udeb", "application/vnd.debian.binary-package" }, { ".war", "application/x-war" }, { ".wim", "application/x-ms-wim" }, { ".xz", "application/x-xz" }, -- cgit v1.2.1