[neon/extras/kdevelop-php/Neon/unstable_jammy] debian: kf6ify

Carlos De Maine null at kde.org
Wed Jul 31 04:55:39 BST 2024


Git commit d0a5554db777cbd103ae8540008ce739e150876d by Carlos De Maine.
Committed on 31/07/2024 at 03:55.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.

kf6ify

(cherry picked from commit e3c8817c91ad9218a895adb250c4a1e524f7de2a)

D  +0    -1    debian/compat
M  +26   -72   debian/control
D  +0    -1    debian/kdevelop-php-l10n.install
M  +5    -4    debian/kdevelop-php.install
M  +4    -12   debian/rules

https://invent.kde.org/neon/extras/kdevelop-php/-/commit/d0a5554db777cbd103ae8540008ce739e150876d

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 a06178f..efe7ccd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,34 +5,33 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>,
            Modestas Vainius <modax at debian.org>,
            Andreas Cord-Landwehr <cola at uni-paderborn.de>
-Build-Depends: cmake (>= 2.8.12),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 0.0.9),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
                kdevelop-dev,
-               kdevelop-pg-qt (>= 2.0),
-               kdevplatform-dev (>= 5.0.1),
-               libgrantlee5-dev,
-               libkf5archive-dev,
-               libkf5i18n-dev,
-               libkf5itemmodels-dev,
-               libkf5kcmutils-dev,
-               libkf5newstuff-dev,
-               libkf5notifyconfig-dev,
-               libkf5syntaxhighlighting-dev,
-               libkf5texteditor-dev,
-               libkf5threadweaver-dev,
-               libqt5webkit5-dev,
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev
-Standards-Version: 3.9.8
+               kdevelop-pg-qt,
+               kdevplatform-dev,
+               kf6-karchive-dev,
+               kf6-ki18n-dev,
+               kf6-kitemmodels-dev,
+               kf6-kcmutils-dev,
+               kf6-knewstuff-dev,
+               kf6-knotifyconfig-dev,
+               kf6-ktexteditor-dev,
+               kf6-ktexttemplate-dev,
+               kf6-syntaxhighlighting-dev,
+               kf6-threadweaver-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-webengine-dev,
+Standards-Version: 4.6.2
 Homepage: http://www.kdevelop.org/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-std/kdevelop-php.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-std/kdevelop-php.git
 
 Package: kdevelop-php
 Architecture: any
-Depends: kdevelop (>= 4:5.0.1), ${misc:Depends}, ${shlibs:Depends}
-Suggests: kdevelop-php-l10n
+Depends: kdevelop, ${misc:Depends}, ${shlibs:Depends}
 Enhances: kdevelop
 Description: PHP plugin for KDevelop
  KDevelop is an easy to use integrated development environment for KDE.
@@ -42,52 +41,11 @@ Description: PHP plugin for KDevelop
  This package contains the PHP language support plugin.
 
 Package: kdevelop-php-l10n
-Section: localization
 Architecture: all
