[neon/extras/kdevelop-python/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Wed Jul 31 05:04:42 BST 2024


Git commit 852e584b9f691c4d837342833a0a4978fbd2953b by Carlos De Maine.
Committed on 31/07/2024 at 04:04.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +18   -27   debian/control
D  +0    -3    debian/kdevelop-python-data.install
D  +0    -2    debian/kdevelop-python-data.lintian-overrides
D  +0    -1    debian/kdevelop-python-data.maintscript
D  +0    -1    debian/kdevelop-python-l10n.install
M  +6    -2    debian/kdevelop-python.install
M  +4    -11   debian/rules

https://invent.kde.org/neon/extras/kdevelop-python/-/commit/852e584b9f691c4d837342833a0a4978fbd2953b

diff --git a/debian/control b/debian/control
index adc1bf2..ca7e1b3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,22 @@ Section: devel
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>
-Build-Depends: cmake (>= 3.16~),
+Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.78.0~),
+               kf6-extra-cmake-modules,
                gettext,
                kdevelop-dev (>= 4:22.04.1~),
-               libkf5i18n-dev (>= 5.78.0~),
-               libkf5itemmodels-dev (>= 5.78.0~),
-               libkf5kcmutils-dev (>= 5.78.0~),
-               libkf5newstuff-dev (>= 5.78.0~),
-               libkf5syntaxhighlighting-dev (>= 5.78.0~),
-               libkf5texteditor-dev (>= 5.78.0~),
-               libkf5threadweaver-dev (>= 5.78.0~),
-               pkg-kde-tools,
+               kf6-ki18n-dev,
+               kf6-kitemmodels-dev,
+               kf6-kcmutils-dev,
+               kf6-knewstuff-dev,
+               kf6-ktexteditor-dev,
+               kf6-syntaxhighlighting-dev,
+               kf6-threadweaver-dev,
+               pkg-kde-tools-neon,
                python3-dev,
-               qtbase5-dev (>= 5.15.0~)
-Standards-Version: 4.6.1
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://www.kdevelop.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdevelop-python
@@ -31,7 +31,6 @@ Depends: kdevelop-python-data (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: kdevelop, pycodestyle, python3-autopep8
-Suggests: kdevelop-python-l10n
 Enhances: kdevelop
 Description: Python 3 plugin for KDevelop
  KDevelop is an easy to use integrated development environment for KDE.
@@ -42,21 +41,13 @@ Description: Python 3 plugin for KDevelop
 
 Package: kdevelop-python-data
 Architecture: all
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}
-Description: Python 3 plugin for KDevelop - data files
- KDevelop is an easy to use integrated development environment for KDE.
- It supports a wide range of programming languages and features project
- management, an advanced editor, a class browser and an integrated debugger.
- .
- This package contains the data files for Python 3 language support plugin.
+Depends: kdevelop-python, ${misc:Depends}
+Description: Description: Dummy transitional.
+ This is a dummy transitional package and can be safely removed.
 
 Package: kdevelop-python-l10n
 Section: localization
 Architecture: all
-Depends: ${misc:Depends}
-Description: localization files for KDevelop Python 3 plugin
- The KDevelop-Python plugin is the language plugin for the Python 3 language
- for the KDevelop integrated development environment for KDE.
- .
- This  package contains the localizations for the KDevelop Python 3 plugin.
+Depends: kdevelop-python, ${misc:Depends}
+Description: Description: Dummy transitional.
+ This is a dummy transitional package and can be safely removed.
diff --git a/debian/kdevelop-python-data.install b/debian/kdevelop-python-data.install
deleted file mode 100644
index 02fc48a..0000000
--- a/debian/kdevelop-python-data.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/kdevappwizard/
-usr/share/kdevpythonsupport/
-usr/share/qlogging-categories5/kdevpythonsupport.categories
diff --git a/debian/kdevelop-python-data.lintian-overrides b/debian/kdevelop-python-data.lintian-overrides
deleted file mode 100644
index 1ba3cc3..0000000
--- a/debian/kdevelop-python-data.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# file parsed as documentation, and not a real source
-kdevelop-python-data: unusual-interpreter python* [usr/share/kdevpythonsupport/documentation_files/*]
diff --git a/debian/kdevelop-python-data.maintscript b/debian/kdevelop-python-data.maintscript
deleted file mode 100644
index fa6f548..0000000
--- a/debian/kdevelop-python-data.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/xdg/kdevpythonsupport.categories 5.4.2-2~~
diff --git a/debian/kdevelop-python-l10n.install b/debian/kdevelop-python-l10n.install
deleted file mode 100644
index 2568e1f..0000000
--- a/debian/kdevelop-python-l10n.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/
diff --git a/debian/kdevelop-python.install b/debian/kdevelop-python.install
index 1ac487c..12549d8 100644
--- a/debian/kdevelop-python.install
+++ b/debian/kdevelop-python.install
@@ -1,6 +1,10 @@
 usr/lib/*/libkdevpythoncompletion.so
 usr/lib/*/libkdevpythonduchain.so
 usr/lib/*/libkdevpythonparser.so
-usr/lib/*/qt5/plugins/kdevplatform/${env:KDEV_PLUGIN_VERSION}/kdevpdb.so
-usr/lib/*/qt5/plugins/kdevplatform/${env:KDEV_PLUGIN_VERSION}/kdevpythonlanguagesupport.so
+usr/lib/*/qt6/plugins/kdevplatform/${env:KDEV_PLUGIN_VERSION}/kdevpdb.so
+usr/lib/*/qt6/plugins/kdevplatform/${env:KDEV_PLUGIN_VERSION}/kdevpythonlanguagesupport.so
+usr/share/kdevappwizard/
+usr/share/kdevpythonsupport/
+usr/share/locale/
 usr/share/metainfo/org.kde.kdev-python.metainfo.xml
+usr/share/qlogging-categories6/kdevpythonsupport.categories
diff --git a/debian/rules b/debian/rules
index c7d6de0..d0a9c65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
-
-# from kdevelop
-export KDEV_PLUGIN_VERSION=515
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF
-
-execute_after_dh_auto_install:
-	# remove extra "license" files
-	find debian/tmp -name COPYING -print -delete
-
-.PHONY: override_dh_auto_test
+	dh_auto_configure -- -DBUILD_WITH_QT6=ON


More information about the Neon-commits mailing list