[neon/qt6/qbs/Neon/unstable] debian: rebase

[Carlos De Maine]

Git commit 3763811d3a9829b6f2756b9f583ec711cd59637c by Carlos De Maine.
Committed on 30/08/2025 at 05:06.
Pushed by carlosdem into branch 'Neon/unstable'.

rebase

M  +15   -10   debian/control
M  +17   -6    debian/rules

https://invent.kde.org/neon/qt6/qbs/-/commit/3763811d3a9829b6f2756b9f583ec711cd59637c

diff --cc debian/rules
index c166c98,0d87ef0..3fa79c9
--- a/debian/rules
+++ b/debian/rules
@@@ -25,30 -25,54 +25,41 @@@ BUILDPATH ?= obj-$(DEB_HOST_GNU_TYPE
  override_dh_auto_configure:
  	ln -s /usr/bin/qdoc6 /usr/bin/qdoc
  	ls -lsh /usr/bin/qdoc*
 +	ln -s /usr/bin/qmake6 /usr/bin/qmake
 +	ls -lsh /usr/bin/qmake*
  	dh_auto_configure -- \
 -		-DQBS_ENABLE_RPATH=no \
 -		-DWITH_TESTS=yes \
 -		-DWITH_UNIT_TESTS=yes \
 +		-DQBS_ENABLE_RPATH=OFF \
 +		-DWITH_TESTS=OFF \
 +		-DWITH_UNIT_TESTS=OFF \
  		-DQBS_LIB_INSTALL_DIR=lib/${DEB_HOST_MULTIARCH} \
  		-DQBS_PLUGINS_INSTALL_BASE=lib/${DEB_HOST_MULTIARCH} \
 -		-DQBS_INSTALL_MAN_PAGE=yes \
 +		-DQBS_INSTALL_MAN_PAGE=ON \
  		-DQBS_INSTALL_HTML_DOCS=$(if $(filter qbs-doc-html, $(shell dh_listpackages)),yes,no) \
 -		-DQBS_INSTALL_QCH_DOCS=$(if $(filter qbs-doc, $(shell dh_listpackages)),yes,no)
 +		-DQBS_INSTALL_QCH_DOCS=$(if $(filter qbs-doc, $(shell dh_listpackages)),yes,no) \
 +		-GNinja
  
 -override_dh_auto_build-arch:
 -	ls -lsh /usr/bin/qdoc*
 -	dh_auto_build -- -C src
 -ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 -	dh_auto_build -- -C share
 -	dh_auto_build -- -C tests
 -endif
 -
 -override_dh_auto_install-arch:
 -	ls -lsh /usr/bin/qdoc*
 -	dh_auto_install -- -C src
 -	dh_auto_install -- -C doc/man
 -
 -override_dh_auto_build-indep:
 -	ls -lsh /usr/bin/qdoc*
 -	dh_auto_build --no-parallel -- -C doc
 -	dh_auto_build -- -C share
 +override_dh_auto_build:
 +	dh_auto_build
  
 -override_dh_auto_install-indep:
 -	dh_auto_install --no-parallel -- -C doc
 -	dh_auto_install -- -C share
 +override_dh_auto_install:
 +	dh_auto_install
  
- execute_after_dh_auto_install:
- 	find debian/tmp -type f -name .gitignore -print -delete
+ override_dh_auto_test-arch:
+ ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+ 	set -ex; \
+ 		export LD_LIBRARY_PATH=$(BUILDPATH)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
+ 		export HOME=$(CURDIR)/debian/.debhelper/generated/_source/home; \
+ 		export QBS_AUTOTEST_PROFILE=qbs_autotests; \
+ 		export QBS_AUTOTEST_ALWAYS_LOG_STDOUT=1; \
+ 		export QBS_AUTOTEST_ALWAYS_LOG_STDERR=1; \
+ 		$(BUILDPATH)/bin/qbs-setup-toolchains /usr/bin/gcc gcc; \
+ 		$(BUILDPATH)/bin/qbs-setup-qt /usr/bin/qmake6 qbs_autotests; \
+ 		[ -n "`$(BUILDPATH)/bin/qbs-config --list profiles.qbs_autotests.baseProfile`" ] || \
+ 			$(BUILDPATH)/bin/qbs-config profiles.qbs_autotests.baseProfile gcc; \
+ 		LC_ALL=C.UTF-8 dh_auto_test --max-parallel=1
+ endif
  
- override_dh_auto_test:
- 	:
+ override_dh_auto_test-indep:
  
  override_dh_compress:
--	dh_compress --exclude=.qch
++	dh_compress --exclude=.qch