[neon/qt/qbs/Neon/release] debian: debian/*: Apply changes suggested by reviewer

[Marius Gripsgard]

Git commit fda098bfd07424e416735d7de330baf0d080b9a2 by Marius Gripsgard.
Committed on 22/02/2022 at 23:09.
Pushed by jriddell into branch 'Neon/release'.

debian/*: Apply changes suggested by reviewer

R  +0    -0    debian/patches/doc_Install_man_pages_with_cmake.diff [from: debian/patches/0001-doc-Install-man-pages-with-cmake.patch - 100% similarity]
M  +2    -2    debian/patches/series
R  +0    -0    debian/patches/tests_Make_sure_we_handle_prefix_cases_where_libPath.diff [from: debian/patches/0001-tests-Make-sure-we-handle-prefix-cases-where-libPath.patch - 100% similarity]
M  +2    -4    debian/rules

https://invent.kde.org/neon/qt/qbs/commit/fda098bfd07424e416735d7de330baf0d080b9a2

diff --git a/debian/patches/0001-doc-Install-man-pages-with-cmake.patch b/debian/patches/doc_Install_man_pages_with_cmake.diff
similarity index 100%
rename from debian/patches/0001-doc-Install-man-pages-with-cmake.patch
rename to debian/patches/doc_Install_man_pages_with_cmake.diff
diff --git a/debian/patches/series b/debian/patches/series
index ae07ebb..81994be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,5 @@ processlauncher_destdir.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
-0001-tests-Make-sure-we-handle-prefix-cases-where-libPath.patch
-0001-doc-Install-man-pages-with-cmake.patch
+tests_Make_sure_we_handle_prefix_cases_where_libPath.diff
+doc_Install_man_pages_with_cmake.diff
diff --git a/debian/patches/0001-tests-Make-sure-we-handle-prefix-cases-where-libPath.patch b/debian/patches/tests_Make_sure_we_handle_prefix_cases_where_libPath.diff
similarity index 100%
rename from debian/patches/0001-tests-Make-sure-we-handle-prefix-cases-where-libPath.patch
rename to debian/patches/tests_Make_sure_we_handle_prefix_cases_where_libPath.diff
diff --git a/debian/rules b/debian/rules
index fa58487..9234208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/default.mk
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 BUILDPATH ?= obj-$(DEB_HOST_GNU_TYPE)
 
 export QT_SELECT := qt5
@@ -61,5 +59,5 @@ override_dh_install:
 	rm -fv debian/tmp/usr/libexec/qbs/dmgbuild
 	rm -rfv debian/tmp/usr/share/qbs/python
 	mkdir -p debian/tmp/usr/share/qt5/doc
-	mv $(BUILDPATH)/doc/qbs.qch debian/tmp/usr/share/qt5/doc/qbs.qch
+	cp $(BUILDPATH)/doc/qbs.qch debian/tmp/usr/share/qt5/doc/qbs.qch
 	dh_install