[neon/qt/pyside2/Neon/release] debian: rebase on salsa

Carlos De Maine null at kde.org
Thu Jul 25 03:06:04 BST 2024


Git commit 4def94d8f72bcf3294d1dbcdb797117aa3821a5f by Carlos De Maine.
Committed on 25/07/2024 at 02:04.
Pushed by carlosdem into branch 'Neon/release'.

rebase on salsa

M  +15   -11   debian/control
M  +3    -3    debian/rules

https://invent.kde.org/neon/qt/pyside2/-/commit/4def94d8f72bcf3294d1dbcdb797117aa3821a5f

diff --cc debian/control
index 56e8d4a5,8f224450..35e047cd
--- a/debian/control
+++ b/debian/control
@@@ -7,10 -7,9 +7,11 @@@ Build-Depends: chrpath
                 cmake (>= 3.1),
                 debhelper-compat (= 13),
                 dh-python,
+                dpkg-dev (>= 1.22.5),
 +               gcc-12,
 +               g++-12,
                 graphviz,
-                libclang-15-dev,
+                libclang-dev,
                 libqt5charts5-dev (>= 5.15),
                 libqt5datavisualization5-dev (>= 5.15),
                 libqt5opengl5-dev (>= 5.15),
@@@ -28,10 -27,7 +29,11 @@@
                 libqt5xmlpatterns5-dev (>= 5.15),
                 libxml2-dev,
                 libxslt1-dev,
 +               llvm-15-dev,
 +               patchelf,
 +               pybuild-plugin-pyproject,
 +               python3-build,
+                llvm-dev,
                 python3-dev,
                 python3-distro,
                 python3-setuptools,
@@@ -715,4 -711,4 +719,4 @@@ Description: Python bindings for Qt5 We
   Qt is a cross-platform C++ application framework. Qt's primary feature
   is its rich set of widgets that provide standard GUI functionality.
   .
-- This package contains Python 3 bindings for the QtWebEngine module.
++ This package contains Python 3 bindings for the QtWebEngine module.
diff --cc debian/rules
index 709082cf,e859103e..d6aa9cc1
--- a/debian/rules
+++ b/debian/rules
@@@ -4,12 -2,9 +4,12 @@@ export DH_VERBOSE=
  
  include /usr/share/dpkg/default.mk
  
 +export CC=gcc-12
 +export CXX=g++-12
 +
  # Safety measure to ensure package names match SONAMEs
  PYSIDE_MAJOR := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d. -f1-2)
- ifeq ($(shell awk '/Package:/ {print $$2}' debian/control | grep -- -$(PYSIDE_MAJOR)$$),)
+ ifeq ($(shell awk '/Package:/ {print $$2}' debian/control | grep -- '-$(PYSIDE_MAJOR)\(t64\)\?$$'),)
      $(error Please update package names for major version $(PYSIDE_MAJOR))
  endif
  ifeq ($(shell ls debian/lib* | grep -- -$(PYSIDE_MAJOR)),)



More information about the Neon-commits mailing list