diff -pruN 2.0.9/debian/changelog 2.0.10/debian/changelog
--- 2.0.9/debian/changelog	2021-09-20 11:24:37.000000000 +0000
+++ 2.0.10/debian/changelog	2021-12-16 16:48:45.000000000 +0000
@@ -1,3 +1,11 @@
+dh-elpa (2.0.10) unstable; urgency=medium
+
+  * Update dh_elpa_test documentation
+  * Bug fix: "Adding a basic autopkgtest", thanks to Lukas Märdian
+    (Closes: #1001452).
+
+ -- David Bremner <bremner@debian.org>  Thu, 16 Dec 2021 12:48:45 -0400
+
 dh-elpa (2.0.9) unstable; urgency=medium
 
   * Bug fix: "install error when root user has packages under
diff -pruN 2.0.9/debian/copyright 2.0.10/debian/copyright
--- 2.0.9/debian/copyright	2021-09-20 11:24:37.000000000 +0000
+++ 2.0.10/debian/copyright	2021-12-16 16:48:45.000000000 +0000
@@ -5,6 +5,12 @@ Copyright: © 2007-2015 Free Software Fo
 	   © 2015 David Bremner <bremner@debian.org>
 	   © 2016 Sean Whitton <spwhitton@spwhitton.name>
 License: GPL-3+
+
+Files: debian/tests/elpa-test/all.el
+Copyright: © 1985-2020 Free Software Foundation, Inc.
+License: GPL-3+
+
+License: GPL-3+
  dh-elpa  is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
diff -pruN 2.0.9/debian/tests/build-deb 2.0.10/debian/tests/build-deb
--- 2.0.9/debian/tests/build-deb	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/build-deb	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Build an elpa package according to:
+# https://wiki.debian.org/Teams/DebianEmacsenTeam/elpa-hello
+#
+set -eu
+
+cd debian/tests/elpa-test
+# Create a dummy .orig.tar.gz
+tar czvf ../elpa-test_1.0.orig.tar.gz all.el
+dpkg-buildpackage
+# Make sure the ${elpa:Depends} were picked up
+dpkg-deb --info ../elpa-all_1.0-1_all.deb | grep Depends | grep dh-elpa-helper
diff -pruN 2.0.9/debian/tests/control 2.0.10/debian/tests/control
--- 2.0.9/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/control	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1,4 @@
+Tests: build-deb
+Restrictions: allow-stderr
+Depends: @, build-essential, dpkg, dpkg-dev, emacs-nox
+
diff -pruN 2.0.9/debian/tests/elpa-test/all.el 2.0.10/debian/tests/elpa-test/all.el
--- 2.0.9/debian/tests/elpa-test/all.el	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/elpa-test/all.el	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1,203 @@
+;;; all.el --- Edit all lines matching a given regexp  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 1985-2020  Free Software Foundation, Inc.
+
+;; Author: Per Abrahamsen <per.abrahamsen@gmail.com>
+;; Version: 1.0
+;; Keywords: matching
+
+;; LCD Archive Entry:
+;; all|Per Abrahamsen|abraham@dina.kvl.dk|
+;; Edit all lines matching a given regexp|
+;; $Date: 1997/03/04 10:29:42 $|$Revision: 5.2 $|~/misc/all.Z|
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Just like occur, except that changes in the *All* buffer are
+;; propagated to the original buffer.
+
+;; You can no longer use mouse-2 to find a match in the original file,
+;; since the default definition of mouse is too useful.
+;; However, `C-c C-c' still works.
+
+;; Line numbers are not listed in the *All* buffer.
+
+;; Ok, it is _not_ just like occur.
+
+;; Some limitations:
+
+;; - Undo in the *All* buffer is an ordinary change in the original.
+;; - Changes to the original buffer are not reflected in the *All* buffer.
+;; - A single change in the *All* buffer must be limited to a single match.
+
+;;; Code:
+
+(defvar all-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-c\C-c" #'all-mode-goto)
+    map))
+
+(defvar all-buffer nil)
+(make-variable-buffer-local 'all-buffer)
+
+(define-derived-mode all-mode fundamental-mode "All"
+  "Major mode for output from \\[all].
+
+All changes made in this buffer will be propagated to the buffer where
+you ran \\[all].
+
+Press \\[all-mode-goto] to go to the same spot in the original buffer."
+  (add-hook 'before-change-functions #'all-before-change-function nil 'local)
+  (add-hook 'after-change-functions #'all-after-change-function nil 'local))
+
+(defun all-mode-find (pos)
+  ;; Find position in original buffer corresponding to POS.
+  (let ((overlay (all-mode-find-overlay pos)))
+    (if overlay
+	(+ (marker-position (overlay-get overlay 'all-marker))
+	   (- pos (overlay-start overlay))))))
+
+(defun all-mode-find-overlay (pos)
+  ;; Find the overlay containing POS.
+  (let ((overlays (overlays-at pos)))
+    (while (and overlays (null (overlay-get (car overlays) 'all-marker)))
+      (setq overlays (cdr overlays)))
+    (car-safe overlays)))
+
+(defun all-mode-goto ()
+  "Move point to the corresponding position in the original buffer."
+  (interactive)
+  (let ((pos (all-mode-find (point))))
+    (if pos
+	(pop-to-buffer all-buffer)
+      (error "This text is not from the original buffer"))
+    (goto-char pos)))
+
+(defvar all-initialization-p nil)
+
+(defun all-before-change-function (from to)
+  ;; Check that change is legal.
+  (and all-buffer
+       (not all-initialization-p)
+       (let ((start (all-mode-find-overlay from))
+	     (end (all-mode-find-overlay to)))
+	 (not (and start (eq start end))))
+       (error "Changes should be limited to a single text piece")))
+
+(defun all-after-change-function (from to length)
+  ;; Propagate changes from *All* buffer.
+  (and all-buffer
+       (null all-initialization-p)
+       (let ((buffer (current-buffer))
+	     (pos (all-mode-find from)))
+	 (if pos
+	     (with-current-buffer all-buffer
+	       (save-excursion
+		 (goto-char pos)
+                 (delete-region pos (+ pos length))
+		 (insert-buffer-substring buffer from to)))))))
+
+;;;###autoload
+(defun all (regexp &optional nlines)
+  "Show all lines in the current buffer containing a match for REGEXP.
+
+If a match spreads across multiple lines, all those lines are shown.
+
+Each line is displayed with NLINES lines before and after, or -NLINES
+before if NLINES is negative.
+NLINES defaults to `list-matching-lines-default-context-lines'.
+Interactively it is the prefix arg.
+
+The lines are shown in a buffer named `*All*'.
+Any changes made in that buffer will be propagated to this buffer."
+  (interactive
+   (list (let* ((default (car regexp-history)))
+           (read-regexp
+            (if default
+                (format
+                 "Edit lines matching regexp (default `%s'): " default)
+              "Edit lines matching regexp: ")
+            default))
+         current-prefix-arg))
+  (setq nlines (if nlines (prefix-numeric-value nlines)
+		 list-matching-lines-default-context-lines))
+  (let ((all-initialization-p t)
+        (buffer (current-buffer))
+	(prevend nil)
+	(prevstart nil)
+	(prevpos (point-min)))
+    (with-output-to-temp-buffer "*All*"
+      (with-current-buffer standard-output
+	(all-mode)
+	(setq all-buffer buffer)
+	(insert "Lines matching ")
+	(prin1 regexp)
+	(insert " in buffer " (buffer-name buffer) ?. ?\n)
+	(insert "--------\n"))
+      (if (eq buffer standard-output)
+	  (goto-char (point-max)))
+      (save-excursion
+	(goto-char (point-min))
+	;; Find next match, but give up if prev match was at end of buffer.
+	(while (and (not (= prevpos (point-max)))
+		    (re-search-forward regexp nil t))
+	  (goto-char (match-beginning 0))
+	  (beginning-of-line)
+	  (setq prevpos (point))
+	  (goto-char (match-end 0))
+	  (let* ((start (save-excursion
+			  (goto-char (match-beginning 0))
+			  (forward-line (if (< nlines 0) nlines (- nlines)))
+			  (point)))
+		 (end (save-excursion
+			(goto-char (match-end 0))
+			(if (> nlines 0)
+			    (forward-line (1+ nlines))
+			    (forward-line 1))
+			(point))))
+	    (cond ((null prevend)
+		   (setq prevstart start
+			prevend end))
+		  ((> start prevend)
+		   (all-insert prevstart prevend regexp nlines)
+		   (setq prevstart start
+			 prevend end))
+		  (t
+		   (setq prevend end)))))
+	(if prevend
+	    (all-insert prevstart prevend regexp nlines))))))
+
+(defun all-insert (start end regexp nlines)
+  ;; Insert match.
+  (let ((marker (copy-marker start))
+        (buffer (current-buffer)))
+    (with-current-buffer standard-output
+      (let ((from (point))
+            to)
+        (insert-buffer-substring buffer start end)
+        (setq to (point))
+        (overlay-put (make-overlay from to) 'all-marker marker)
+        (goto-char from)
+        (while (re-search-forward regexp to t)
+          (put-text-property (match-beginning 0) (match-end 0)
+                             'face 'match))
+        (goto-char to)
+        (if (> nlines 0)
+            (insert "--------\n"))))))
+
+(provide 'all)
+
+;;; all.el ends here
diff -pruN 2.0.9/debian/tests/elpa-test/debian/changelog 2.0.10/debian/tests/elpa-test/debian/changelog
--- 2.0.9/debian/tests/elpa-test/debian/changelog	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/elpa-test/debian/changelog	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1,5 @@
+elpa-test (1.0-1) unstable; urgency=medium
+
+  * Initial release.
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Tue, 7 Dec 2021 12:05:48 +0100
diff -pruN 2.0.9/debian/tests/elpa-test/debian/control 2.0.10/debian/tests/elpa-test/debian/control
--- 2.0.9/debian/tests/elpa-test/debian/control	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/elpa-test/debian/control	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1,31 @@
+Source: elpa-test
+Section: editors
+Priority: optional
+Maintainer: Lukas Märdian <slyon@ubuntu.com>
+Build-Depends: debhelper-compat (= 13),
+ dh-elpa
+Standards-Version: 4.5.1
+Rules-Requires-Root: no
+
+Package: elpa-all
+Architecture: all
+Depends: ${elpa:Depends}, ${misc:Depends}
+Recommends: emacs (>= 46.0)
+Enhances: emacs
+Description: Edit all lines matching a given regexp  
+ Just like occur, except that changes in the *All* buffer are
+ propagated to the original buffer.
+ .
+ You can no longer use mouse-2 to find a match in the original file,
+ since the default definition of mouse is too useful.
+ However, `C-c C-c' still works.
+ .
+ Line numbers are not listed in the *All* buffer.
+ .
+ Ok, it is _not_ just like occur.
+ .
+ Some limitations:
+ .
+ - Undo in the *All* buffer is an ordinary change in the original.
+ - Changes to the original buffer are not reflected in the *All* buffer.
+ - A single change in the *All* buffer must be limited to a single match.
diff -pruN 2.0.9/debian/tests/elpa-test/debian/copyright 2.0.10/debian/tests/elpa-test/debian/copyright
--- 2.0.9/debian/tests/elpa-test/debian/copyright	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/elpa-test/debian/copyright	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1,27 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: elpa-test
+
+Files: *
+Copyright: (C) 1985-2020 Free Software Foundation, Inc.
+License: GPL-3+
+
+Files: debian/*
+Copyright: (C) 2021 Lukas Märdian <slyon@ubuntu.com>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'
diff -pruN 2.0.9/debian/tests/elpa-test/debian/elpa 2.0.10/debian/tests/elpa-test/debian/elpa
--- 2.0.9/debian/tests/elpa-test/debian/elpa	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/elpa-test/debian/elpa	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1 @@
+*.el
diff -pruN 2.0.9/debian/tests/elpa-test/debian/rules 2.0.10/debian/tests/elpa-test/debian/rules
--- 2.0.9/debian/tests/elpa-test/debian/rules	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/elpa-test/debian/rules	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with elpa
diff -pruN 2.0.9/debian/tests/elpa-test/debian/source/format 2.0.10/debian/tests/elpa-test/debian/source/format
--- 2.0.9/debian/tests/elpa-test/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ 2.0.10/debian/tests/elpa-test/debian/source/format	2021-12-16 16:48:45.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -pruN 2.0.9/dh_elpa 2.0.10/dh_elpa
--- 2.0.9/dh_elpa	2021-09-20 11:24:37.000000000 +0000
+++ 2.0.10/dh_elpa	2021-12-16 16:48:45.000000000 +0000
@@ -24,10 +24,10 @@ B<dh_elpa> is a debhelper program that i
 elpa style emacs lisp packages into package build directories.
 
 B<dh_elpa> will attempt to run ERT and Buttercup test suites using
-dh_elpa_test(1) if the debhelper compat level is 10 or higher.  To
-disable this behaviour, or tweak it if it is failing to run the tests
-as they should be run, set environment variables in debian/rules as
-detailed in dh_elpa_test(1).
+dh_elpa_test(1) if the debhelper compat level is 10 or higher.  This
+will override dh_auto_test(1).  To disable this behaviour, or tweak it
+if it is failing to run the tests as they should be run, see
+dh_elpa_test(1).
 
 =head1 FILES
 
diff -pruN 2.0.9/dh_elpa_test 2.0.10/dh_elpa_test
--- 2.0.9/dh_elpa_test	2021-09-20 11:24:37.000000000 +0000
+++ 2.0.10/dh_elpa_test	2021-12-16 16:48:45.000000000 +0000
@@ -142,6 +142,31 @@ example, the B<ert_eval> configuration k
 variable B<DH_ELPA_TEST_ERT_EVAL>.  Their use is now deprecated.  If
 the debian/elpa-test file exists, they will be ignored.
 
+=head1 CONTROLLING INVOCATION
+
+The following recipes can be combined to enable an appropriate
+combination of build time and autopkgtest time tests.
+
+=head2 DISABLING BUILD TIME TESTS
+
+To disable running tests at build time, you have two choices. You can
+override B<dh_elpa_test> (not B<dh_auto_test>), or you can use the
+B<disable> key in B<debian/elpa-test>. Note that the latter will also
+(mostly) disable autopkgtests (see below).
+
+=head2 ENABLING AUTOPKGTESTS
+
+To enable running autopkgtests via B<dh_elpa_test>, add "Testsuite:
+autpkgtest-pkg-elpa" to B<debian/rules>.  With B<disable> in
+B<debian/elpa-test>, only B<superficial> tests, namely installing the
+binary packages and byte-compiling any that use B<dh_elpa>.
+
+=head2 ENABLING DH_AUTO_TEST
+
+By default B<dh_elpa_test> replaces B<dh_auto_test>. You can re-enable
+B<dh_auto_test> either with the B<disable> key discussed above, or by
+overriding B<dh_elpa_test> to call B<dh_auto_test>.
+
 =cut
 
 use File::Find::Rule;