-Depends: ${misc:Depends}
-Breaks: kdevelop-php-docs-l10n (<< 5.0),
-        kdevelop-php-l10n-ca,
-        kdevelop-php-l10n-cavalencia,
-        kdevelop-php-l10n-da,
-        kdevelop-php-l10n-engb,
-        kdevelop-php-l10n-es,
-        kdevelop-php-l10n-et,
-        kdevelop-php-l10n-fr,
-        kdevelop-php-l10n-gl,
-        kdevelop-php-l10n-it,
-        kdevelop-php-l10n-nds,
-        kdevelop-php-l10n-nl,
-        kdevelop-php-l10n-pt,
-        kdevelop-php-l10n-ptbr,
-        kdevelop-php-l10n-sv,
-        kdevelop-php-l10n-th,
-        kdevelop-php-l10n-uk,
-        kdevelop-php-l10n-zhcn,
-        kdevelop-php-l10n-zhtw
-Replaces: kdevelop-php-docs-l10n (<< 5.0),
-          kdevelop-php-l10n-ca,
-          kdevelop-php-l10n-cavalencia,
-          kdevelop-php-l10n-da,
-          kdevelop-php-l10n-engb,
-          kdevelop-php-l10n-es,
-          kdevelop-php-l10n-et,
-          kdevelop-php-l10n-fr,
-          kdevelop-php-l10n-gl,
-          kdevelop-php-l10n-it,
-          kdevelop-php-l10n-nds,
-          kdevelop-php-l10n-nl,
-          kdevelop-php-l10n-pt,
-          kdevelop-php-l10n-ptbr,
-          kdevelop-php-l10n-sv,
-          kdevelop-php-l10n-th,
-          kdevelop-php-l10n-uk,
-          kdevelop-php-l10n-zhcn,
-          kdevelop-php-l10n-zhtw
-Description: localization files for KDevelop PHP plugin
- The KDevelop-PHP plugin is the language plugin for the PHP language
- for the KDevelop integrated development environment for KDE.
- .
- This  package contains the localizations for the KDevelop PHP plugin.
+Section: oldlibs
+Depends: kdevelop-php  (>= ${source:Version}), ${misc:Depends}
+Description: Dummy transitional.
+ This is a dummy transitional package and can be safely removed.
 
 Package: kdevelop-php-docs
 Architecture: all
@@ -95,9 +53,7 @@ Section: oldlibs
 Priority: extra
 Depends: kdevelop-php (>= ${source:Version}), ${misc:Depends}
 Description: transitional package for kdevelop-php
- This package is a transitional package to migrate to kdevelop-php.
- .
- It can be safely removed after the update.
+ This is a dummy transitional package and can be safely removed.
 
 Package: kdevelop-php-docs-l10n
 Architecture: all
@@ -105,6 +61,4 @@ Section: oldlibs
 Priority: extra
 Depends: kdevelop-php-l10n (>= ${source:Version}), ${misc:Depends}
 Description: transitional package for kdevelop-php-l10n
- This package is a transitional package to migrate to kdevelop-php-l10n.
- .
- It can be safely removed after the update.
+ This is a dummy transitional package and can be safely removed.
diff --git a/debian/kdevelop-php-l10n.install b/debian/kdevelop-php-l10n.install
deleted file mode 100644
index 3270a48..0000000
--- a/debian/kdevelop-php-l10n.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/*
diff --git a/debian/kdevelop-php.install b/debian/kdevelop-php.install
index bcc4925..ac4185e 100644
--- a/debian/kdevelop-php.install
+++ b/debian/kdevelop-php.install
@@ -1,10 +1,11 @@
 usr/lib/*/libkdevphpcompletion.so
 usr/lib/*/libkdevphpduchain.so
 usr/lib/*/libkdevphpparser.so
-usr/lib/*/qt5/plugins/kdevplatform/*/kdevphpdocs.so
-usr/lib/*/qt5/plugins/kdevplatform/*/kdevphplanguagesupport.so
-usr/lib/*/qt5/plugins/kdevplatform/*/kdevphpunitprovider.so
+usr/lib/*/qt6/plugins/kdevplatform/*/kdevphpdocs.so
+usr/lib/*/qt6/plugins/kdevplatform/*/kdevphplanguagesupport.so
+usr/lib/*/qt6/plugins/kdevplatform/*/kdevphpunitprovider.so
 usr/share/kdevappwizard/templates/
 usr/share/kdevphpsupport/
+usr/share/locale/
 usr/share/metainfo/org.kde.kdev-php.metainfo.xml
-usr/share/qlogging-categories5/kdevphpsupport.categories
+usr/share/qlogging-categories6/kdevphpsupport.categories
diff --git a/debian/rules b/debian/rules
index 8131dae..d0a9c65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,9 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --parallel --list-missing --with kf5
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='kdevelop-php-dbg (<< 1.7.3-3~)'
-
-.PHONY: override_dh_auto_test
+	dh_auto_configure -- -DBUILD_WITH_QT6=ON


More information about the Neon-commits mailing list