[neon/kde/spectacle/Neon/unstable] debian: port to kf6 as it depnds on kpipewire which being in plasma in already kf6 in neon unstable

Carlos De Maine null at kde.org
Sat Mar 25 03:06:10 GMT 2023


Git commit 5a9c8f1af41de070f885c3c12c74007a27290d3a by Carlos De Maine.
Committed on 25/03/2023 at 03:06.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6 as it depnds on kpipewire which being in plasma in already kf6 in neon unstable

D  +0    -1    debian/compat
M  +26   -32   debian/control
D  +0    -1    debian/kde-spectacle.install
M  +6    -12   debian/rules

https://invent.kde.org/neon/kde/spectacle/commit/5a9c8f1af41de070f885c3c12c74007a27290d3a

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 a358d10..acee8f4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,45 +3,40 @@ 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~),
-               extra-cmake-modules (>= 5.29.0~),
-               kirigami2-dev (>= 5.92.0~),
-               libkf5config-dev (>= 5.29.0~),
-               libkf5coreaddons-dev (>= 5.29.0~),
-               libkf5dbusaddons-dev (>= 5.29.0~),
-               libkf5declarative-dev (>= 5.29.0~),
-               libkf5doctools-dev (>= 5.29.0~),
-               libkf5i18n-dev (>= 5.29.0~),
-               libkf5kio-dev (>= 5.29.0~),
-               libkf5kipi-dev,
-               libkf5newstuff-dev (>= 5.29.0~),
-               libkf5notifications-dev (>= 5.29.0~),
-               libkf5purpose-dev (>= 5.44.0~),
-               libkf5screen-dev (>= 4:5.4.0~),
-               libkf5wayland-dev,
-               libkf5widgetsaddons-dev (>= 5.29.0~),
-               libkf5windowsystem-dev (>= 5.29.0~),
-               libkf5xmlgui-dev (>= 5.29.0~),
-               libqt5svg5-dev,
-               libkimageannotator-dev,
+Build-Depends:  cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kirigami2-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdeclarative-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
+               kf6-knotifications-dev,
+               kf6-purpose-dev,
+               libkf6screen-dev ,
+               kf6-kwayland-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               qt6-svg-dev,
+#              libkimageannotator-dev,
                libkpipewire-dev,
-               libqt5waylandclient5-dev,
-               libqt5x11extras5-dev (>= 5.4.0~),
                libxcb-cursor-dev,
                libxcb-image0-dev,
                libxcb-util0-dev,
                libxcb-xfixes0-dev,
                libwayland-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12),
+               pkg-kde-tools-neon,
                libpipewire-0.3-dev,
                plasma-wayland-protocols,
-               qtbase5-dev (>= 5.6.0~),
-               qtbase5-private-dev,
-               qtdeclarative5-dev (>= 5.6.0~),
-               qtquickcontrols2-5-dev (>= 5.15.0~),
-               qtwayland5-dev-tools
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-wayland-dev,
 Standards-Version: 4.1.4
 Homepage: https://projects.kde.org/projects/kde/kdegraphics/spectacle
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/spectacle
@@ -50,8 +45,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/spectacle.git
 Package: kde-spectacle
 Section: graphics
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-                   qml-module-qtmultimedia
+Depends: ${misc:Depends}, ${shlibs:Depends}, qml6-module-qtmultimedia
 Breaks: ksnapshot (<< 4:16.04.1-1), ${kde-l10n:all}
 Replaces: ksnapshot (<< 4:16.04.1-1), ${kde-l10n:all}
 Suggests: obs-studio, vokoscreen, peek, simplescreenrecorder
diff --git a/debian/kde-spectacle.install b/debian/kde-spectacle.install
deleted file mode 100644
index 050b246..0000000
--- a/debian/kde-spectacle.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/bin/ksnapshot usr/bin
diff --git a/debian/rules b/debian/rules
index c628ce4..f13d9eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,9 @@
 #!/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-5~
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
-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
-
-DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's/^[0-9]*://')
-
-override_dh_auto_install:
-	$(overridden_command) --destdir=debian/kde-spectacle
-
-override_dh_gencontrol:
-	$(overridden_command) -pksnapshot -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
-	$(overridden_command) --remaining-packages
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
\ No newline at end of file


More information about the Neon-commits mailing list