[neon/kf6/kf6-breeze-icons/Neon/unstable] debian: try to divert

Carlos De Maine null at kde.org
Fri Jun 9 08:45:18 BST 2023


Git commit 3ab0cc0e910a17882ef7d7ed006c8f56cf84ed0f by Carlos De Maine.
Committed on 09/06/2023 at 07:45.
Pushed by carlosdem into branch 'Neon/unstable'.

try to divert

R  +0    -0    debian/breeze6-icon-theme-rcc.install [from: debian/breeze-icon-theme-rcc.install - 100% similarity]
M  +7    -5    debian/control
A  +6    -0    debian/kf6-breeze-icon-theme.preinst
A  +6    -0    debian/kf6-breeze-icon-theme.prerm

https://invent.kde.org/neon/kf6/kf6-breeze-icons/-/commit/3ab0cc0e910a17882ef7d7ed006c8f56cf84ed0f

diff --git a/debian/breeze-icon-theme-rcc.install b/debian/breeze6-icon-theme-rcc.install
similarity index 100%
rename from debian/breeze-icon-theme-rcc.install
rename to debian/breeze6-icon-theme-rcc.install
diff --git a/debian/control b/debian/control
index c6485d7..49b7b72 100644
--- a/debian/control
+++ b/debian/control
@@ -17,17 +17,19 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/breeze-icons
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/breeze-icons.git
 
 Package: kf6-breeze-icon-theme
-Architecture: all
-Multi-Arch: foreign
-Depends: hicolor-icon-theme, ${misc:Depends}
+Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
+Depends: hicolor-icon-theme, ${misc:Depends}, ${shlibs:Depends}
 Description: Default Plasma icon theme
  This is the default icon theme for the KDE Plasma 6 desktop.
  .
  This package is part of the Breeze theme module.
 
 Package: kf6-breeze-icon-theme-rcc
-Architecture: all
-Multi-Arch: foreign
+Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
 Depends: ${misc:Depends}
 Description: RCC resources for the breeze icon theme
  Breeze is the default icon theme for the KDE Plasma 6 desktop. This package
diff --git a/debian/kf6-breeze-icon-theme.preinst b/debian/kf6-breeze-icon-theme.preinst
new file mode 100644
index 0000000..5de88ad
--- /dev/null
+++ b/debian/kf6-breeze-icon-theme.preinst
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+set -e
+
+dpkg-divert --package kf6-breeze-icon-theme --divert /usr/share/icons/breeze-dark/*.kf5 --rename /usr/share/icons/breeze-dark/*
+dpkg-divert --package kf6-breeze-icon-theme --divert /usr/share/icons/breeze/*.kf5 --rename /usr/share/icons/breeze/*
diff --git a/debian/kf6-breeze-icon-theme.prerm b/debian/kf6-breeze-icon-theme.prerm
new file mode 100644
index 0000000..20e9044
--- /dev/null
+++ b/debian/kf6-breeze-icon-theme.prerm
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+set -e
+
+dpkg-divert --package kf6-breeze-icon-theme --rename --remove /usr/share/icons/breeze-dark/*
+dpkg-divert --package kf6-breeze-icon-theme --rename --remove /usr/share/icons/breeze/*


More information about the Neon-commits mailing list