[neon/qt6/pyside6/Neon/unstable] debian: rebase wrap-and-sort, python pip
Carlos De Maine
null at kde.org
Sat Jul 27 05:38:49 BST 2024
Git commit ab263262dc4c2f758e232465860b7ff0616ef9d7 by Carlos De Maine, on behalf of Jonathan Esk-Riddell.
Committed on 25/07/2024 at 13:53.
Pushed by carlosdem into branch 'Neon/unstable'.
rebase wrap-and-sort, python pip
M +30 -0 debian/control
M +165 -0 debian/tests/control
https://invent.kde.org/neon/qt6/pyside6/-/commit/ab263262dc4c2f758e232465860b7ff0616ef9d7
diff --git a/debian/control b/debian/control
index bd26e2dc..1bd80939 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: chrpath,
libxml2-dev,
libxslt1-dev,
llvm-dev,
+<<<<<<< HEAD
mold,
ninja-build,
patchelf,
@@ -54,6 +55,35 @@ Build-Depends: chrpath,
qt6-websockets-dev,
qt6-webview-dev,
sip-tools,
+=======
+ python3-dev,
+ python3-distro,
+ python3-pip,
+ python3-setuptools,
+ python3-sphinx,
+ python3-sphinx-rtd-theme,
+ python3-wheel,
+ qt6-5compat-dev,
+ qt6-base-dev,
+ qt6-base-dev-tools,
+ qt6-charts-dev,
+ qt6-declarative-dev,
+ qt6-declarative-dev-tools,
+ qt6-location-dev,
+ qt6-phonon-dev,
+ qt6-positioning-dev,
+ qt6-sensors-dev,
+ qt6-shadertools-dev,
+ qt6-svg-dev,
+ qt6-tools-dev,
+ qt6-tools-dev-tools,
+ qt6-wayland-dev,
+ qt6-wayland-dev-tools,
+ qt6-webchannel-dev,
+ qt6-webengine-dev,
+ qt6-webengine-dev-tools,
+ qt6-webview-dev,
+>>>>>>> e38cec6 (wrap-and-sort, python pip)
xauth,
xvfb,
Rules-Requires-Root: no
diff --git a/debian/tests/control b/debian/tests/control
index 93096d55..b37574fc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtcore pyside6.QtCore
Depends: python3, python3-pyside6.qtcore
Restrictions: allow-stderr, superficial
@@ -160,4 +161,168 @@ Restrictions: allow-stderr, superficial
Test-Command: debian/tests/test_install_python3.sh python3-pyside6.qtwebengine pyside6.QtWebEngine
Depends: python3, python3-pyside6.qtwebengine
+=======
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtcore PySide2.QtCore
+Depends: python3, python3-pyside2.qtcore
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwidgets PySide2.QtWidgets
+Depends: python3, python3-pyside2.qtwidgets
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3drender PySide2.Qt3DRender
+Depends: python3, python3-pyside2.qt3drender
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtquick PySide2.QtQuick
+Depends: python3, python3-pyside2.qtquick
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtpositioning PySide2.QtPositioning
+Depends: python3, python3-pyside2.qtpositioning
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtx11extras PySide2.QtX11Extras
+Depends: python3, python3-pyside2.qtx11extras
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtqml PySide2.QtQml
+Depends: python3, python3-pyside2.qtqml
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebenginecore PySide2.QtWebEngineCore
+Depends: python3, python3-pyside2.qtwebenginecore
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qttexttospeech PySide2.QtTextToSpeech
+Depends: python3, python3-pyside2.qttexttospeech
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qthelp PySide2.QtHelp
+Depends: python3, python3-pyside2.qthelp
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtscripttools PySide2.QtScriptTools
+Depends: python3, python3-pyside2.qtscripttools
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtnetwork PySide2.QtNetwork
+Depends: python3, python3-pyside2.qtnetwork
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtmultimediawidgets PySide2.QtMultimediaWidgets
+Depends: python3, python3-pyside2.qtmultimediawidgets
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtlocation PySide2.QtLocation
+Depends: python3, python3-pyside2.qtlocation
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dlogic PySide2.Qt3DLogic
+Depends: python3, python3-pyside2.qt3dlogic
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtsensors PySide2.QtSensors
+Depends: python3, python3-pyside2.qtsensors
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtmultimedia PySide2.QtMultimedia
+Depends: python3, python3-pyside2.qtmultimedia
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtscript PySide2.QtScript
+Depends: python3, python3-pyside2.qtscript
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebchannel PySide2.QtWebChannel
+Depends: python3, python3-pyside2.qtwebchannel
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtprintsupport PySide2.QtPrintSupport
+Depends: python3, python3-pyside2.qtprintsupport
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtquickwidgets PySide2.QtQuickWidgets
+Depends: python3, python3-pyside2.qtquickwidgets
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dinput PySide2.Qt3DInput
+Depends: python3, python3-pyside2.qt3dinput
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dextras PySide2.Qt3DExtras
+Depends: python3, python3-pyside2.qt3dextras
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtxml PySide2.QtXml
+Depends: python3, python3-pyside2.qtxml
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qttest PySide2.QtTest
+Depends: python3, python3-pyside2.qttest
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebenginewidgets PySide2.QtWebEngineWidgets
+Depends: python3, python3-pyside2.qtwebenginewidgets
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtconcurrent PySide2.QtConcurrent
+Depends: python3, python3-pyside2.qtconcurrent
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtxmlpatterns PySide2.QtXmlPatterns
+Depends: python3, python3-pyside2.qtxmlpatterns
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtcharts PySide2.QtCharts
+Depends: python3, python3-pyside2.qtcharts
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtuitools PySide2.QtUiTools
+Depends: python3, python3-pyside2.qtuitools
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtopengl PySide2.QtOpenGL
+Depends: python3, python3-pyside2.qtopengl
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3danimation PySide2.Qt3DAnimation
+Depends: python3, python3-pyside2.qt3danimation
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qt3dcore PySide2.Qt3DCore
+Depends: python3, python3-pyside2.qt3dcore
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtsql PySide2.QtSql
+Depends: python3, python3-pyside2.qtsql
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtgui PySide2.QtGui
+Depends: python3, python3-pyside2.qtgui
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtsvg PySide2.QtSvg
+Depends: python3, python3-pyside2.qtsvg
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebsockets PySide2.QtWebSockets
+Depends: python3, python3-pyside2.qtwebsockets
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtdatavisualization PySide2.QtDataVisualization
+Depends: python3, python3-pyside2.qtdatavisualization
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtopenglfunctions PySide2.QtOpenGLFunctions
+Depends: python3, python3-pyside2.qtopenglfunctions
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtscxml PySide2.QtScxml
+Depends: python3, python3-pyside2.qtscxml
+Restrictions: allow-stderr, superficial
+
+Test-Command: debian/tests/test_install_python3.sh python3-pyside2.qtwebengine PySide2.QtWebEngine
+Depends: python3, python3-pyside2.qtwebengine
+>>>>>>> e38cec6 (wrap-and-sort, python pip)
Restrictions: allow-stderr, superficial
More information about the Neon-commits
mailing list