[neon/qt6/qt6-networkauth/Neon/unstable] debian: adapt to noble's gcc-13 and *t64 transitionals

Carlos De Maine null at kde.org
Sat Apr 27 14:05:15 BST 2024


Git commit 0d52f30b414a0e9e6eed06fd74fdd322b200a857 by Carlos De Maine.
Committed on 27/04/2024 at 13:04.
Pushed by carlosdem into branch 'Neon/unstable'.

adapt to noble's gcc-13 and *t64 transitionals

M  +7    -3    debian/control
M  +0    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-networkauth/-/commit/0d52f30b414a0e9e6eed06fd74fdd322b200a857

diff --git a/debian/control b/debian/control
index 623b5f5..e53d3a1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               g++-12,
-               gcc-12,
                libgl-dev,
                libssl-dev,
                libvulkan-dev [linux-any],
@@ -16,7 +14,7 @@ Build-Depends: cmake,
                pkgconf,
                pkg-kde-tools,
                qt6-base-dev (>= 6.7.0~)
-Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
                      qt6-documentation-tools (>= 6.7~) <!nodoc>,
                      qt6-base-doc (>= 6.7~) <!nodoc>,
 Standards-Version: 4.6.2
@@ -94,6 +92,12 @@ Depends: qt6-networkauth, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
+Package: libqt6networkauth6t64
+Architecture: all
+Depends: qt6-networkauth, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: qt6-networkauth-doc-dev
 Architecture: all
 Depends: qt6-networkauth-dev, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 3a07358..6c8e11c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,6 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
-# need gcc 12.1 for mold to be able to process --gdb-index
-export CC=gcc-12
-export CXX=g++-12
-
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += -DQT_HOST_PATH=/usr


More information about the Neon-commits mailing list