[neon/neon-packaging/plasma5support/Neon/release_jammy] debian: move away from bogus kf6- prefixing

[Carlos De Maine]

Git commit 704e9188b68c2252a65ef9c763fa77fa2850934c by Carlos De Maine.
Committed on 08/10/2024 at 09:20.
Pushed by carlosdem into branch 'Neon/release_jammy'.

move away from bogus kf6- prefixing

M  +22   -5    debian/control
D  +0    -2    debian/kf6-plasma5support.lintian-overrides
R  +0    -0    debian/plasma5support-dev.install [from: debian/kf6-plasma5support-dev.install - 100% similarity]
R  +0    -0    debian/plasma5support.install [from: debian/kf6-plasma5support.install - 100% similarity]
A  +1    -0    debian/plasma5support.lintian-overrides

https://invent.kde.org/neon/neon-packaging/plasma5support/-/commit/704e9188b68c2252a65ef9c763fa77fa2850934c

diff --git a/debian/control b/debian/control
index 22ba94a..e7ed8bc 100644
--- a/debian/control
+++ b/debian/control
@@ -29,19 +29,22 @@ Homepage: https://projects.kde.org/projects/kde/workspace/plasma-integration
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/plasma-integration
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/plasma-integration.git
 
-Package: kf6-plasma5support
+Package: plasma5support
 Architecture: any
+X-Neon-MergedPackage: true
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: plasma-workspace (<< 4:6.2.0),
-Replaces: plasma-workspace (<< 4:6.2.0),
-Recommends:
+Breaks: kf6-plasma5support,
+        plasma-workspace (<< 4:6.2.0),
+Replaces: kf6-plasma5support,
+          plasma-workspace (<< 4:6.2.0),
 Description: Migration aids for KF5 -> KF6 migration contains:
  Dataengine support is not in the kf6 version of plasma anymore. Dataengines
  should be migrated to QML imports, but in the meantime remaining engines can
  use the dataengine implementation here
 
-Package: kf6-plasma5support-dev
+Package: plasma5support-dev
 Architecture: any
+X-Neon-MergedPackage: true
 Section: libdevel
 Depends: kf6-extra-cmake-modules,
          kf6-kcoreaddons-dev,
@@ -49,5 +52,19 @@ Depends: kf6-extra-cmake-modules,
          kf6-plasma5support (= ${binary:Version}),
          qt6-base-dev,
          ${misc:Depends}
+Breaks: kf6-plasma5support-dev,
+Replaces: kf6-plasma5support-dev,
 Description: development files for the migration aids for KF5 -> KF6 migration.
  Contains development files for libplasma5support.
+
+Package: kf6-plasma5support
+Architecture: all
+Depends: plasma5support, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: kf6-plasma5support-dev
+Architecture: all
+Depends: plasma5support-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
\ No newline at end of file
diff --git a/debian/kf6-plasma5support.lintian-overrides b/debian/kf6-plasma5support.lintian-overrides
deleted file mode 100644
index 4765882..0000000
--- a/debian/kf6-plasma5support.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-kf6-plasma5support: package-name-doesnt-match-sonames libPlasma5Support6
-kf6-plasma5support: unknown-locale-code tok
\ No newline at end of file
diff --git a/debian/kf6-plasma5support-dev.install b/debian/plasma5support-dev.install
similarity index 100%
rename from debian/kf6-plasma5support-dev.install
rename to debian/plasma5support-dev.install
diff --git a/debian/kf6-plasma5support.install b/debian/plasma5support.install
similarity index 100%
rename from debian/kf6-plasma5support.install
rename to debian/plasma5support.install
diff --git a/debian/plasma5support.lintian-overrides b/debian/plasma5support.lintian-overrides
new file mode 100644
index 0000000..6b37038
--- /dev/null
+++ b/debian/plasma5support.lintian-overrides
@@ -0,0 +1 @@
+plasma5support: unknown-locale-code tok
\ No newline at end of file