[neon/qt6/pyside6/Neon/release] debian: trim down excess deps and make sure its all pyside6

Carlos De Maine null at kde.org
Sat Jul 1 23:33:15 BST 2023 

Git commit 10306df357e1893da9f2ac86db433d7a0d58c368 by Carlos De Maine.
Committed on 01/07/2023 at 22:33.
Pushed by carlosdem into branch 'Neon/release'.

trim down excess deps and make sure its all pyside6

M  +1    -7    debian/control
M  +1    -1    debian/rules
M  +82   -82   debian/tests/control
M  +3    -3    debian/tests/control.gen

https://invent.kde.org/neon/qt6/pyside6/-/commit/10306df357e1893da9f2ac86db433d7a0d58c368

diff --git a/debian/control b/debian/control
index 1db6090..e1e259d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Build-Depends: chrpath,
                clang-14,
                cmake,
                debhelper-compat (= 13),
-               dh-sequence-python3,
                dh-python,
                libclang-14-dev,
                libxml2-dev,
@@ -15,12 +14,8 @@ Build-Depends: chrpath,
                ninja-build,
                patchelf,
                python3-dev,
-               python3-distro,
-               python3-matplotlib,
-               python3-numpy,
-               python3-pep517,
+#               python3-distro,
                python3-pip,
-               python3-pyface,
                qt6-3d-dev,
                qt6-5compat-dev,
                qt6-base-dev,
@@ -53,7 +48,6 @@ Build-Depends: chrpath,
                qt6-webview-dev,
                xauth,
                xvfb,
-               zlib1g-dev
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://wiki.qt.io/Qt_for_Python
diff --git a/debian/rules b/debian/rules
index d29e15b..af383ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/dpkg/default.mk
 export PYBUILD_NAME=pyside6
 export PYBUILD_SYSTEM=distutils
 export PYBUILD_BUILD_ARGS=--relwithdebinfo --verbose --build-tests --doc-build-online --ignore-git --qtpaths=/usr/lib/qt6/bin/qtpaths6 $(OPTION_JOBS)
-export PYBUILD_INSTALL_ARGS_python3=--reuse-build
+#export PYBUILD_INSTALL_ARGS_python3=--reuse-build
 
 export MAIN_VERSION_UPSTREAM := $(shell echo $(DEB_VERSION_UPSTREAM))
 # As per https://wiki.debian.org/HardeningWalkthrough as arm64 has strncpy warnings  
