[neon/kde/akonadi-calendar-tools/Neon/unstable] debian: lint

[Carlos De Maine]

Git commit 0cc791167ce896b13b9c9a49818ee7be428046b3 by Carlos De Maine.
Committed on 27/11/2023 at 21:38.
Pushed by carlosdem into branch 'Neon/unstable'.

lint

M  +3    -0    debian/changelog
M  +10   -14   debian/control
D  +0    -1    debian/konsolekalendar.lintian-overrides
A  +1    -0    debian/kpim6-akonadi-calendar.lintian-overrides
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/akonadi-calendar-tools/-/commit/0cc791167ce896b13b9c9a49818ee7be428046b3

diff --git a/debian/changelog b/debian/changelog
index a2dc014..ee5af29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -193,6 +193,9 @@ akonadi-calendar-tools (4:20.12.2-0neon) focal; urgency=medium
 akonadi-calendar-tools (4:20.12.1-0neon) focal; urgency=medium
 
   * New release
+
+ -- Neon CI <neon at kde.org>  Thu, 10 Dec 2020 13:30:20 +0000
+
 akonadi-calendar-tools (4:20.12.0-0neon) focal; urgency=medium
 
   * New release
diff --git a/debian/control b/debian/control
index 2ce7298..46b14aa 100644
--- a/debian/control
+++ b/debian/control
@@ -30,30 +30,26 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi-calendar-tools.git
 Package: kpim6-akonadi-calendar-tools
 Architecture: any
 X-Neon-MergedPackage: true
-Multi-Arch: same
 Depends: kpim6-kdepim-runtime,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE command line tools for interacting with calendars.
+ Meta Package which bundles all the Akonadi Calendar Tools.
 
 Package: konsolekalendar
-Architecture: any
-Depends: kpim6-akonadi-calendar-tools,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: KonsoleKalendar is a command-line interface to KDE calendars.
- KonsoleKalendar complements KOrganizer by providing a console frontend to
- manage your calendars.
+Architecture: all
+Depends: kpim6-akonadi-calendar-tools, ${misc:Depends}
+Description: Dummy transitionals.
+ Transitional package.
 
 Package: calendarjanitor
-Architecture: any
-Depends: kpim6-akonadi-calendar-tools,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: CalendarJanitor is a command-line interface to KDE calendars.
+Architecture: all
+Depends: kpim6-akonadi-calendar-tools, ${misc:Depends}
+Description: Dummy transitionals.
+ Transitional package.
 
 Package: akonadi-calendar-tools
 Architecture: all
-Depends: kpim6-akonadi-calendar-tools
+Depends: kpim6-akonadi-calendar-tools,  ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/konsolekalendar.lintian-overrides b/debian/konsolekalendar.lintian-overrides
deleted file mode 100644
index 0c1bded..0000000
--- a/debian/konsolekalendar.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-konsolekalendar: desktop-command-not-in-package usr/share/applications/konsolekalendar.desktop kdialog
diff --git a/debian/kpim6-akonadi-calendar.lintian-overrides b/debian/kpim6-akonadi-calendar.lintian-overrides
new file mode 100644
index 0000000..b7f66a5
--- /dev/null
+++ b/debian/kpim6-akonadi-calendar.lintian-overrides
@@ -0,0 +1 @@
+kpim6-akonadi-calendar-tools: desktop-command-not-in-package usr/share/applications/konsolekalendar.desktop kdialog
diff --git a/debian/rules b/debian/rules
index 081221b..d9b88f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,4 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT=ON
\ No newline at end of file
+		-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT=ON