[engrampa] 07/08: debian/patches: Drop 0001_p7zip_checking.patch. Applied upstream.
Martin Wimpress
flexiondotorg-guest at moszumanska.debian.org
Fri May 6 10:09:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
flexiondotorg-guest pushed a commit to branch master
in repository engrampa.
commit a9560791ce16fd377182f4e73280e28f6aca5b14
Author: Martin Wimpress <code at flexion.org>
Date: Fri May 6 10:55:30 2016 +0100
debian/patches: Drop 0001_p7zip_checking.patch. Applied upstream.
---
debian/patches/0001_p7zip_checking.patch | 16 ----------------
debian/patches/series | 1 -
2 files changed, 17 deletions(-)
diff --git a/debian/patches/0001_p7zip_checking.patch b/debian/patches/0001_p7zip_checking.patch
deleted file mode 100644
index a4fbe9d..0000000
--- a/debian/patches/0001_p7zip_checking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Correct checking for p7zip 15.09+
-Author: monsta <monsta at inbox.ru>
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 297ba1b..0b784f7 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -106,7 +106,7 @@ list__process_line (char *line,
- strncpy (version, ver_start, ver_len);
- version[ver_len] = 0;
-
-- if (strcmp (version, "4.55") < 0)
-+ if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
- p7z_comm->old_style = TRUE;
- else
- p7z_comm->old_style = FALSE;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fb2d4b0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001_p7zip_checking.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/engrampa.git
More information about the pkg-mate-commits
mailing list