diff --git a/debian/tests/control b/debian/tests/control
index 90f9bc9..93096d5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,163 +1,163 @@
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtcore PySide2.QtCore
-Depends: python3, python3-pyside2.qtcore
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtcore pyside6.QtCore
+Depends: python3, python3-pyside6.qtcore
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwidgets PySide2.QtWidgets
-Depends: python3, python3-pyside2.qtwidgets
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtwidgets pyside6.QtWidgets
+Depends: python3, python3-pyside6.qtwidgets
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3drender PySide2.Qt3DRender
-Depends: python3, python3-pyside2.qt3drender
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qt3drender pyside6.Qt3DRender
+Depends: python3, python3-pyside6.qt3drender
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtquick PySide2.QtQuick
-Depends: python3, python3-pyside2.qtquick
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtquick pyside6.QtQuick
+Depends: python3, python3-pyside6.qtquick
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtpositioning PySide2.QtPositioning
-Depends: python3, python3-pyside2.qtpositioning
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtpositioning pyside6.QtPositioning
+Depends: python3, python3-pyside6.qtpositioning
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtx11extras PySide2.QtX11Extras
-Depends: python3, python3-pyside2.qtx11extras
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtx11extras pyside6.QtX11Extras
+Depends: python3, python3-pyside6.qtx11extras
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtqml PySide2.QtQml
-Depends: python3, python3-pyside2.qtqml
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtqml pyside6.QtQml
+Depends: python3, python3-pyside6.qtqml
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebenginecore PySide2.QtWebEngineCore
-Depends: python3, python3-pyside2.qtwebenginecore
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtwebenginecore pyside6.QtWebEngineCore
+Depends: python3, python3-pyside6.qtwebenginecore
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qttexttospeech PySide2.QtTextToSpeech
-Depends: python3, python3-pyside2.qttexttospeech
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qttexttospeech pyside6.QtTextToSpeech
+Depends: python3, python3-pyside6.qttexttospeech
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qthelp PySide2.QtHelp
-Depends: python3, python3-pyside2.qthelp
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qthelp pyside6.QtHelp
+Depends: python3, python3-pyside6.qthelp
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtscripttools PySide2.QtScriptTools
-Depends: python3, python3-pyside2.qtscripttools
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtscripttools pyside6.QtScriptTools
+Depends: python3, python3-pyside6.qtscripttools
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtnetwork PySide2.QtNetwork
-Depends: python3, python3-pyside2.qtnetwork
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtnetwork pyside6.QtNetwork
+Depends: python3, python3-pyside6.qtnetwork
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtmultimediawidgets PySide2.QtMultimediaWidgets
-Depends: python3, python3-pyside2.qtmultimediawidgets
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtmultimediawidgets pyside6.QtMultimediaWidgets
+Depends: python3, python3-pyside6.qtmultimediawidgets
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtlocation PySide2.QtLocation
-Depends: python3, python3-pyside2.qtlocation
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtlocation pyside6.QtLocation
+Depends: python3, python3-pyside6.qtlocation
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dlogic PySide2.Qt3DLogic
-Depends: python3, python3-pyside2.qt3dlogic
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qt3dlogic pyside6.Qt3DLogic
+Depends: python3, python3-pyside6.qt3dlogic
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtsensors PySide2.QtSensors
-Depends: python3, python3-pyside2.qtsensors
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtsensors pyside6.QtSensors
+Depends: python3, python3-pyside6.qtsensors
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtmultimedia PySide2.QtMultimedia
-Depends: python3, python3-pyside2.qtmultimedia
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtmultimedia pyside6.QtMultimedia
+Depends: python3, python3-pyside6.qtmultimedia
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtscript PySide2.QtScript
-Depends: python3, python3-pyside2.qtscript
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtscript pyside6.QtScript
+Depends: python3, python3-pyside6.qtscript
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebchannel PySide2.QtWebChannel
-Depends: python3, python3-pyside2.qtwebchannel
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtwebchannel pyside6.QtWebChannel
+Depends: python3, python3-pyside6.qtwebchannel
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtprintsupport PySide2.QtPrintSupport
-Depends: python3, python3-pyside2.qtprintsupport
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtprintsupport pyside6.QtPrintSupport
+Depends: python3, python3-pyside6.qtprintsupport
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtquickwidgets PySide2.QtQuickWidgets
-Depends: python3, python3-pyside2.qtquickwidgets
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtquickwidgets pyside6.QtQuickWidgets
+Depends: python3, python3-pyside6.qtquickwidgets
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dinput PySide2.Qt3DInput
-Depends: python3, python3-pyside2.qt3dinput
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qt3dinput pyside6.Qt3DInput
+Depends: python3, python3-pyside6.qt3dinput
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dextras PySide2.Qt3DExtras
-Depends: python3, python3-pyside2.qt3dextras
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qt3dextras pyside6.Qt3DExtras
+Depends: python3, python3-pyside6.qt3dextras
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtxml PySide2.QtXml
-Depends: python3, python3-pyside2.qtxml
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtxml pyside6.QtXml
+Depends: python3, python3-pyside6.qtxml
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qttest PySide2.QtTest
-Depends: python3, python3-pyside2.qttest
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qttest pyside6.QtTest
+Depends: python3, python3-pyside6.qttest
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebenginewidgets PySide2.QtWebEngineWidgets
-Depends: python3, python3-pyside2.qtwebenginewidgets
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtwebenginewidgets pyside6.QtWebEngineWidgets
+Depends: python3, python3-pyside6.qtwebenginewidgets
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtconcurrent PySide2.QtConcurrent
-Depends: python3, python3-pyside2.qtconcurrent
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtconcurrent pyside6.QtConcurrent
+Depends: python3, python3-pyside6.qtconcurrent
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtxmlpatterns PySide2.QtXmlPatterns
-Depends: python3, python3-pyside2.qtxmlpatterns
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtxmlpatterns pyside6.QtXmlPatterns
+Depends: python3, python3-pyside6.qtxmlpatterns
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtcharts PySide2.QtCharts
-Depends: python3, python3-pyside2.qtcharts
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtcharts pyside6.QtCharts
+Depends: python3, python3-pyside6.qtcharts
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtuitools PySide2.QtUiTools
-Depends: python3, python3-pyside2.qtuitools
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtuitools pyside6.QtUiTools
+Depends: python3, python3-pyside6.qtuitools
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtopengl PySide2.QtOpenGL
-Depends: python3, python3-pyside2.qtopengl
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtopengl pyside6.QtOpenGL
+Depends: python3, python3-pyside6.qtopengl
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3danimation PySide2.Qt3DAnimation
-Depends: python3, python3-pyside2.qt3danimation
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qt3danimation pyside6.Qt3DAnimation
+Depends: python3, python3-pyside6.qt3danimation
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dcore PySide2.Qt3DCore
-Depends: python3, python3-pyside2.qt3dcore
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qt3dcore pyside6.Qt3DCore
+Depends: python3, python3-pyside6.qt3dcore
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtsql PySide2.QtSql
-Depends: python3, python3-pyside2.qtsql
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtsql pyside6.QtSql
+Depends: python3, python3-pyside6.qtsql
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtgui PySide2.QtGui
-Depends: python3, python3-pyside2.qtgui
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtgui pyside6.QtGui
+Depends: python3, python3-pyside6.qtgui
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtsvg PySide2.QtSvg
-Depends: python3, python3-pyside2.qtsvg
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtsvg pyside6.QtSvg
+Depends: python3, python3-pyside6.qtsvg
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebsockets PySide2.QtWebSockets
-Depends: python3, python3-pyside2.qtwebsockets
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtwebsockets pyside6.QtWebSockets
+Depends: python3, python3-pyside6.qtwebsockets
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtdatavisualization PySide2.QtDataVisualization
-Depends: python3, python3-pyside2.qtdatavisualization
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtdatavisualization pyside6.QtDataVisualization
+Depends: python3, python3-pyside6.qtdatavisualization
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtopenglfunctions PySide2.QtOpenGLFunctions
-Depends: python3, python3-pyside2.qtopenglfunctions
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtopenglfunctions pyside6.QtOpenGLFunctions
+Depends: python3, python3-pyside6.qtopenglfunctions
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtscxml PySide2.QtScxml
-Depends: python3, python3-pyside2.qtscxml
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtscxml pyside6.QtScxml
+Depends: python3, python3-pyside6.qtscxml
 Restrictions: allow-stderr, superficial
 
-Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebengine PySide2.QtWebEngine
-Depends: python3, python3-pyside2.qtwebengine
+Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtwebengine pyside6.QtWebEngine
+Depends: python3, python3-pyside6.qtwebengine
 Restrictions: allow-stderr, superficial
diff --git a/debian/tests/control.gen b/debian/tests/control.gen
index 8f6f6f8..0bffccd 100755
--- a/debian/tests/control.gen
+++ b/debian/tests/control.gen
@@ -4,11 +4,11 @@
 rm -f debian/tests/control
 
 # Create the basic (import) test for Python 3 modules
-for binary_package in $(dh_listpackages|grep "python3-pyside2.qt"); do
+for binary_package in $(dh_listpackages|grep "python3-pyside6.qt"); do
     module_name=$(echo $binary_package|awk -F. '{print $2}')
     # find import_name
-    import_name=$(find sources/pyside2/PySide2/ -maxdepth 1 -type d| xargs -n 1 basename|grep -i ^$module_name$)
-    echo "Test-Command: debian/tests/test_install_python3.sh $binary_package PySide2.$import_name
+    import_name=$(find sources/pyside6/pyside6/ -maxdepth 1 -type d| xargs -n 1 basename|grep -i ^$module_name$)
+    echo "Test-Command: debian/tests/test_install_python3.sh $binary_package pyside6.$import_name
 Depends: $binary_package, python3
 Restrictions: allow-stderr, superficial
 " >>debian/tests/control

More information about the Neon-commits mailing list