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

[Carlos De Maine]

Git commit ccb54ac44b356d4d2a23acb0062d0274ec0e6ca3 by Carlos De Maine.
Committed on 14/05/2023 at 05:46.
Pushed by carlosdem into branch 'Neon/unstable'.

install into /usr

M  +3    -3    debian/control
M  +7    -7    debian/kde-style-oxygen-qt5.install
M  +3    -3    debian/kwin-decoration-oxygen.install
M  +2    -2    debian/liboxygenstyle5-5.install
M  +5    -5    debian/liboxygenstyleconfig5-5.install
M  +9    -9    debian/not-installed
M  +1    -1    debian/plasma-theme-oxygen.install

https://invent.kde.org/neon/kde/oxygen/commit/ccb54ac44b356d4d2a23acb0062d0274ec0e6ca3

diff --git a/debian/control b/debian/control
index a7605f2..7697398 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-compat (= 12),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                gettext,
                kf6-extra-cmake-modules,
                kf6-frameworkintegration-dev,
@@ -20,7 +20,7 @@ Build-Depends: cmake (>= 2.8.12),
                kf6-kwayland-dev,
                kf6-kwidgetsaddons-dev,
                kf6-kwindowsystem-dev,
-               libkdecorations2-dev (>= 4:5.17~),
+               libkdecorations2-dev,
                libx11-dev,
                libxcb1-dev,
                pkg-config,
diff --git a/debian/kde-style-oxygen-qt5.install b/debian/kde-style-oxygen-qt5.install
index 4ae0621..b227e0f 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -1,7 +1,7 @@
-usr/kf6/bin/oxygen-settings5
-usr/kf6/lib/*/qt6/plugins/kstyle_oxygen_config.so
-usr/kf6/lib/*/qt6/plugins/styles/oxygen.so
-usr/kf6/share/color-schemes/Oxygen.colors
-usr/kf6/share/color-schemes/OxygenCold.colors
-usr/kf6/share/icons/hicolor/256x256/apps/oxygen-settings.png
-usr/kf6/share/kstyle/themes/oxygen.themerc
+usr/bin/oxygen-settings5
+usr/lib/*/qt6/plugins/kstyle_oxygen_config.so
+usr/lib/*/qt6/plugins/styles/oxygen.so
+usr/share/color-schemes/Oxygen.colors
+usr/share/color-schemes/OxygenCold.colors
+usr/share/icons/hicolor/256x256/apps/oxygen-settings.png
+usr/share/kstyle/themes/oxygen.themerc
diff --git a/debian/kwin-decoration-oxygen.install b/debian/kwin-decoration-oxygen.install
index 1dbe6fd..9f4e53d 100644
--- a/debian/kwin-decoration-oxygen.install
+++ b/debian/kwin-decoration-oxygen.install
@@ -1,3 +1,3 @@
-usr/kf6/lib/*/qt6/plugins/org.kde.kdecoration2/org.kde.oxygen.so
-usr/kf6/share/kservices6/oxygendecorationconfig.desktop
-usr/kf6/share/locale/*/LC_MESSAGES/oxygen_kdecoration.mo
+usr/lib/*/qt6/plugins/org.kde.kdecoration2/org.kde.oxygen.so
+usr/share/kservices6/oxygendecorationconfig.desktop
+usr/share/locale/*/LC_MESSAGES/oxygen_kdecoration.mo
diff --git a/debian/liboxygenstyle5-5.install b/debian/liboxygenstyle5-5.install
index 3e1c941..7d92fc1 100644
--- a/debian/liboxygenstyle5-5.install
+++ b/debian/liboxygenstyle5-5.install
@@ -1,2 +1,2 @@
-usr/kf6/lib/*/liboxygenstyle5.so.5
-usr/kf6/lib/*/liboxygenstyle5.so.5.*
+usr/lib/*/liboxygenstyle5.so.5
+usr/lib/*/liboxygenstyle5.so.5.*
diff --git a/debian/liboxygenstyleconfig5-5.install b/debian/liboxygenstyleconfig5-5.install
index 11dce38..f699d63 100644
--- a/debian/liboxygenstyleconfig5-5.install
+++ b/debian/liboxygenstyleconfig5-5.install
@@ -1,5 +1,5 @@
-usr/kf6/lib/*/liboxygenstyleconfig5.so.5
-usr/kf6/lib/*/liboxygenstyleconfig5.so.5.*
-usr/kf6/share/kservices6/oxygenstyleconfig.desktop
-usr/kf6/share/locale/*/LC_MESSAGES/liboxygenstyleconfig.mo
-usr/kf6/share/locale/*/LC_MESSAGES/oxygen_style_config.mo
+usr/lib/*/liboxygenstyleconfig5.so.5
+usr/lib/*/liboxygenstyleconfig5.so.5.*
+usr/share/kservices6/oxygenstyleconfig.desktop
+usr/share/locale/*/LC_MESSAGES/liboxygenstyleconfig.mo
+usr/share/locale/*/LC_MESSAGES/oxygen_style_config.mo
diff --git a/debian/not-installed b/debian/not-installed
index 4e5a90c..2a4c624 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,9 +1,9 @@
-usr/kf6/bin/oxygen-demo5
-usr/kf6/share/icons/Oxygen_Zion/
-usr/kf6/share/icons/KDE_Classic/
-usr/kf6/share/icons/Oxygen_Black/
-usr/kf6/share/icons/Oxygen_Black/
-usr/kf6/share/icons/Oxygen_Yellow/
-usr/kf6/share/icons/Oxygen_Blue/
-usr/kf6/share/icons/Oxygen_White/
-usr/kf6/share/locale/*/LC_MESSAGES/oxygen_style_demo.mo
+usr/bin/oxygen-demo5
+usr/share/icons/Oxygen_Zion/
+usr/share/icons/KDE_Classic/
+usr/share/icons/Oxygen_Black/
+usr/share/icons/Oxygen_Black/
+usr/share/icons/Oxygen_Yellow/
+usr/share/icons/Oxygen_Blue/
+usr/share/icons/Oxygen_White/
+usr/share/locale/*/LC_MESSAGES/oxygen_style_demo.mo
diff --git a/debian/plasma-theme-oxygen.install b/debian/plasma-theme-oxygen.install
index 6fcfe9a..0cb81c8 100644
--- a/debian/plasma-theme-oxygen.install
+++ b/debian/plasma-theme-oxygen.install
@@ -1 +1 @@
-usr/kf6/share/plasma/look-and-feel/org.kde.oxygen/
+usr/share/plasma/look-and-feel/org.kde.oxygen/