[neon/kde/plasma-desktop/Neon/unstable] debian: convert to a X-Neon-MergedPackage: true package

[Carlos De Maine]

Git commit 37462510b9e709ec7a18b8939d1cf2959c300f81 by Carlos De Maine.
Committed on 23/12/2023 at 11:25.
Pushed by carlosdem into branch 'Neon/unstable'.

convert to a X-Neon-MergedPackage: true package

M  +21   -27   debian/control
D  +0    -13   debian/plasma-desktop-data.install
M  +1    -1    debian/plasma-desktop-dev.install
M  +13   -1    debian/plasma-desktop.install
D  +0    -14   debian/plasma-desktop.maintscript
R  +0    -0    debian/plasma-desktop.qml-ignore [from: debian/plasma-desktop-data.qml-ignore - 100% similarity]

https://invent.kde.org/neon/kde/plasma-desktop/-/commit/37462510b9e709ec7a18b8939d1cf2959c300f81

diff --git a/debian/control b/debian/control
index 17ab907..330dfc7 100644
--- a/debian/control
+++ b/debian/control
@@ -96,6 +96,8 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/plasma-desktop.git
 
 Package: plasma-desktop
 Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
 Depends: breeze,
          ibus-data,
          kactivitymanagerd,
@@ -109,15 +111,17 @@ Depends: breeze,
          kf6-solid,
          libplasma6,
          oxygen-sounds,
-         plasma-desktop-data (= ${source:Version}),
+         plasma-activities,
          plasma-integration,
          plasma-thunderbolt,
          plasma-workspace,
          polkit-kde-agent-1,
+         python3:any,
          qml6-module-org-kde-pipewire,
          qml6-module-qt-labs-folderlistmodel,
          qml6-module-qt-labs-platform,
          qml6-module-qt-labs-settings,
+         qml6-module-qtquick-dialogs
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: bluedevil,
@@ -140,31 +144,13 @@ Recommends: bluedevil,
             plasma-pa,
             powerdevil,
             systemsettings
-Description: Tools and widgets for the desktop
- Plasma Desktop offers a beautiful looking desktop
- that takes complete advantage of modern computing technology.
- Through the use of visual effects and scalable graphics,
- the desktop experience is not only smooth but also pleasant
- to the eye. The looks of Plasma Desktop not only provide beauty,
- they are also used to support and improve your computer
- activities effectively, without being distracting.
- .
- This package is part of the KDE Plasma.
-
-Package: plasma-desktop-data
-Architecture: all
-Depends: libplasma6,
-         ${misc:Depends}
-Recommends: plasma-workspace,
-            python3,
-            kf6-kactivities,
-            kf6-kwindowsystem,
-            qml6-module-qtquick-dialogs
 Provides: kde-config-touchpad,
+          plasma-desktop-data,
           user-manager
 Replaces: kde-config-touchpad,
+          plasma-desktop-data,
           user-manager
-Description: Tools and widgets for the desktop data files
+Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.
  Through the use of visual effects and scalable graphics,
@@ -174,12 +160,11 @@ Description: Tools and widgets for the desktop data files
  activities effectively, without being distracting.
  .
  This package is part of the KDE Plasma.
- .
- This package contains the data files
 
 Package: plasma-desktop-dev
-Section: devel
 Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
 Depends: plasma-desktop (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -194,16 +179,25 @@ Description: Tools and widgets for the desktop
  .
  This package is part of the KDE Plasma.
 
+#### transitionals below
+
 Package: kde-config-touchpad
-Depends: plasma-desktop-data, ${misc:Depends}
+Depends: plasma-desktop, ${misc:Depends}
 Architecture: all
 Priority: optional
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
 
+Package: plasma-desktop-data
+Architecture: all
+Priority: optional
+Depends: plasma-desktop, ${misc:Depends}
+Description: dummy transitional package
+ This is a transitional package which can be removed.
+
 Package: user-manager
 Architecture: all
 Priority: optional
-Depends: plasma-desktop-data, ${misc:Depends}
+Depends: plasma-desktop, ${misc:Depends}
 Description: dummy transitional package
  This is a transitional package which can be removed.
diff --git a/debian/plasma-desktop-data.install b/debian/plasma-desktop-data.install
deleted file mode 100644
index dc45c1a..0000000
--- a/debian/plasma-desktop-data.install
+++ /dev/null
@@ -1,13 +0,0 @@
-etc/xdg/autostart/kaccess.desktop
-usr/share/accounts/
-usr/share/config.kcfg/
-usr/share/dbus-1/system-services
-usr/share/doc/
-usr/share/icons/
-usr/share/k*
-usr/share/locale/
-usr/share/metainfo/
-usr/share/plasma
-usr/share/polkit-1/actions/
-usr/share/qlogging-categories6/
-usr/share/solid/
diff --git a/debian/plasma-desktop-dev.install b/debian/plasma-desktop-dev.install
index 1a3fce1..457aa50 100644
--- a/debian/plasma-desktop-dev.install
+++ b/debian/plasma-desktop-dev.install
@@ -1 +1 @@
-usr/share/dbus-1/interfaces/org.kde.touchpad.xml
+usr/share/dbus-1/interfaces/
\ No newline at end of file
diff --git a/debian/plasma-desktop.install b/debian/plasma-desktop.install
index 7cc6d89..5de45e2 100644
--- a/debian/plasma-desktop.install
+++ b/debian/plasma-desktop.install
@@ -1,5 +1,17 @@
+etc/xdg/autostart/
 usr/bin/
 usr/lib/*/libexec/
 usr/lib/*/qt6/
+usr/share/accounts/
 usr/share/applications/
-usr/share/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
\ No newline at end of file
+usr/share/config.kcfg/
+usr/share/dbus-1/system-services
+usr/share/doc/
+usr/share/icons/
+usr/share/k*
+usr/share/locale/
+usr/share/metainfo/
+usr/share/plasma/
+usr/share/polkit-1/actions/
+usr/share/qlogging-categories6/
+usr/share/solid/
diff --git a/debian/plasma-desktop.maintscript b/debian/plasma-desktop.maintscript
deleted file mode 100644
index 3179360..0000000
--- a/debian/plasma-desktop.maintscript
+++ /dev/null
@@ -1,14 +0,0 @@
-# KNSRC files are now in /usr/share, where they should have belonged all along.
-# ditto dbus policy files
-# kdebugsettings categories file
-rm_conffile /etc/dbus-1/system.d/org.kde.fontinst.conf
-rm_conffile /etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
-rm_conffile /etc/xdg/colorschemes.knsrc
-rm_conffile /etc/xdg/emoticons.knsrc
-rm_conffile /etc/xdg/icons.knsrc
-rm_conffile /etc/xdg/kfontinst.knsrc
-rm_conffile /etc/xdg/ksplash.knsrc
-rm_conffile /etc/xdg/lookandfeel.knsrc
-rm_conffile /etc/xdg/plasma-desktop.categories
-rm_conffile /etc/xdg/plasma-themes.knsrc
-rm_conffile /etc/xdg/xcursor.knsrc
diff --git a/debian/plasma-desktop-data.qml-ignore b/debian/plasma-desktop.qml-ignore
similarity index 100%
rename from debian/plasma-desktop-data.qml-ignore
rename to debian/plasma-desktop.qml-ignore