[neon/kde/breeze-icons/Neon/experimental] debian: make kf6-breeze-icons have the proirity

Carlos De Maine null at kde.org
Mon Aug 14 02:59:57 BST 2023


Git commit 5fd3e1a2863d92806397a501292fe557723585df by Carlos De Maine.
Committed on 14/08/2023 at 03:59.
Pushed by carlosdem into branch 'Neon/experimental'.

make kf6-breeze-icons have the proirity

M  +0    -1    debian/breeze-icon-theme-rcc.install
A  +1    -0    debian/breeze-icon-theme.install
M  +5    -10   debian/control
M  +1    -0    debian/not-installed
M  +0    -13   debian/rules

https://invent.kde.org/neon/kde/breeze-icons/-/commit/5fd3e1a2863d92806397a501292fe557723585df

diff --git a/debian/breeze-icon-theme-rcc.install b/debian/breeze-icon-theme-rcc.install
index 6370642..e69de29 100644
--- a/debian/breeze-icon-theme-rcc.install
+++ b/debian/breeze-icon-theme-rcc.install
@@ -1 +0,0 @@
-usr/share/icons/*/*.rcc
diff --git a/debian/breeze-icon-theme.install b/debian/breeze-icon-theme.install
new file mode 100644
index 0000000..5b42c52
--- /dev/null
+++ b/debian/breeze-icon-theme.install
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/
diff --git a/debian/control b/debian/control
index ff8b66f..3528528 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cmake,
                pkg-kde-tools,
                qtbase5-dev,
                python3-lxml
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/frameworks/breeze-icons
 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
@@ -19,18 +19,13 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/breeze-icons.git
 Package: breeze-icon-theme
 Architecture: all
 Multi-Arch: foreign
-Depends: hicolor-icon-theme, ${misc:Depends}
+Depends: kf6-breeze-icons, hicolor-icon-theme, ${misc:Depends}
 Description: Default Plasma icon theme
- This is the default icon theme for the KDE Plasma 5 desktop.
- .
- This package is part of the Breeze theme module.
+ Dummy package as breeze-icons are provided by kf6-breeze-icons.
 
 Package: breeze-icon-theme-rcc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: kf6-breeze-icon-theme-rcc, ${misc:Depends}
 Description: RCC resources for the breeze icon theme
- Breeze is the default icon theme for the KDE Plasma 5 desktop. This package
- contains the icons in RCC format.
- .
- This package is part of the Breeze theme module.
+ Dummy package as breeze-icons are provided by kf6-breeze-icon-theme-rcc
diff --git a/debian/not-installed b/debian/not-installed
index e69de29..1aa5c0e 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -0,0 +1 @@
+usr/share/
diff --git a/debian/rules b/debian/rules
index 1a91ae6..6a2523e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,3 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 %:
 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DBINARY_ICONS_RESOURCE=ON
-	mkdir -p obj-x86_64-linux-gnu/icons/res
-
-override_dh_auto_install:
-	dh_auto_install --destdir=debian/breeze-icon-theme
-
-override_dh_install:
-	dh_install --sourcedir=debian/breeze-icon-theme
-	rm debian/breeze-icon-theme/usr/share/icons/*/*.rcc
-	find $(CURDIR)/debian/breeze-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty
-	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/breeze-icon-theme $(CURDIR)/debian/breeze-icon-theme/usr/share/icons


More information about the Neon-commits mailing list