[neon/neon-packaging/merkuro/Neon/stable] debian: New release

[Carlos De Maine]

Git commit d24e1aaa5aa88eeee19291c22e23630fcf04bd08 by Carlos De Maine, on behalf of Neon CI.
Committed on 10/02/2025 at 08:51.
Pushed by carlosdem into branch 'Neon/stable'.

New release

(cherry picked from commit 874d34437849ff4536933408cbddece98f38fa00)

M  +6    -0    debian/changelog
M  +9    -9    debian/control
M  +3    -3    debian/merkuro.install

https://invent.kde.org/neon/neon-packaging/merkuro/-/commit/d24e1aaa5aa88eeee19291c22e23630fcf04bd08

diff --git a/debian/changelog b/debian/changelog
index 0af3da4..92c270f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+merkuro (24.12.2-0neon) noble; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon at kde.org>  Fri, 07 Feb 2025 16:27:11 +0000
+
 merkuro (24.12.1-0neon) noble; urgency=medium
 
   * New release
diff --git a/debian/control b/debian/control
index 4e46a83..113728b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: merkuro
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cmake ,
+Build-Depends: cmake,
                debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kcalendarcore-dev,
@@ -12,8 +12,8 @@ Build-Depends: cmake ,
                kf6-kdbusaddons-dev,
                kf6-ki18n-dev,
                kf6-kiconthemes-dev,
-               kf6-kirigami2-dev,
                kf6-kirigami-addons-dev,
+               kf6-kirigami2-dev,
                kf6-kitemmodels-dev,
                kf6-knotifications-dev,
                kf6-kservice-dev,
@@ -21,24 +21,24 @@ Build-Depends: cmake ,
                kf6-kwindowsystem-dev,
                kf6-kxmlgui-dev,
                kf6-qqc2-desktop-style-dev,
+               kpim6-akonadi-calendar,
                kpim6-akonadi-contacts-dev,
                kpim6-akonadi-dev,
-               kpim6-akonadi-calendar,
                kpim6-calendarsupport-dev,
                kpim6-eventviews-dev,
                kpim6-kidentitymanagement-dev,
                kpim6-kmailtransport-dev,
                kpim6-kmbox-dev,
-               kpim6-messagelib-dev,
                kpim6-kmime-dev,
                kpim6-mailcommon-dev,
+               kpim6-messagelib-dev,
                kpim6-mimetreeparser-dev,
                kpim6-pimcommon-dev,
                libgpgme-dev,
                libgpgmepp-dev,
+               libplasma-dev,
                libqgpgmeqt6-dev,
                pkg-kde-tools-neon,
-               libplasma-dev,
                qt6-base-dev,
                qt6-declarative-dev,
                qt6-location-dev,
@@ -51,8 +51,8 @@ Rules-Requires-Root: no
 Package: merkuro
 Architecture: any
 Depends: kpim6-akonadi,
-         kpim6-kdepim-runtime,
          kpim6-akonadi-calendar,
+         kpim6-kdepim-runtime,
          qml6-module-org-kde-kidentitymanagement,
          qml6-module-org-kde-kirigami-addons-datetime,
          qml6-module-org-kde-kirigami-addons-delegates,
@@ -75,9 +75,9 @@ Description: Calendar app
 
 Package: merkuro-dev
 Architecture: any
-Depends: merkuro (= ${binary:Version}), ${misc:Depends},
-Breaks: merkuro (<< ${source:Version}~ciBuild),
-Replaces: merkuro (<< ${source:Version}~ciBuild),
+Depends: merkuro (= ${binary:Version}), ${misc:Depends}
+Breaks: merkuro (<< 24.12.2)
+Replaces: merkuro (<< 24.12.2)
 Description: Calendar app
  Calendar application that allows you to manage your tasks and
  events. merkuro supports both local calendars as well as a multitude
diff --git a/debian/merkuro.install b/debian/merkuro.install
index f269cd7..3220c4c 100644
--- a/debian/merkuro.install
+++ b/debian/merkuro.install
@@ -1,6 +1,6 @@
-usr/lib/*/qt6/qml/org/kde/merkuro/
-usr/lib/*/libMerkuroComponents.so.*.*.*
 usr/lib/*/libMerkuroComponents.so.*
+usr/lib/*/libMerkuroComponents.so.*.*.*
+usr/lib/*/qt6/qml/org/kde/merkuro/
 usr/share/applications/
+usr/share/icons/
 usr/share/metainfo/
-usr/share/icons/
\ No newline at end of file