[neon/backports-jammy/libaccounts-qt/Neon/unstable] debian: unify/simplify debian/tmp removals

[Pino Toscano]

Git commit 0c5271917266db9e572a05f3df029fb26a2e5693 by Pino Toscano.
Committed on 01/01/2021 at 12:12.
Pushed by carlosdem into branch 'Neon/unstable'.

unify/simplify debian/tmp removals

M  +3    -0    debian/changelog
D  +0    -2    debian/not-installed
M  +4    -4    debian/rules

https://invent.kde.org/neon/backports-jammy/libaccounts-qt/-/commit/0c5271917266db9e572a05f3df029fb26a2e5693

diff --git a/debian/changelog b/debian/changelog
index 17fa61c..8a05dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ libaccounts-qt (1.16-0r1) UNRELEASED; urgency=medium
   * Bump the debhelper compatibility to 13:
     - switch the debhelper-compat build dependency to 13
     - stop passing --fail-missing to dh_missing, as it is the default now
+  * Remove all the unwanted files right after dh_auto_install, instead of right
+    before dh_install, merging also the content of debian/not-installed (now
+    removed); also drop all the stuff that is not there anymore.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Jun 2020 10:33:31 -0000
 
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 028336d..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/accounts-qt/html/index.qhp
-usr/share/doc/accounts-qt/qch/accounts.qch
diff --git a/debian/rules b/debian/rules
index 5a5e6b6..cfe51ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,11 @@ ddoverride_dh_auto_build-indep:
 	dh_auto_build -i -- docs
 
 
-override_dh_install:
+override_dh_auto_install:
+	dh_auto_install
 	find debian/tmp -name jquery.js -exec ln -sfv /usr/share/javascript/jquery/jquery.js {} \;
-	rm -f debian/tmp/usr/share/libaccounts-qt-tests/*
-	rm -f debian/tmp/usr/bin/*
-	dh_install
+	# test stuff
+	rm debian/tmp/usr/bin/accountstest
 
 override_dh_auto_test:
 	# Disable unittests