[neon/kde/kcachegrind/Neon/unstable] debian: merge Neon/experimental into Neon/unstable

Carlos De Maine null at kde.org
Thu Oct 26 04:58:03 BST 2023


Git commit a127baf1193811a06848cbc16c94ca039f4df954 by Carlos De Maine.
Committed on 26/10/2023 at 05:58.
Pushed by carlosdem into branch 'Neon/unstable'.

merge Neon/experimental into Neon/unstable

D  +0    -1    debian/compat
M  +16   -17   debian/control
M  +4    -4    debian/rules

https://invent.kde.org/neon/kde/kcachegrind/-/commit/a127baf1193811a06848cbc16c94ca039f4df954

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 5fa8f30..8931095 100644
--- a/debian/control
+++ b/debian/control
@@ -6,22 +6,23 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Maximiliano Curia <maxy at debian.org>,
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 1.7.0~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                gettext,
-               libkf5archive-dev,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5doctools-dev,
-               libkf5i18n-dev,
-               libkf5kio-dev,
-               libkf5widgetsaddons-dev,
-               libkf5xmlgui-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.2.0~),
-               qttools5-dev,
-Standards-Version: 4.1.3
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kcolorscheme-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-tools-dev,
+Standards-Version: 4.6.2
 Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kcachegrind.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kcachegrind.git
@@ -32,8 +33,6 @@ Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: graphviz, valgrind
 Suggests: kcachegrind-converters, khelpcenter
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: visualisation tool for the Valgrind profiler
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a memory profiling tool for valgrind.  Any executable can be
diff --git a/debian/rules b/debian/rules
index 5bd34ce..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:16.04.3-10~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list