[neon/kde/kdeplasma-addons/Neon/unstable] debian: modernise, drop faff & fix kwin install(s)
Carlos De Maine
null at kde.org
Thu Oct 26 01:34:45 BST 2023
Git commit f4f9a249e1568978aaf9784b9aee8f61ebac1057 by Carlos De Maine.
Committed on 26/10/2023 at 02:34.
Pushed by carlosdem into branch 'Neon/unstable'.
modernise, drop faff & fix kwin install(s)
M +3 -13 debian/control
M +1 -0 debian/kwin-addons.install
M +0 -3 debian/not-installed
D +0 -2 debian/plasma-dataengines-addons.lintian-overrides
M +1 -4 debian/plasma-wallpapers-addons.install
D +0 -1 debian/plasma-wallpapers-addons.lintian-overrides
M +7 -25 debian/plasma-widgets-addons.install
D +0 -7 debian/plasma-widgets-addons.lintian-overrides
https://invent.kde.org/neon/kde/kdeplasma-addons/-/commit/f4f9a249e1568978aaf9784b9aee8f61ebac1057
diff --git a/debian/control b/debian/control
index 0358268..137b7b5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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 (>= 2.8.12),
+Build-Depends: cmake,
debhelper-compat (= 13),
kf6-extra-cmake-modules,
kf6-kactivities-dev,
@@ -33,12 +33,12 @@ Build-Depends: cmake (>= 2.8.12),
libxcb-keysyms1-dev,
pkg-config,
pkg-kde-tools-neon,
- plasma-workspace-dev,,
+ plasma-workspace-dev,
qt6-base-dev,
qt6-declarative-dev,
qt6-webengine-dev,
shared-mime-info
-Standards-Version: 3.9.6
+Standards-Version: 4.6.2
Homepage: https://projects.kde.org/projects/kde/workspace/kdeplasma-addons
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/kdeplasma-addons.git
Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kdeplasma-addons.git
@@ -46,8 +46,6 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kdeplasma-addons.git
Package: kdeplasma-addons-data
Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Description: locale files for kdeplasma-addons
The KDE Plasma addons module is a collection of additional Plasma 6
data engines, widgets and krunner plugins. It is part of
@@ -63,8 +61,6 @@ Depends: kdeplasma-addons-data (= ${source:Version}),
kwin,
${misc:Depends},
${shlibs:Depends}
-Breaks: kwin-data (<< 4:5.1.0.1+git20141031.1444)
-Replaces: kwin-data (<< 4:5.1.0.1+git20141031.1444)
Description: additional desktop and window switchers for KWin
This package contains additional KWin desktop and window switchers shipped in
the Plasma 6 addons module.
@@ -88,8 +84,6 @@ Depends: kdeplasma-addons-data (= ${source:Version}),
qml6-module-qtwebengine,
${misc:Depends},
${shlibs:Depends}
-Breaks: plasma-wallpapers-addons (<< 4:5.7.4)
-Replaces: plasma-wallpapers-addons (<< 4:5.7.4)
Description: additional widgets for Plasma 6
This package contains additional Plasma 6 widgets shipped in the Plasma
addons module. Install it if you want a variety of widgets on your Plasma
@@ -118,8 +112,6 @@ Depends: kdeplasma-addons-data (= ${source:Version}),
qml6-module-qtquick-layouts,
${misc:Depends},
${shlibs:Depends}
-Breaks: plasma-widgets-addons (<< 4:5.9.0)
-Replaces: plasma-widgets-addons (<< 4:5.9.0)
Description: additional data engines for Plasma
This package contains additional Plasma data engines shipped in Plasma 6
addons module. These engines are needed by some Plasma 5 widget shipped with
@@ -150,8 +142,6 @@ Depends: kdeplasma-addons-data (= ${source:Version}),
kf6-kirigami2,
${misc:Depends},
${shlibs:Depends}
-Breaks: plasma-widgets-addons (<< 4:5.7.4)
-Replaces: plasma-widgets-addons (<< 4:5.7.4)
Description: additional wallpaper plugins for Plasma 6
This package contains additional Plasma 6 wallpaper plugins that are used in
the Plasma desktop to give marble, mandelbrot and other such wallpapers.
diff --git a/debian/kwin-addons.install b/debian/kwin-addons.install
index 35eb58b..754bf30 100644
--- a/debian/kwin-addons.install
+++ b/debian/kwin-addons.install
@@ -1 +1,2 @@
+usr/lib/*/qt6/plugins/kwin/
usr/share/kwin/*
diff --git a/debian/not-installed b/debian/not-installed
index 16f63f8..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +0,0 @@
-"debian/tmp/usr/lib/x86_64-linux-gnu/qt5/qml/org/kde/plasma/private/weather/qmldir")
-"debian/tmp/usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/contents/ui/main.qml")
-"debian/tmp/usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/metadata.json")
diff --git a/debian/plasma-dataengines-addons.lintian-overrides b/debian/plasma-dataengines-addons.lintian-overrides
deleted file mode 100644
index a222d7f..0000000
--- a/debian/plasma-dataengines-addons.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-plasma-dataengines-addons: package-name-doesnt-match-sonames libplasmacomicprovidercore1 libplasmapotdprovidercore1
-plasma-dataengines-addons: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libplasmacomicprovidercore.so.1.0.0 usr/lib/x86_64-linux-gnu/libplasmacomicprovidercore.so
diff --git a/debian/plasma-wallpapers-addons.install b/debian/plasma-wallpapers-addons.install
index 0fdd2d6..125736e 100644
--- a/debian/plasma-wallpapers-addons.install
+++ b/debian/plasma-wallpapers-addons.install
@@ -1,7 +1,4 @@
-usr/lib/*/qt6/qml/org/kde/plasma/wallpapers/potd/libplasma_wallpaper_potdplugin.so
-usr/lib/*/qt6/qml/org/kde/plasma/wallpapers/potd/kde-qmlmodule.version
-usr/lib/*/qt6/qml/org/kde/plasma/wallpapers/potd/plasma_wallpaper_potdplugin.qmltypes
-usr/lib/*/qt6/qml/org/kde/plasma/wallpapers/potd/qmldir
+usr/lib/*/qt6/qml/org/kde/plasma/wallpapers/
usr/share/metainfo/org.kde.haenau.appdata.xml
usr/share/metainfo/org.kde.hunyango.appdata.xml
usr/share/metainfo/org.kde.potd.appdata.xml
diff --git a/debian/plasma-wallpapers-addons.lintian-overrides b/debian/plasma-wallpapers-addons.lintian-overrides
deleted file mode 100644
index 95082b4..0000000
--- a/debian/plasma-wallpapers-addons.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-plasma-wallpapers-addons: hardening-no-fortify-functions usr/lib/kde4/plasma_wallpaper_virus.so
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index 0870cfc..451d9a6 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -10,12 +10,8 @@ usr/lib/*/qt6/qml/org/kde/plasma/private/purpose/
usr/lib/*/qt6/qml/org/kde/plasma/private/quicklaunch/
usr/lib/*/qt6/qml/org/kde/plasma/private/timer/
usr/lib/*/qt6/qml/org/kde/plasma/private/weather/
-usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.comic.so
-usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.grouping.so
-usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.private.grouping.so
-usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.weather.so
-usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
-usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
+usr/lib/*/qt6/plugins/plasma/applets/
+usr/share/icons/hicolor/scalable/apps/
usr/share/knotifications6/plasma_applet_timer.notifyrc
usr/share/knsrcfiles/comic.knsrc
usr/share/metainfo/org.kde.plasma.addons.katesessions.appdata.xml
@@ -39,11 +35,8 @@ usr/share/metainfo/org.kde.plasma.userswitcher.appdata.xml
usr/share/metainfo/org.kde.plasma.weather.appdata.xml
usr/share/metainfo/org.kde.plasma.webbrowser.appdata.xml
usr/share/metainfo/org.kde.plasma_applet_dict.appdata.xml
-usr/share/plasma/desktoptheme/default
-usr/share/plasma/plasmoids/org.kde.plasma.addons.katesessions/contents/ui/KateSessionsItemDelegate.qml
-usr/share/plasma/plasmoids/org.kde.plasma.addons.katesessions/contents/ui/Menu.qml
-usr/share/plasma/plasmoids/org.kde.plasma.addons.katesessions/contents/ui/main.qml
-usr/share/plasma/plasmoids/org.kde.plasma.addons.katesessions/metadata.json
+usr/share/plasma/desktoptheme/default/
+usr/share/plasma/plasmoids/org.kde.plasma.addons.katesessions/
usr/share/plasma/plasmoids/org.kde.plasma.binaryclock/
usr/share/plasma/plasmoids/org.kde.plasma.calculator/
usr/share/plasma/plasmoids/org.kde.plasma.colorpicker/
@@ -51,24 +44,13 @@ usr/share/plasma/plasmoids/org.kde.plasma.comic/
usr/share/plasma/plasmoids/org.kde.plasma.diskquota/
usr/share/plasma/plasmoids/org.kde.plasma.fifteenpuzzle/
usr/share/plasma/plasmoids/org.kde.plasma.fuzzyclock/
-usr/share/plasma/plasmoids/org.kde.plasma.grouping/contents/ui/main.qml
-usr/share/plasma/plasmoids/org.kde.plasma.grouping/metadata.json
-usr/share/plasma/plasmoids/org.kde.plasma.keyboardindicator/contents/config/config.qml
-usr/share/plasma/plasmoids/org.kde.plasma.keyboardindicator/contents/config/main.xml
-usr/share/plasma/plasmoids/org.kde.plasma.keyboardindicator/contents/ui/configAppearance.qml
-usr/share/plasma/plasmoids/org.kde.plasma.keyboardindicator/contents/ui/main.qml
-usr/share/plasma/plasmoids/org.kde.plasma.keyboardindicator/metadata.json
+usr/share/plasma/plasmoids/org.kde.plasma.grouping/
+usr/share/plasma/plasmoids/org.kde.plasma.keyboardindicator/
usr/share/plasma/plasmoids/org.kde.plasma.kickerdash/
usr/share/plasma/plasmoids/org.kde.plasma.mediaframe/
usr/share/plasma/plasmoids/org.kde.plasma.nightcolorcontrol/
usr/share/plasma/plasmoids/org.kde.plasma.notes/
-usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/contents/applet/CompactApplet.qml
-usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/contents/config/config.qml
-usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/contents/config/main.xml
-usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/contents/ui/items/AbstractItem.qml
-usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/contents/ui/items/PlasmoidItem.qml
-usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/contents/ui/main.qml
-usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/metadata.json
+usr/share/plasma/plasmoids/org.kde.plasma.private.grouping/
usr/share/plasma/plasmoids/org.kde.plasma.quicklaunch/
usr/share/plasma/plasmoids/org.kde.plasma.quickshare/
usr/share/plasma/plasmoids/org.kde.plasma.timer/
diff --git a/debian/plasma-widgets-addons.lintian-overrides b/debian/plasma-widgets-addons.lintian-overrides
deleted file mode 100644
index d9ecd91..0000000
--- a/debian/plasma-widgets-addons.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-plasma-widgets-addons: hardening-no-fortify-functions usr/lib/kde4/plasma_applet_icontasks.so
-plasma-widgets-addons: hardening-no-fortify-functions usr/lib/kde4/plasma_applet_life.so
-plasma-widgets-addons: hardening-no-fortify-functions usr/lib/kde4/plasma_applet_qalculate.so
-plasma-widgets-addons: postinst-must-call-ldconfig usr/lib/*libplasmaweatherprivate.so
-plasma-widgets-addons: package-name-doesnt-match-sonames libplasmaweatherprivate
-plasma-widgets-addons: shlib-without-versioned-soname usr/lib/*/libplasmaweatherprivate.so libplasmaweatherprivate.so
-plasma-widgets-addons: package-must-activate-ldconfig-trigger usr/lib/*/libplasmaweatherprivate.so
More information about the Neon-commits
mailing list