Merge tag 'debian/0.27-3'

notmuch release 0.27-3 for unstable (sid) [dgit]
[dgit distro=debian]

diff --git a/debian/changelog b/debian/changelog
index 8bac8a3d6e4d6479f4e8e6593aeca181d954ef11..fc31d40935d1c32b0e9453ac9a08b1bcbd1bf58d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+notmuch (0.27-3) unstable; urgency=medium
+
+  * Update Vcs-Git to use https and specify correct branch
+  * Update Build-depends for unversioned emacs packages.
+
+ -- David Bremner <bremner@debian.org>  Sat, 08 Sep 2018 18:20:10 -0300
+
+notmuch (0.27-2) unstable; urgency=medium
+
+  * Add texinfo as a build-dep, build info version of documentation.
+
+ -- David Bremner <bremner@debian.org>  Thu, 28 Jun 2018 21:01:29 -0300
+
 notmuch (0.27-1) unstable; urgency=medium
 
   * New upstream feature release

diff --git a/debian/control b/debian/control
index ae4e6f0052818106ebb6bde8f4e039b9c6cba852..8b390f4c9aced6328b8a46d320e252c7279aa8c7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,17 +20,18 @@ Build-Depends:
  dh-elpa (>= 1.3),
  python3-sphinx,
  ruby, ruby-dev (>>1:1.9.3~),
+ emacs-nox | emacs-gtk | emacs-lucid |
  emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
- emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
- emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
+ emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
  gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
  dtach (>= 0.8) <!nocheck>,
  gpgsm <!nocheck>,
  gnupg <!nocheck>,
- bash-completion (>=1.9.0~)
+ bash-completion (>=1.9.0~),
+ texinfo
 Standards-Version: 4.1.3
 Homepage: https://notmuchmail.org/
-Vcs-Git: git://notmuchmail.org/git/notmuch
+Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
 Vcs-Browser: https://git.notmuchmail.org/git/notmuch
 
 Package: notmuch

diff --git a/debian/source/options b/debian/source/options
index 7e95ec71c11716c84fd576948826748f09074ac3..c9ea1f911a7a7ccd883fd3a0dd51c21421d9dce8 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,3 +1,2 @@
 single-debian-patch
-tar-ignore
 tar-ignore=performance-test/download/*.tar.xz