From e19e5ac6d2fd0f73c91793d5e93e2f85df1cae85 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sat, 31 Dec 2016 14:04:33 -0800
Subject: [PATCH] Update Emacs build dependency

* Change emacs build dependency to specify the major version instead of
  relying on metapackages, and stop using a versioned dependency on the
  emacs metapackage (which didn't do what was intended anyway).  Switch
  to Emacs 25 for the build.  (Closes: #849483)
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 debian/rules     | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4aff372..fdb1056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 debian-policy (3.9.8.1) UNRELEASED; urgency=medium
 
+  * Change emacs build dependency to specify the major version instead of
+    relying on metapackages, and stop using a versioned dependency on the
+    emacs metapackage (which didn't do what was intended anyway).  Switch
+    to Emacs 25 for the build.  (Closes: #849483)
   * Compress all files with gzip -n to avoid embedding timestamps,
     enabling reproducible builds.
   * Switch to https URLs for Vcs-Git and Vcs-Browser.
diff --git a/debian/control b/debian/control
index e529435..43ab83a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  debiandoc-sgml (>= 1.1.47),
  docbook-dsssl,
  docbook-xml,
- emacs-nox (>= 24.4) | emacs (>= 24.4),
+ emacs25-nox | emacs25,
  groff,
  links | elinks,
  markdown,
diff --git a/debian/rules b/debian/rules
index 0290f00..761c0ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,11 @@ package := $(shell grep Source debian/control | sed 's/^Source: //')
 date	:= $(shell date +"%Y-%m-%d")
 version := $(shell dpkg-parsechangelog | awk '/^Version:/ { print $$2; exit }')
 
-# Currently, emacs23 is required (xemacs is not sufficient).
-EMACS   := emacs24
+# Current version of Emacs used to build org-mode files.  Assume the build
+# dependencies pick up the correct version and we can use the generic name
+# to avoid changing things in multiple places when new versions are
+# released.
+EMACS   := emacs
 
 # Location of the source and build directories.
 SRCTOP	:= $(CURDIR)
-- 
2.11.4.GIT