[neon/qt6/qt6-tools/Neon/release] debian: its more lintings && abuse profiles with neon_nodoc
Carlos De Maine
null at kde.org
Thu Dec 14 11:20:52 GMT 2023
Git commit 4ade8f67478a52a36649504a16d1e03583c012d0 by Carlos De Maine.
Committed on 14/12/2023 at 11:56.
Pushed by carlosdem into branch 'Neon/release'.
its more lintings && abuse profiles with neon_nodoc
M +6 -8 debian/control
M +6 -25 debian/rules
https://invent.kde.org/neon/qt6/qt6-tools/-/commit/4ade8f67478a52a36649504a16d1e03583c012d0
diff --git a/debian/control b/debian/control
index f824688..4b9f5c8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,17 +9,14 @@ Build-Depends: clang-14,
g++-12,
gcc-12,
libclang-14-dev,
- libcurl4-openssl-dev | libcurl4-dev,
libgl-dev,
# liblitehtml-dev (>= 0.6~),
libssl-dev,
libvulkan-dev [linux-any],
libxcb-xkb-dev,
- llvm,
- llvm-14,
- llvm-14-dev,
libxkbcommon-dev,
libzstd-dev (>= 1.3),
+ llvm-14-dev,
mold,
ninja-build,
pkg-config,
@@ -40,7 +37,8 @@ Architecture: any
Section: kde
X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
-Depends: llvm-14,
+Depends: libclang-14,
+ llvm-14,
qt6-base,
qt6-declarative,
${misc:Depends},
@@ -48,12 +46,12 @@ Depends: llvm-14,
Provides: qt6-designer-abi (= 6.6.1),
qt6-help-abi (= 6.6.1),
qt6-uitools-abi (= 6.6.1),
+ assistant-qt6,
+ designer-qt6,
libqt6designer6,
libqt6designercomponents6,
libqt6help6,
libqt6uitools6,
- assistant-qt6,
- designer-qt6,
linguist-qt6,
qdbus-qt6,
qt6-documentation-tools,
@@ -90,7 +88,7 @@ Description: Qt 6 Tools - development files
applications.
Package: qt6-tools-doc
-Build-Profiles: <!nodoc>
+Build-Profiles: <!neon_nodoc>
Architecture: all
Section: kde
X-Neon-MergedPackage: true
diff --git a/debian/rules b/debian/rules
index f3357e2..915419d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,32 +25,13 @@ override_dh_auto_configure:
-DQT_UNITY_BUILD=ON \
$(extra_cmake_args)
-override_dh_shlibdeps:
- dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
override_dh_auto_build-indep:
-# support the nodoc build profile
-#ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-# echo -e "\nnodoc build profile enabled, therefore not building docs.\n"
- dh_auto_build
-#else
-# echo -e "\nnodoc build profile not enabled, therefore building docs.\n"
-# dh_auto_build -- docs
-#endif
+ dh_auto_build -- docs
override_dh_auto_install-indep:
-# support the nodoc build profile
-#ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-# echo -e "\nnodoc build profile enabled, therefore not installing docs.\n"
- DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
-#else
-# echo -e "\nnodoc build profile enabled, therefore installing docs.\n"
-# DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
-# # Remove build path from index files.
-# find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
- sed -i 's@$(CURDIR)/@@g' {} \;
-#endif
-
-execute_after_dh_auto_install-arch:
- # Reproducible builds: remove build paths from .prl files
- sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
+ DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
+ # Remove build path from index files.
+ find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+ sed -i 's@$(CURDIR)/@@g' {} \;
+
More information about the Neon-commits
mailing list