[neon/qt6/qt6-declarative/Neon/release] debian: too many breaks

[Carlos De Maine]

Git commit eac926db7fb28951b86eefab820515e9d2a125d3 by Carlos De Maine.
Committed on 07/12/2024 at 02:39.
Pushed by carlosdem into branch 'Neon/release'.

too many breaks

M  +16   -31   debian/control
M  +3    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/eac926db7fb28951b86eefab820515e9d2a125d3

diff --git a/debian/control b/debian/control
index daff143..98fb824 100644
--- a/debian/control
+++ b/debian/control
@@ -39,37 +39,22 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: qt6-declarative-abi (=6.8.0)
 Breaks: libqt6labsanimation6,
-          libqt6labsfolderlistmodel6,
-          libqt6labsqmlmodels6,
-          libqt6labssettings6,
-          libqt6labssharedimage6,
-          libqt6labswavefrontmesh6,
-          libqt6qml6,
-          libqt6qml6t64,
-          libqt6qmlcompiler6,
-          libqt6qmlcompiler6t64,
-          libqt6qmlcore6,
-          libqt6qmllocalstorage6,
-          libqt6qmlmodels6,
-          libqt6qmlmodels6t64,
-          libqt6qmlworkerscript6,
-          libqt6qmlxmllistmodel6,
-          libqt6quick6,
-          libqt6quick6t64,
-          libqt6quickcontrols2impl6,
-          libqt6quickcontrols2-6,
-          libqt6quickcontrols2-6t64,
-          libqt6quickdialogs2-6,
-          libqt6quickdialogs2quickimpl6,
-          libqt6quickdialogs2utils6,
-          libqt6quicklayouts6,
-          libqt6quickparticles6,
-          libqt6quickshapes6,
-          libqt6quicktemplates2-6,
-          libqt6quicktemplates2-6t64,
-          libqt6quicktest6,
-          libqt6quickwidgets6,
-          libqt6quickwidgets6t64,
+        libqt6labsfolderlistmodel6,
+        libqt6labsqmlmodels6,
+        libqt6labssettings6,
+        libqt6labssharedimage6,
+        libqt6labswavefrontmesh6,
+        libqt6qmlcore6,
+        libqt6qmllocalstorage6,
+        libqt6qmlworkerscript6,
+        libqt6qmlxmllistmodel6,
+        libqt6quickcontrols2impl6,
+        libqt6quickdialogs2-6,
+        libqt6quickdialogs2quickimpl6,
+        libqt6quickdialogs2utils6,
+        libqt6quicklayouts6,
+        libqt6quickparticles6,
+        libqt6quickshapes6
 Replaces: libqt6labsanimation6,
           libqt6labsfolderlistmodel6,
           libqt6labsqmlmodels6,
diff --git a/debian/rules b/debian/rules
index 449741d..91a0c4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,11 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### uncomment when bootstrapping a new qt release ####
-DEB_BUILD_OPTIONS="nodoc"
 DEB_BUILD_PROFILES="nodoc"
-export DEB_BUILD_OPTIONS DEB_BUILD_PROFILES
+export DEB_BUILD_PROFILES
 
-# the next statement obviously has inverted logic but nodoc is not beind added to
-# DEB_BUILD_OPTIONS DEB_BUILD_PROFILES for some reason
+# the next statement obviously has to have inverted logic (ifneq instad of ifeq) to work
+# for a nodoc build as nodoc is not being added to DEB_BUILD_PROFILES for some reason
 ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	extra_build_args +=
 	extra_install_args +=