diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2019-11-12 15:45:48 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2019-11-13 06:29:35 +0100 |
| commit | d3ec7d040b6963ac50417a894e314eca0def38d2 (patch) | |
| tree | 7eda9e7828b2617ed846b7e1c578f84339500570 | |
| parent | a702435daf92ab84d493dc8f0c0d264ae8d16d2f (diff) | |
Refresh debian/patches.
| -rw-r--r-- | debian/patches/Ignore-custom-lib-PATH.patch | 29 | ||||
| -rw-r--r-- | debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch | 6 |
2 files changed, 12 insertions, 23 deletions
diff --git a/debian/patches/Ignore-custom-lib-PATH.patch b/debian/patches/Ignore-custom-lib-PATH.patch index 28e7db8..d621767 100644 --- a/debian/patches/Ignore-custom-lib-PATH.patch +++ b/debian/patches/Ignore-custom-lib-PATH.patch @@ -1,42 +1,31 @@ From: Guilhem Moulin <guilhem@debian.org> Date: Sun, 12 Jun 2016 22:42:16 +0200 -Subject: [PATCH] Ignore custom lib PATH. +Subject: Ignore custom lib PATH. --- - interimap | 1 - - pullimap | 1 - - tests/00-db-exclusive/run | 4 ++-- - 3 files changed, 2 insertions(+), 4 deletions(-) + interimap | 2 +- + pullimap | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) --- a/interimap +++ b/interimap -@@ -32,7 +32,6 @@ use DBD::SQLite::Constants ':file_open'; +@@ -32,7 +32,7 @@ use DBD::SQLite::Constants ':file_open'; use Fcntl qw/F_GETFD F_SETFD FD_CLOEXEC/; use List::Util 'first'; -use lib 'lib'; ++ use Net::IMAP::InterIMAP 0.0.5 qw/xdg_basedir read_config compact_set/; # Clean up PATH --- a/pullimap +++ b/pullimap -@@ -31,7 +31,6 @@ use Getopt::Long qw/:config posix_defaul +@@ -31,7 +31,7 @@ use Getopt::Long qw/:config posix_defaul use List::Util 'first'; - use Socket qw/PF_INET PF_INET6 SOCK_STREAM/; + use Socket qw/PF_INET PF_INET6 SOCK_STREAM IPPROTO_TCP/; -use lib 'lib'; ++ use Net::IMAP::InterIMAP 0.0.5 qw/xdg_basedir read_config compact_set/; # Clean up PATH ---- a/tests/00-db-exclusive/run -+++ b/tests/00-db-exclusive/run -@@ -19,7 +19,7 @@ sleep .05 # wait a short while so we hav - # verify that subsequent runs fail as we can't acquire the exclusive lock - ! interimap - --# line 177 is `$DBH->do("PRAGMA locking_mode = EXCLUSIVE");` --xgrep -Fx "DBD::SQLite::db do failed: database is locked at ./interimap line 177." <"$STDERR" -+# line 176 is `$DBH->do("PRAGMA locking_mode = EXCLUSIVE");` -+xgrep -Fx "DBD::SQLite::db do failed: database is locked at ./interimap line 176." <"$STDERR" - - # vim: set filetype=sh : diff --git a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch index 70339db..63144dd 100644 --- a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch +++ b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch @@ -1,6 +1,6 @@ From: Guilhem Moulin <guilhem@debian.org> Date: Sun, 20 Jan 2019 21:09:43 +0100 -Subject: [PATCH] Mention the Debian BTS in the manpages. +Subject: Mention the Debian BTS in the manpages. --- doc/interimap.1.md | 6 ++++++ @@ -9,7 +9,7 @@ Subject: [PATCH] Mention the Debian BTS in the manpages. --- a/doc/interimap.1.md +++ b/doc/interimap.1.md -@@ -501,6 +501,12 @@ Standards +@@ -535,6 +535,12 @@ Standards and Quick Mailbox Resynchronization (`QRESYNC`)_, [RFC 7162], May 2014. @@ -24,7 +24,7 @@ Subject: [PATCH] Mention the Debian BTS in the manpages. [RFC 5819]: https://tools.ietf.org/html/rfc5819 --- a/doc/pullimap.1.md +++ b/doc/pullimap.1.md -@@ -352,6 +352,12 @@ Standards +@@ -353,6 +353,12 @@ Standards * J. Klensin, _Simple Mail Transfer Protocol_, [RFC 5321], October 2008. |