diff options
| author | David Bremner <david@tethera.net> | 2015-11-19 07:33:01 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2015-11-19 07:33:01 -0400 |
| commit | edae844efaeda706568850003da116a805b352ee (patch) | |
| tree | 448d89b5978450fd823a578a87255e4e35ca85f4 | |
| parent | 55fb7da65012dc56cbf5e72df11f06db6f65cd7c (diff) | |
| parent | 1432a4f946e0f236179b53ac71d03764da725f33 (diff) | |
Merge branch 'release'
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e6cfc7a4..44d65504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +notmuch (0.21-3) unstable; urgency=medium + + * Add mips and mips64el to gdb build-dep blacklist + + -- David Bremner <bremner@debian.org> Sat, 14 Nov 2015 19:07:06 -0400 + +notmuch (0.21-2) unstable; urgency=medium + + * Build-conflict with gdb on ppc64el and mipsel. Workaround gdb breakage on those + architectures (Closes: #804792). + + -- David Bremner <bremner@debian.org> Thu, 12 Nov 2015 08:54:23 -0400 + notmuch (0.21-1) unstable; urgency=medium * New upstream release. Highlights include diff --git a/debian/control b/debian/control index ea438315..7e6a548c 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Carl Worth <cworth@debian.org> Uploaders: Jameson Graef Rollins <jrollins@finestructure.net>, David Bremner <bremner@debian.org> -Build-Conflicts: ruby1.8, gdb-minimal +Build-Conflicts: ruby1.8, gdb-minimal, gdb [s390x ia64 armel ppc64el mips mipsel mips64el] Build-Depends: debhelper (>= 9), pkg-config, @@ -20,7 +20,7 @@ Build-Depends: ruby, ruby-dev (>>1:1.9.3~), emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) | emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~), - gdb [!s390x !ia64 !armel], + gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el], dtach (>= 0.8), bash-completion (>=1.9.0~) Standards-Version: 3.9.6 |