From 0225d710f7364e36e900794e095dcf13765e75ef Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 27 Oct 2020 09:23:38 -0700
Subject: Add xref, project to list of builtin pkgs also packaged separately

---
 debian/changelog | 7 +++++++
 dh-elpa.el       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ca2fabf..2ef9312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-elpa (2.0.5) unstable; urgency=medium
+
+  * Add xref and project to the list of built-in packages that we also
+    have packaged separately (Closes: #972995).
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 27 Oct 2020 09:23:33 -0700
+
 dh-elpa (2.0.4) unstable; urgency=medium
 
   [ David Bremner ]
diff --git a/dh-elpa.el b/dh-elpa.el
index 3643452..f8d2814 100644
--- a/dh-elpa.el
+++ b/dh-elpa.el
@@ -184,7 +184,7 @@ These are packaged separately for two reasons:
 - it permits use of addons with older versions of Emacs, for
   which the dependency is not yet a built-in package."
   (let ((non-elpa (list 'emacs))
-        (packaged-separately (list 'let-alist 'seq)))
+        (packaged-separately (list 'let-alist 'seq 'xref 'project)))
     (cl-remove-if (lambda (dep) (let ((pkg (car dep)))
                       (or (memq pkg non-elpa)
                           (and
-- 
cgit v1.2.3


From c00705423311afaaa6b46a91449e3966bc8bdef8 Mon Sep 17 00:00:00 2001
From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Thu, 29 Oct 2020 17:16:41 +0900
Subject: Fix ELPA_LOAD_PATH

Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
---
 helper/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helper/install b/helper/install
index 622cbc7..1a2eb8a 100755
--- a/helper/install
+++ b/helper/install
@@ -13,7 +13,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 FLAVOR=$1
 ELPA_PACKAGE=$2
 ELPA_VERSION=$3
-ELPA_LOADPATH=$4
+ELPA_LOAD_PATH=$4
 
 ELPA_DIR=${ELPA_PACKAGE}-${ELPA_VERSION}
 
-- 
cgit v1.2.3


From 7bd3765e5ddf50722fc92a8c72558f0d92a3c8b6 Mon Sep 17 00:00:00 2001
From: David Bremner <bremner@debian.org>
Date: Thu, 29 Oct 2020 08:18:09 -0300
Subject: changelog for 2.0.6

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2ef9312..8f0d4cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-elpa (2.0.6) unstable; urgency=medium
+
+  * Bug fix: "Can't install non-ELPA package due to typo in helper
+    script", thanks to Youhei SASAKI (Closes: #973346).
+
+ -- David Bremner <bremner@debian.org>  Thu, 29 Oct 2020 08:17:42 -0300
+
 dh-elpa (2.0.5) unstable; urgency=medium
 
   * Add xref and project to the list of built-in packages that we also
-- 
cgit v1.2.3