diff -Nru gitsome-0.8.0+ds/debian/changelog gitsome-0.8.0+ds/debian/changelog
--- gitsome-0.8.0+ds/debian/changelog	2022-05-26 20:35:31.000000000 +0000
+++ gitsome-0.8.0+ds/debian/changelog	2022-06-03 09:04:38.000000000 +0000
@@ -1,3 +1,18 @@
+gitsome (0.8.0+ds-7.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert "remove the gh binary to stop conflicting with GitHub's gh"
+    as removing gitsome's gh outright would cripple gitsome's functionality.
+  * Rename the /usr/bin/gh binary to /usr/bin/gh-gitsome
+    to avoid conflicting with GitHub's more well-known gh (See #1005858)
+  * Remove unneeded override, and use execute_after where appropriate.
+    For example, "dh_missing --fail-missing" is already the default in
+    debhelper compat 13.
+  * Install bash/fish/zsh completion for /usr/bin/gh-gitsome
+  * Add debian/gbp.conf
+
+ -- Anthony Fok <foka@debian.org>  Fri, 03 Jun 2022 03:04:38 -0600
+
 gitsome (0.8.0+ds-7.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru gitsome-0.8.0+ds/debian/control gitsome-0.8.0+ds/debian/control
--- gitsome-0.8.0+ds/debian/control	2022-05-26 20:33:48.000000000 +0000
+++ gitsome-0.8.0+ds/debian/control	2022-06-03 08:17:46.000000000 +0000
@@ -5,6 +5,9 @@
 Build-Depends: debhelper-compat (= 13),
                python3 (>= 3.4),
                dh-python,
+               python3-click,
+               python3-docopt,
+               python3-feedparser,
                python3-mock,
                python3-sigmavirus24-urltemplate,
                python3-prompt-toolkit,
@@ -25,7 +28,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
-	 python3 (>= 3.4),
+         python3 (>= 3.4),
          python3-sigmavirus24-urltemplate,
          python3-click,
          python3-colorama,
diff -Nru gitsome-0.8.0+ds/debian/gbp.conf gitsome-0.8.0+ds/debian/gbp.conf
--- gitsome-0.8.0+ds/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ gitsome-0.8.0+ds/debian/gbp.conf	2022-06-03 09:03:47.000000000 +0000
@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = debian/master
+dist = DEP14
+pristine-tar = True
diff -Nru gitsome-0.8.0+ds/debian/rules gitsome-0.8.0+ds/debian/rules
--- gitsome-0.8.0+ds/debian/rules	2022-05-26 20:33:48.000000000 +0000
+++ gitsome-0.8.0+ds/debian/rules	2022-06-03 08:27:23.000000000 +0000
@@ -3,15 +3,26 @@
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-override_dh_install-indep:
-	# do not ship a gh binary, see https://bugs.debian.org/1005858
-	rm debian/gitsome/usr/bin/gh
+execute_after_dh_install-indep:
+	# redirect python library
+	sed -i "/import sys/ a sys.path.insert(1,'/usr/lib/python3/dist-packages/python-sigmavirus24-urltemplate/')" \
+	    debian/gitsome/usr/bin/gh
+	# avoid conflict with GitHub's gh, see https://bugs.debian.org/1005858
+	mv -v debian/gitsome/usr/bin/gh debian/gitsome/usr/bin/gh-gitsome
+	# install bash completion
+	mkdir -p debian/gitsome/usr/share/bash-completion/completions
+	PYTHONPATH=$(CURDIR) _GH_GITSOME_COMPLETE=bash_source debian/gitsome/usr/bin/gh-gitsome \
+	    > debian/gitsome/usr/share/bash-completion/completions/gh-gitsome
+	# install fish completion
+	mkdir -p debian/gitsome/usr/share/fish/vendor_completions.d
+	PYTHONPATH=$(CURDIR) _GH_GITSOME_COMPLETE=fish_source debian/gitsome/usr/bin/gh-gitsome \
+	    > debian/gitsome/usr/share/fish/vendor_completions.d/gh-gitsome.fish
+	# install zsh completion
+	mkdir -p debian/gitsome/usr/share/zsh/vendor-completions
+	PYTHONPATH=$(CURDIR) _GH_GITSOME_COMPLETE=zsh_source debian/gitsome/usr/bin/gh-gitsome \
+	    > debian/gitsome/usr/share/zsh/vendor-completions/_gh-gitsome
 
-override_dh_missing:
-	dh_missing --fail-missing
-
-override_dh_clean:
-	dh_clean
+execute_after_dh_clean:
 	find -name "gitsome.egg-info" | xargs rm -rf
 	find -name "parser_table.py" | xargs rm -rf
 	find -name "lastfailed" | xargs rm -rf