[neon/qt6/pyside6/Neon/unstable] debian: Revert "try ad fix installs with trailing slashes"
Carlos De Maine
null at kde.org
Tue Oct 31 23:50:12 GMT 2023
Git commit af493ea8b49bf2470a3724594ffff6c3a9fbb0f8 by Carlos De Maine.
Committed on 01/11/2023 at 00:50.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "try ad fix installs with trailing slashes"
This reverts commit 6ac21fd764d484a88f79faf33dd044431b6e7126.
M +5 -5 debian/libpyside6-dev.install
M +1 -1 debian/libpyside6.install
M +4 -4 debian/libshiboken6-dev.install
M +1 -1 debian/libshiboken6.install
M +17 -17 debian/python3-pyside6.install
M +12 -12 debian/python3-shiboken6.install
https://invent.kde.org/neon/qt6/pyside6/-/commit/af493ea8b49bf2470a3724594ffff6c3a9fbb0f8
diff --git a/debian/libpyside6-dev.install b/debian/libpyside6-dev.install
index e632180..8713d3c 100644
--- a/debian/libpyside6-dev.install
+++ b/debian/libpyside6-dev.install
@@ -1,5 +1,5 @@
-build/qfp-*-relwithdebinfo/install/include/PySide6/ usr/include/
-build/qfp-*-relwithdebinfo/install/share/PySide6/ usr/share/PySide6/
-build/qfp-*-relwithdebinfo/install/lib/pkgconfig/pyside6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-build/qfp-*-relwithdebinfo/install/lib/libpyside6*.so usr/lib/${DEB_HOST_MULTIARCH}/
-build/qfp-*-relwithdebinfo/install/lib/cmake/PySide6* usr/lib/${DEB_HOST_MULTIARCH}/cmake/
+build/qfp-*-relwithdebinfo/install/include/PySide6 usr/include
+build/qfp-*-relwithdebinfo/install/share/PySide6 usr/share
+build/qfp-*-relwithdebinfo/install/lib/pkgconfig/pyside6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+build/qfp-*-relwithdebinfo/install/lib/libpyside6*.so usr/lib/${DEB_HOST_MULTIARCH}
+build/qfp-*-relwithdebinfo/install/lib/cmake/PySide6* usr/lib/${DEB_HOST_MULTIARCH}/cmake
diff --git a/debian/libpyside6.install b/debian/libpyside6.install
index fddb844..bceb3f0 100644
--- a/debian/libpyside6.install
+++ b/debian/libpyside6.install
@@ -1 +1 @@
-build/qfp-*-relwithdebinfo/install/lib/libpyside6*.so.* usr/lib/${DEB_HOST_MULTIARCH}/
+build/qfp-*-relwithdebinfo/install/lib/libpyside6*.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libshiboken6-dev.install b/debian/libshiboken6-dev.install
index e86b57b..616a1e9 100644
--- a/debian/libshiboken6-dev.install
+++ b/debian/libshiboken6-dev.install
@@ -1,4 +1,4 @@
-build/qfp-*-relwithdebinfo/install/include/shiboken6/ usr/include/shiboken6*/
-build/qfp-*-relwithdebinfo/install/lib/pkgconfig/shiboken6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-build/qfp-*-relwithdebinfo/install/lib/libshiboken6*.so usr/lib/${DEB_HOST_MULTIARCH}/
-build/qfp-*-relwithdebinfo/install/lib/cmake/Shiboken6* usr/lib/${DEB_HOST_MULTIARCH}/cmake/
+build/qfp-*-relwithdebinfo/install/include/shiboken6 usr/include
+build/qfp-*-relwithdebinfo/install/lib/pkgconfig/shiboken6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+build/qfp-*-relwithdebinfo/install/lib/libshiboken6*.so usr/lib/${DEB_HOST_MULTIARCH}
+build/qfp-*-relwithdebinfo/install/lib/cmake/Shiboken6* usr/lib/${DEB_HOST_MULTIARCH}/cmake
diff --git a/debian/libshiboken6.install b/debian/libshiboken6.install
index 20a00bf..f555853 100644
--- a/debian/libshiboken6.install
+++ b/debian/libshiboken6.install
@@ -1 +1 @@
-build/qfp-*-relwithdebinfo/install/lib/libshiboken6*.so.* usr/lib/${DEB_HOST_MULTIARCH}/
+build/qfp-*-relwithdebinfo/install/lib/libshiboken6*.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/python3-pyside6.install b/debian/python3-pyside6.install
index 283f7a3..9e0d071 100644
--- a/debian/python3-pyside6.install
+++ b/debian/python3-pyside6.install
@@ -1,19 +1,19 @@
build/pyside6_install/usr/bin/pyside6-* usr/bin
-build/qfp-*-relwithdebinfo/package/PySide6/__init__.py usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/_config.py usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/_git_pyside_version.py usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/*.pyi usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/assistant usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/designer usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/linguist usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/lrelease usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/lupdate usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/py.typed usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/qmlformat usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/qmllint usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/qmlls usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/Qt/ usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/Qt*.so usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/scripts/ usr/lib/python3/dist-packages/PySide6/
-build/qfp-*-relwithdebinfo/package/PySide6/support/ usr/lib/python3/dist-packages/PySide6/
+build/qfp-*-relwithdebinfo/package/PySide6/__init__.py usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/_config.py usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/_git_pyside_version.py usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/*.pyi usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/assistant usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/designer usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/linguist usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/lrelease usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/lupdate usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/py.typed usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/qmlformat usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/qmllint usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/qmlls usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/Qt usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/Qt*.so usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/scripts usr/lib/python3/dist-packages/PySide6
+build/qfp-*-relwithdebinfo/package/PySide6/support usr/lib/python3/dist-packages/PySide6
diff --git a/debian/python3-shiboken6.install b/debian/python3-shiboken6.install
index 7277730..d1688f2 100644
--- a/debian/python3-shiboken6.install
+++ b/debian/python3-shiboken6.install
@@ -1,14 +1,14 @@
-build/pyside6_install/usr/bin/shiboken6* usr/bin/
+build/pyside6_install/usr/bin/shiboken6* usr/bin
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/__init__.py usr/lib/python3/dist-packages/shiboken6/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/_config.py usr/lib/python3/dist-packages/shiboken6/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/_git_shiboken_module_version.py usr/lib/python3/dist-packages/shiboken6/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/py.typed usr/lib/python3/dist-packages/shiboken6/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/Shiboken.abi3.so usr/lib/python3/dist-packages/shiboken6/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/Shiboken.pyi usr/lib/python3/dist-packages/shiboken6/
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/__init__.py usr/lib/python3/dist-packages/shiboken6
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/_config.py usr/lib/python3/dist-packages/shiboken6
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/_git_shiboken_module_version.py usr/lib/python3/dist-packages/shiboken6
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/py.typed usr/lib/python3/dist-packages/shiboken6
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/Shiboken.abi3.so usr/lib/python3/dist-packages/shiboken6
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6/Shiboken.pyi usr/lib/python3/dist-packages/shiboken6
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/__init__.py usr/lib/python3/dist-packages/shiboken6_generator/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/_config.py usr/lib/python3/dist-packages/shiboken6_generator/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/_git_shiboken_generator_version.py usr/lib/python3/dist-packages/shiboken6_generator/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/scripts/ usr/lib/python3/dist-packages/shiboken6_generator/
-build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/shiboken6/ usr/lib/python3/dist-packages/shiboken6_generator/
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/__init__.py usr/lib/python3/dist-packages/shiboken6_generator
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/_config.py usr/lib/python3/dist-packages/shiboken6_generator
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/_git_shiboken_generator_version.py usr/lib/python3/dist-packages/shiboken6_generator
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/scripts usr/lib/python3/dist-packages/shiboken6_generator
+build/pyside6_install/usr/lib/python3.10/dist-packages/shiboken6_generator/shiboken6 usr/lib/python3/dist-packages/shiboken6_generator
More information about the Neon-commits
mailing list