[neon/kde/breeze/Neon/unstable] debian: install into /usr

[Carlos De Maine]

Git commit 91c5c345affd29c2cd03a881634e84b5651ee1d7 by Carlos De Maine.
Committed on 14/05/2023 at 04:26.
Pushed by carlosdem into branch 'Neon/unstable'.

install into /usr

M  +1    -1    debian/breeze-cursor-theme.dirs
M  +4    -4    debian/breeze-cursor-theme.install
M  +1    -1    debian/breeze-cursor-theme.postinst
M  +1    -1    debian/breeze-cursor-theme.prerm
M  +1    -1    debian/breeze-dev.install
M  +7    -7    debian/breeze.install
M  +9    -9    debian/kde-style-breeze.install
M  +4    -4    debian/kwin-style-breeze.install
M  +2    -2    debian/wrapperthemes.sh

https://invent.kde.org/neon/kde/breeze/commit/91c5c345affd29c2cd03a881634e84b5651ee1d7

diff --git a/debian/breeze-cursor-theme.dirs b/debian/breeze-cursor-theme.dirs
index d7fd37d..9dd20b6 100644
--- a/debian/breeze-cursor-theme.dirs
+++ b/debian/breeze-cursor-theme.dirs
@@ -1 +1 @@
-/usr/kf6/share/icons/default
+/usr/share/icons/default
diff --git a/debian/breeze-cursor-theme.install b/debian/breeze-cursor-theme.install
index fa3f39f..9b4110f 100644
--- a/debian/breeze-cursor-theme.install
+++ b/debian/breeze-cursor-theme.install
@@ -1,7 +1,7 @@
 # Do NOT remove these files, they are required by the postinst maintscript
 # These are generated by the wrapperthemes.sh call in debian/rules, please
 # fix that instead if this breaks.
-usr/kf6/etc/X11/cursors/Breeze_Snow.theme
-usr/kf6/etc/X11/cursors/breeze_cursors.theme
-usr/kf6/share/icons/Breeze_Snow/
-usr/kf6/share/icons/breeze_cursors/
+usr/etc/X11/cursors/Breeze_Snow.theme
+usr/etc/X11/cursors/breeze_cursors.theme
+usr/share/icons/Breeze_Snow/
+usr/share/icons/breeze_cursors/
diff --git a/debian/breeze-cursor-theme.postinst b/debian/breeze-cursor-theme.postinst
index dc6bd50..b52cf34 100644
--- a/debian/breeze-cursor-theme.postinst
+++ b/debian/breeze-cursor-theme.postinst
@@ -2,7 +2,7 @@
 set -e
 
 TARGET=/usr/share/icons/default/index.theme
-ICONDIR=/usr/kf6/etc/X11/cursors
+ICONDIR=/etc/X11/cursors
 
 # breeze_cursors with 102 (DMZ+2) priority
 update-alternatives --install $TARGET x-cursor-theme \
diff --git a/debian/breeze-cursor-theme.prerm b/debian/breeze-cursor-theme.prerm
index d098bdd..5686105 100644
--- a/debian/breeze-cursor-theme.prerm
+++ b/debian/breeze-cursor-theme.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-ICONDIR=/usr/kf6/etc/X11/cursors
+ICONDIR=/etc/X11/cursors
 
 case "$1" in
     remove|deconfigure|failed-upgrade)
diff --git a/debian/breeze-dev.install b/debian/breeze-dev.install
index 54a48c0..f1fb0e1 100644
--- a/debian/breeze-dev.install
+++ b/debian/breeze-dev.install
@@ -1 +1 @@
-usr/kf6/lib/*/cmake/Breeze/
+usr/lib/*/cmake/Breeze/
diff --git a/debian/breeze.install b/debian/breeze.install
index b3e75e0..ca787f6 100644
--- a/debian/breeze.install
+++ b/debian/breeze.install
@@ -1,7 +1,7 @@
-printing/default-testpage.pdf /usr/kf6/share/cups/data/
-usr/kf6/bin/
-usr/kf6/lib/*/kconf_update_bin
-usr/kf6/share/icons/hicolor/*/apps/breeze-settings.*
-usr/kf6/share/icons/hicolor/scalable/apps/breeze-settings.svgz
-usr/kf6/share/kconf_update
-usr/kf6/share/wallpapers/Next
+printing/default-testpage.pdf /usr/share/cups/data/
+usr/bin/
+usr/lib/*/kconf_update_bin
+usr/share/icons/hicolor/*/apps/breeze-settings.*
+usr/share/icons/hicolor/scalable/apps/breeze-settings.svgz
+usr/share/kconf_update
+usr/share/wallpapers/Next
diff --git a/debian/kde-style-breeze.install b/debian/kde-style-breeze.install
index 27a1f06..37a51dd 100644
--- a/debian/kde-style-breeze.install
+++ b/debian/kde-style-breeze.install
@@ -1,9 +1,9 @@
-usr/kf6/lib/*/libbreezecommon6.so.5
-usr/kf6/lib/*/libbreezecommon6.so.5.*
-usr/kf6/lib/*/qt6/plugins/plasma/kcms/
-usr/kf6/lib/*/qt6/plugins/styles/
-usr/kf6/share/QtCurve/
-usr/kf6/share/applications/breezestyleconfig.desktop
-usr/kf6/share/color-schemes/
-usr/kf6/share/kstyle/
-usr/kf6/share/locale/*/*/breeze_style_config.mo
+usr/lib/*/libbreezecommon6.so.5
+usr/lib/*/libbreezecommon6.so.5.*
+usr/lib/*/qt6/plugins/plasma/kcms/
+usr/lib/*/qt6/plugins/styles/
+usr/share/QtCurve/
+usr/share/applications/breezestyleconfig.desktop
+usr/share/color-schemes/
+usr/share/kstyle/
+usr/share/locale/*/*/breeze_style_config.mo
diff --git a/debian/kwin-style-breeze.install b/debian/kwin-style-breeze.install
index 77e7ec9..a0a5040 100644
--- a/debian/kwin-style-breeze.install
+++ b/debian/kwin-style-breeze.install
@@ -1,4 +1,4 @@
-usr/kf6/lib/*/qt6/plugins/org.kde.kdecoration2/
-usr/kf6/share/applications/kcm_breezedecoration.desktop
-usr/kf6/share/locale/*/*/breeze_kwin_deco.mo
-usr/kf6/share/locale/*/LC_MESSAGES/breeze_kwin_deco.mo
+usr/lib/*/qt6/plugins/org.kde.kdecoration2/
+usr/share/applications/kcm_breezedecoration.desktop
+usr/share/locale/*/*/breeze_kwin_deco.mo
+usr/share/locale/*/LC_MESSAGES/breeze_kwin_deco.mo
diff --git a/debian/wrapperthemes.sh b/debian/wrapperthemes.sh
index 9ecad4b..4f3e983 100755
--- a/debian/wrapperthemes.sh
+++ b/debian/wrapperthemes.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-ICONDIR=/usr/kf6/share/icons
-WRAPPERDIR=/usr/kf6/etc/X11/cursors
+ICONDIR=/usr/share/icons
+WRAPPERDIR=/etc/X11/cursors
 : ${CURDIR:=`pwd`}
 
 tmp="$(mktemp)"