mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 12:28:09 +01:00
Merge branch 'release'
This commit is contained in:
commit
edae844efa
2 changed files with 15 additions and 2 deletions
13
debian/changelog
vendored
13
debian/changelog
vendored
|
@ -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
|
||||
|
|
4
debian/control
vendored
4
debian/control
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue