r54655 - in /desktop/unstable/file-roller/debian: changelog patches/squashfs.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Nov 1 00:28:26 UTC 2017
Author: biebl
Date: Wed Nov 1 00:28:26 2017
New Revision: 54655
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54655
Log:
Refresh patches
Modified:
desktop/unstable/file-roller/debian/changelog
desktop/unstable/file-roller/debian/patches/squashfs.patch
Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=54655&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog [utf-8] (original)
+++ desktop/unstable/file-roller/debian/changelog [utf-8] Wed Nov 1 00:28:26 2017
@@ -1,6 +1,7 @@
file-roller (3.26.2-1) UNRELEASED; urgency=medium
* New upstream release
+ * Refresh patches
-- Michael Biebl <biebl at debian.org> Wed, 01 Nov 2017 01:21:23 +0100
Modified: desktop/unstable/file-roller/debian/patches/squashfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/squashfs.patch?rev=54655&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/squashfs.patch [utf-8] (original)
+++ desktop/unstable/file-roller/debian/patches/squashfs.patch [utf-8] Wed Nov 1 00:28:26 2017
@@ -16,8 +16,8 @@
create mode 100644 src/fr-command-unsquashfs.c
create mode 100644 src/fr-command-unsquashfs.h
-diff --git a/README b/README
-index 1ce5348..5d6ba47 100644
+Index: b/README
+===================================================================
--- a/README
+++ b/README
@@ -41,6 +41,8 @@
@@ -29,15 +29,11 @@
* Stuffit Archives (.bin, .sit)
* ZIP Archive (.zip)
* ZIP Archived Comic Book (.cbz)
-diff --git a/data/org.gnome.FileRoller.desktop.in.in b/data/org.gnome.FileRoller.desktop.in.in
-index badc2d7..737a4ae 100644
--MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;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-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lz4;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lz4-compressed-tar;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-rzip-compressed-tar;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;application/zip;application/x-archive;application/vnd.ms-cab-compressed;application/vnd.debian.binary-package;application/gzip;
-+MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;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-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lz4;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lz4-compressed-tar;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-rzip-compressed-tar;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;application/zip;application/x-archive;application/vnd.ms-cab-compressed;application/vnd.debian.binary-package;application/gzip;application/vnd.squashfs;application/vnd.snap;
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index a7ada62..5cbd617 100644
+Index: b/po/POTFILES.in
+===================================================================
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
-@@ -77,6 +77,8 @@ src/fr-command-tar.c
+@@ -80,6 +80,8 @@
src/fr-command-tar.h
src/fr-command-unarchiver.c
src/fr-command-unarchiver.h
@@ -46,11 +42,11 @@
src/fr-command-unstuff.c
src/fr-command-unstuff.h
src/fr-command-zip.c
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c896326..12e8f6f 100644
+Index: b/src/Makefile.am
+===================================================================
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -113,6 +113,8 @@ COMMON_SOURCES = \
+@@ -113,6 +113,8 @@
fr-command-rpm.h \
fr-command-tar.c \
fr-command-tar.h \
@@ -59,9 +55,8 @@
fr-command-unstuff.c \
fr-command-unstuff.h \
fr-command-zip.c \
-diff --git a/src/fr-command-unsquashfs.c b/src/fr-command-unsquashfs.c
-new file mode 100644
-index 0000000..f568d85
+Index: b/src/fr-command-unsquashfs.c
+===================================================================
--- /dev/null
+++ b/src/fr-command-unsquashfs.c
@@ -0,0 +1,245 @@
@@ -310,9 +305,8 @@
+ base->propPassword = FALSE;
+ base->propTest = FALSE;
+}
-diff --git a/src/fr-command-unsquashfs.h b/src/fr-command-unsquashfs.h
-new file mode 100644
-index 0000000..5a143ab
+Index: b/src/fr-command-unsquashfs.h
+===================================================================
--- /dev/null
+++ b/src/fr-command-unsquashfs.h
@@ -0,0 +1,51 @@
@@ -367,8 +361,8 @@
+GType fr_command_unsquashfs_get_type (void);
+
+#endif /* FR_COMMAND_UNSQUASHFS_H */
-diff --git a/src/fr-init.c b/src/fr-init.c
-index e75f6d9..95e981f 100644
+Index: b/src/fr-init.c
+===================================================================
--- a/src/fr-init.c
+++ b/src/fr-init.c
@@ -46,6 +46,7 @@
@@ -379,7 +373,7 @@
#include "fr-command-unstuff.h"
#include "fr-command-zip.h"
#include "fr-command-zoo.h"
-@@ -80,6 +81,8 @@ FrMimeTypeDescription mime_type_desc[] = {
+@@ -80,6 +81,8 @@
{ "application/x-deb", ".deb", 0 },
{ "application/x-debian-package", ".deb", 0 },
{ "application/vnd.debian.binary-package", ".deb", 0 },
@@ -388,7 +382,7 @@
{ "application/x-ear", ".ear", 0 },
{ "application/x-ms-dos-executable", ".exe", 0 },
{ "application/x-gzip", ".gz", 0 },
-@@ -140,6 +143,8 @@ FrExtensionType file_ext_type[] = {
+@@ -143,6 +146,8 @@
{ ".rpm", "application/x-rpm" },
{ ".rz", "application/x-rzip" },
{ ".sit", "application/x-stuffit" },
@@ -397,7 +391,7 @@
{ ".swm", "application/x-ms-wim" },
{ ".tar", "application/x-tar" },
{ ".tar.bz", "application/x-bzip-compressed-tar" },
-@@ -367,6 +372,7 @@ register_archives (void)
+@@ -372,6 +377,7 @@
register_archive (FR_TYPE_COMMAND_LHA);
register_archive (FR_TYPE_COMMAND_RAR);
register_archive (FR_TYPE_COMMAND_RPM);
@@ -405,4 +399,3 @@
register_archive (FR_TYPE_COMMAND_UNSTUFF);
register_archive (FR_TYPE_COMMAND_ZIP);
register_archive (FR_TYPE_COMMAND_LRZIP);
-
More information about the pkg-gnome-commits
mailing list