Declare fast forward from 0.27-2

[dgit --overwrite]

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644 (file)
index 0000000..cd0decc
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,14 @@
+/tmp/
+/libnotmuch-dev/
+/libnotmuch*/
+/notmuch-emacs/
+/elpa-notmuch/
+/notmuch/
+/notmuch-mutt/
+/notmuch-vim/
+/ruby-notmuch/
+/python*-notmuch/
+/*.debhelper
+/*.debhelper.log
+/*.substvars
+/files

diff --git a/debian/changelog b/debian/changelog
index 1c72fe112e617be0cf90a61bbb9eaa55f92c8533..fc31d40935d1c32b0e9453ac9a08b1bcbd1bf58d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.

diff --git a/debian/control b/debian/control
index 883a135600ba7feb555c0da48a55ba8a5d6dc187..8b390f4c9aced6328b8a46d320e252c7279aa8c7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,9 +20,9 @@ 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>,
@@ -31,7 +31,7 @@ Build-Depends:
  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