[neon/kde/breeze/Neon/unstable] debian: port to debhelper-compat, drop qt4 and fix last kf6ism's

Carlos De Maine null at kde.org
Mon Mar 27 07:19:41 BST 2023


Git commit cfbaa24938bad5e26fdf28a0b7dee40c4e28dfa1 by Carlos De Maine.
Committed on 27/03/2023 at 06:19.
Pushed by carlosdem into branch 'Neon/unstable'.

port to debhelper-compat, drop qt4 and fix last kf6ism's

M  +1    -1    debian/breeze-cursor-theme.dirs
M  +1    -1    debian/breeze.lintian-overrides
M  +1    -1    debian/breeze.preinst
M  +1    -1    debian/breeze.prerm
D  +0    -1    debian/compat
M  +2    -11   debian/control

https://invent.kde.org/neon/kde/breeze/commit/cfbaa24938bad5e26fdf28a0b7dee40c4e28dfa1

diff --git a/debian/breeze-cursor-theme.dirs b/debian/breeze-cursor-theme.dirs
index 9dd20b6..d7fd37d 100644
--- a/debian/breeze-cursor-theme.dirs
+++ b/debian/breeze-cursor-theme.dirs
@@ -1 +1 @@
-/usr/share/icons/default
+/usr/kf6/share/icons/default
diff --git a/debian/breeze.lintian-overrides b/debian/breeze.lintian-overrides
index da943c6..b83d3ab 100644
--- a/debian/breeze.lintian-overrides
+++ b/debian/breeze.lintian-overrides
@@ -1 +1 @@
-breeze: binary-without-manpage usr/bin/breeze-settings5
+breeze: binary-without-manpage usr/kf6/bin/breeze-settings5
diff --git a/debian/breeze.preinst b/debian/breeze.preinst
index fbe394d..f5b9d4f 100644
--- a/debian/breeze.preinst
+++ b/debian/breeze.preinst
@@ -4,5 +4,5 @@ set -e
 
 DIVERT=`dpkg-divert --list breeze | grep default-default-testpage.pdf` || true
 if [ ! "$DIVERT" ]; then
-  dpkg-divert --package breeze --add /usr/share/cups/data/default-testpage.pdf
+  dpkg-divert --package breeze --add /usr/kf6/share/cups/data/default-testpage.pdf
 fi
diff --git a/debian/breeze.prerm b/debian/breeze.prerm
index 551fe10..e3ddd21 100644
--- a/debian/breeze.prerm
+++ b/debian/breeze.prerm
@@ -3,5 +3,5 @@
 set -e
 
 if [ "$1" = remove ] || [ "$1" = deconfigure ]; then
-        dpkg-divert --package breeze --remove /usr/share/cups/data/default-testpage.pdf
+        dpkg-divert --package breeze --remove /usr/kf6/share/cups/data/default-testpage.pdf
 fi
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 24246c1..daa6dc3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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),
-               debhelper (>= 11~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-frameworkintegration-dev,
                kf6-kcmutils-dev,
@@ -90,12 +90,3 @@ Description: KWin Breeze Style
  This is the Breeze window manager style for the KDE Plasma 5 desktop.
  .
  This package is part of the Breeze theme module.
-
-Package: kde-style-breeze-qt4
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Widget style for Qt 4 and KDE Software - transitional
- This is the default widget style for KDE's Plasma desktop.  This
- build has the plugin for with Qt 4.
- .
- Transitional dummy package which can be removed.


More information about the Neon-commits mailing list