[neon/kde/powerdevil/Neon/unstable] debian: modernise and use gcc11 for c++20 features

Carlos De Maine null at kde.org
Wed Jun 21 02:50:48 BST 2023


Git commit 3ec964dbd0bacc8500007e99ed232dd742f3042e by Carlos De Maine.
Committed on 21/06/2023 at 01:50.
Pushed by carlosdem into branch 'Neon/unstable'.

modernise and use gcc11 for c++20 features

D  +0    -1    debian/compat
M  +6    -6    debian/control
M  +3    -3    debian/rules

https://invent.kde.org/neon/kde/powerdevil/-/commit/3ec964dbd0bacc8500007e99ed232dd742f3042e

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 83d05e5..cfb1350 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               g++-11,
+               gcc-11,
                kf6-bluez-qt-dev,
                kf6-extra-cmake-modules,
                kf6-kactivities-dev,
@@ -43,9 +45,9 @@ Build-Depends: cmake (>= 3.0~),
                libxrandr-dev,
                pkg-config,
                pkg-kde-tools-neon,
-               plasma-workspace-dev (>= 4:5.14.5~),
+               plasma-workspace-dev,
                qt6-base-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.6.1
 Homepage: https://projects.kde.org/projects/kde/workspace/powerdevil
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/powerdevil
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/powerdevil.git
@@ -75,8 +77,6 @@ Architecture: any
 Depends: powerdevil-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kde-workspace-data (<< 4:4.98.0)
-Replaces: kde-workspace-data (<< 4:4.98.0)
 Description: Global power saver settings.
  Power Devil allows you to define your all power settings.
 
diff --git a/debian/rules b/debian/rules
index cb9e84d..125bf86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
+export CC=gcc-11
+export CXX=g++-11
+
 %:
 	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_autoconfigure
-	dh_autoconfigure -- -std=c++20 -fmodules-ts
-
 override_dh_shlibdeps:
 	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list