[neon/kde/oxygen-icons5/Neon/stable] debian: Revert "kf6-oxygen-icons is where its at"

Carlos De Maine null at kde.org
Thu Aug 17 05:21:25 BST 2023


Git commit 68deaaeb0d8fb6e31b39ab246768c1ae141dcf0e by Carlos De Maine.
Committed on 17/08/2023 at 06:21.
Pushed by carlosdem into branch 'Neon/stable'.

Revert "kf6-oxygen-icons is where its at"

This reverts commit 1c7679708485a4a1689c0d0b02f1165cc2bbcef7.

M  +4    -2    debian/control
D  +0    -1    debian/not-installed
M  +6    -1    debian/rules

https://invent.kde.org/neon/kde/oxygen-icons5/-/commit/68deaaeb0d8fb6e31b39ab246768c1ae141dcf0e

diff --git a/debian/control b/debian/control
index 7d6a303..895c298 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,10 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/oxygen-icons5.git
 Package: oxygen-icon-theme
 Architecture: all
 Multi-Arch: foreign
-Depends: hicolor-icon-theme, kf6-oxygen-icons5, ${misc:Depends}
+Depends: hicolor-icon-theme, ${misc:Depends}
 Breaks: fdpowermon-icons
 Replaces: fdpowermon-icons
 Description: Oxygen icon theme
- Dummy package as oxygen-icons5 is provided by kf6-oxygen-icons5.
\ No newline at end of file
+ Oxygen is the standard icon theme for KDE 4, but follows the freedesktop.org
+ icon schemes, so it can be used in other desktop environments using this
+ specification.
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index d7a0d79..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1 +0,0 @@
-usr/
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 02b6a27..f607012 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,9 @@
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
\ No newline at end of file
+	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+
+override_dh_install:
+	dh_install
+	find $(CURDIR)/debian/oxygen-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty
+	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/oxygen-icon-theme $(CURDIR)/debian/oxygen-icon-theme/usr/share/icons


More information about the Neon-commits mailing list