diff -Nru python-argcomplete-1.8.1/debian/changelog python-argcomplete-1.8.1/debian/changelog
--- python-argcomplete-1.8.1/debian/changelog	2021-02-25 16:56:26.000000000 +0000
+++ python-argcomplete-1.8.1/debian/changelog	2021-02-27 11:30:37.000000000 +0000
@@ -1,9 +1,9 @@
-python-argcomplete (1.8.1-1.4ubuntu1) hirsute; urgency=medium
+python-argcomplete (1.8.1-1.5) unstable; urgency=medium
 
-  * Merge from Debian unstable, remaining changes:
-    + d/rules: unexport TERM to avoid test failure, see #873149
+  * Non-maintainer upload
+  * debian/rules: Unexport TERM to avoid test failure (Closes: #873149)
 
- -- Graham Inggs <ginggs@ubuntu.com>  Thu, 25 Feb 2021 16:56:26 +0000
+ -- Graham Inggs <ginggs@debian.org>  Sat, 27 Feb 2021 11:30:37 +0000
 
 python-argcomplete (1.8.1-1.4) unstable; urgency=medium
 
@@ -13,13 +13,6 @@
 
  -- Sebastian Ramacher <sramacher@debian.org>  Wed, 10 Feb 2021 21:41:38 +0100
 
-python-argcomplete (1.8.1-1.3ubuntu1) focal; urgency=medium
-
-  * Merge with Debian. See Launchpad 1872590. Remaining change:
-    - d/rules: Set TERM=vt100 when running tests (Closes: #873149)
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 13 Apr 2020 23:43:54 -0400
-
 python-argcomplete (1.8.1-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -42,18 +35,6 @@
 
  -- Sandro Tosi <morph@debian.org>  Tue, 14 Jan 2020 16:48:14 -0500
 
-python-argcomplete (1.8.1-1ubuntu2) focal; urgency=medium
-
-  * No-change rebuild to generate dependencies on python2.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Dec 2019 12:41:13 +0000
-
-python-argcomplete (1.8.1-1ubuntu1) artful; urgency=medium
-
-  * d/rules: Set TERM=vt100 when running tests.
-
- -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 20 Jul 2017 14:39:09 +1200
-
 python-argcomplete (1.8.1-1) unstable; urgency=medium
 
   * Fix Vcs-Git URL in debian/control
diff -Nru python-argcomplete-1.8.1/debian/control python-argcomplete-1.8.1/debian/control
--- python-argcomplete-1.8.1/debian/control	2021-02-25 14:58:10.000000000 +0000
+++ python-argcomplete-1.8.1/debian/control	2020-01-16 22:49:13.000000000 +0000
@@ -1,6 +1,5 @@
 Source: python-argcomplete
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Marco Nenciarini <mnencia@debian.org>
+Maintainer: Marco Nenciarini <mnencia@debian.org>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 10),