[neon/kde/grantleetheme/Neon/unstable] debian: more kpim6ing

[Carlos De Maine]

Git commit e203a5233610f6a625e6c207b5025f597d8cf1f7 by Carlos De Maine.
Committed on 24/09/2023 at 07:35.
Pushed by carlosdem into branch 'Neon/unstable'.

more kpim6ing

M  +19   -16   debian/control
M  +1    -2    debian/kpim6-grantleetheme.install

https://invent.kde.org/neon/kde/grantleetheme/-/commit/e203a5233610f6a625e6c207b5025f597d8cf1f7

diff --git a/debian/control b/debian/control
index 7d0c0bd..ad8163f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 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),
                kf6-attica-dev,
                kf6-extra-cmake-modules,
                kf6-kcolorscheme-dev,
@@ -15,22 +15,37 @@ Build-Depends: cmake (>= 2.8.12~),
                kf6-knewstuff-dev,
                kf6-ktexttemplate-dev,
                kf6-kxmlgui-dev,
-               libgrantlee5-dev,
                pkg-kde-tools-neon,
                qt6-base-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/grantleetheme.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/grantleetheme.git
 
 Package: kpim6-grantleetheme
 Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KDE PIM grantlee theme support - library
  This library provides the grantlee theme support for KDE PIM.
  .
  This package provides the shared libraries.
 
+Package: kpim6-grantleetheme-dev
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: kpim6-grantleetheme (= ${binary:Version}),
+         qt6-base-dev,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: KDE PIM grantlee theme support - devel files
+ This library provides the grantlee theme support for KDE PIM.
+ .
+ This package provides the development files.
+
 Package: libkf6grantleetheme6
 Architecture: all
 Depends: kpim6-grantleetheme
@@ -43,18 +58,6 @@ Depends: kpim6-grantleetheme
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: kpim6-grantleetheme-dev
-Section: libdevel
-Architecture: any
-Depends: kpim6-grantleetheme (= ${binary:Version}),
-         qt6-base-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: KDE PIM grantlee theme support - devel files
- This library provides the grantlee theme support for KDE PIM.
- .
- This package provides the development files.
-
 Package: libkf6grantleetheme-dev
 Architecture: all
 Depends: kpim6-grantleetheme-dev
diff --git a/debian/kpim6-grantleetheme.install b/debian/kpim6-grantleetheme.install
index 8332dfe..80a8a4f 100644
--- a/debian/kpim6-grantleetheme.install
+++ b/debian/kpim6-grantleetheme.install
@@ -2,5 +2,4 @@ usr/lib/*/libKPim6GrantleeTheme.so.*.*
 usr/lib/*/libKPim6GrantleeTheme.so.6
 usr/lib/*/qt6/plugins/kf6/ktexttemplate/kde_grantlee_plugin*
 usr/share/locale/
-usr/share/qlogging-categories6/grantleetheme.categories
-usr/share/qlogging-categories6/grantleetheme.renamecategories
+usr/share/qlogging-categories6/