Merge branch 'release'

This commit is contained in:
David Bremner 2020-12-26 15:20:32 -04:00
commit 0f37509cc7
2 changed files with 8 additions and 2 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
notmuch (0.31.3-2) unstable; urgency=medium
* Don't install gdb on hppa (skip gdb based tests)
-- David Bremner <bremner@debian.org> Sat, 26 Dec 2020 15:14:07 -0400
notmuch (0.31.3-1) unstable; urgency=medium notmuch (0.31.3-1) unstable; urgency=medium
* New upstream bugfix release * New upstream bugfix release

4
debian/control vendored
View file

@ -6,7 +6,7 @@ Uploaders:
Jameson Graef Rollins <jrollins@finestructure.net>, Jameson Graef Rollins <jrollins@finestructure.net>,
David Bremner <bremner@debian.org>, David Bremner <bremner@debian.org>,
Build-Conflicts: Build-Conflicts:
gdb [ia64 mips mips64el], gdb [ia64 mips mips64el hppa],
gdb-minimal, gdb-minimal,
ruby1.8, ruby1.8,
Build-Depends: Build-Depends:
@ -19,7 +19,7 @@ Build-Depends:
dpkg-dev (>= 1.17.14), dpkg-dev (>= 1.17.14),
dtach (>= 0.8) <!nocheck>, dtach (>= 0.8) <!nocheck>,
emacs-nox | emacs-gtk | emacs-lucid | emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) | emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~), emacs-nox | emacs-gtk | emacs-lucid | emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) | emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>, gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha !hppa] <!nocheck>,
gnupg <!nocheck>, gnupg <!nocheck>,
gpgsm <!nocheck>, gpgsm <!nocheck>,
libgmime-3.0-dev (>= 3.0.3~), libgmime-3.0-dev (>= 3.0.3~),