[neon/qt/qtcreator/Neon/release] debian: declarative install of upstream changelogs

[Pino Toscano]

Git commit 555173dc92003d5130cfc192b9ab435ade2cf3f7 by Pino Toscano.
Committed on 18/06/2022 at 06:20.
Pushed by carlosdem into branch 'Neon/release'.

declarative install of upstream changelogs

M  +2    -0    debian/changelog
A  +1    -0    debian/qtcreator-data.docs
M  +0    -7    debian/rules

https://invent.kde.org/neon/qt/qtcreator/commit/555173dc92003d5130cfc192b9ab435ade2cf3f7

diff --git a/debian/changelog b/debian/changelog
index eaf300c..bcbc073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtcreator (8.0.0~beta1-2) UNRELEASED; urgency=medium
       embedded copy
     - drop zlib1g-dev, not directly used
     - explicitly add python3, used during the build
+  * Use a qtcreator-data.docs file to install the upstream changelog files,
+    rather than passing all of them as arguments to dh_installdocs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2022 07:00:29 +0200
 
diff --git a/debian/qtcreator-data.docs b/debian/qtcreator-data.docs
new file mode 100644
index 0000000..998b965
--- /dev/null
+++ b/debian/qtcreator-data.docs
@@ -0,0 +1 @@
+dist/changes-*
diff --git a/debian/rules b/debian/rules
index 785072b..aa09b82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 
 include /usr/share/dpkg/architecture.mk
 
-# Upstream changelog
-upstream_changes = $(wildcard dist/changes-*)
-
 # Do not build the HelloWorld plugin, as it is not needed
 export QTC_BUILD_PLUGIN_HELLOWORLD=FALSE
 
@@ -48,10 +45,6 @@ execute_after_dh_install:
 	# Copied in qtcreator-doc already
 	rm -rf debian/qtcreator-data/usr/share/qtcreator/doc/
 
-override_dh_installdocs-indep:
-	dh_installdocs -pqtcreator-data $(upstream_changes)
-	dh_installdocs -i --remaining-packages
-
 override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/$(DEB_HOST_MULTIARCH)/qtcreator/