[neon/extras/kronometer/Neon/release] debian: manually sync to ubuntu cos salsa is down

[Jonathan Riddell]

Git commit c51f2ebe7e899a2870e1fd6db3c4cab8b3df57bd by Jonathan Riddell.
Committed on 03/09/2024 at 14:40.
Pushed by jriddell into branch 'Neon/release'.

manually sync to ubuntu cos salsa is down

D  +0    -1    debian/.gitattributes
M  +22   -27   debian/changelog
M  +5    -3    debian/control

https://invent.kde.org/neon/extras/kronometer/-/commit/c51f2ebe7e899a2870e1fd6db3c4cab8b3df57bd

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 5930495..5a235a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,27 @@
-kronometer (2.3.0-0neon) jammy; urgency=medium
+kronometer (2.3.0-1build2) noble; urgency=medium
 
-  * New release
+  * No-change rebuild for CVE-2024-3094
 
- -- Neon CI <neon at kde.org>  Fri, 21 Oct 2022 18:51:25 +0000
+ -- William Grant <wgrant at ubuntu.com>  Mon, 01 Apr 2024 17:47:17 +1100
+
+kronometer (2.3.0-1build1) noble; urgency=medium
+
+  * No-change rebuild against libqt5core5t64
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Fri, 15 Mar 2024 05:19:00 +0000
+
+kronometer (2.3.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update standards version to 4.6.1, no changes needed.
+  * Update the build dependencies according to the upstream build system:
+    - bump Qt packages to 5.15.0
+    - add libkf5coreaddons-dev
+  * Update the patches:
+    - upstream_appdata-use-canonical-help-URL.patch: drop, backported from
+      upstream
+
+ -- Pino Toscano <pino at debian.org>  Sat, 22 Oct 2022 12:21:43 +0200
 
 kronometer (2.2.3-2) unstable; urgency=medium
 
@@ -54,12 +73,6 @@ kronometer (2.2.1-1) unstable; urgency=medium
 
  -- Pino Toscano <pino at debian.org>  Sun, 11 Feb 2018 09:53:09 +0100
 
-kronometer (2.2.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 09 Feb 2018 15:17:08 +0000
-
 kronometer (2.2.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -71,18 +84,6 @@ kronometer (2.2.0-1) unstable; urgency=medium
 
  -- Pino Toscano <pino at debian.org>  Tue, 05 Dec 2017 19:56:06 +0100
 
-kronometer (2.2.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 09 Jan 2018 10:45:15 +0000
-
-kronometer (2.2.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 08 Jan 2018 11:33:34 +0000
-
 kronometer (2.1.5-1) unstable; urgency=medium
 
   * New upstream release.
@@ -91,12 +92,6 @@ kronometer (2.1.5-1) unstable; urgency=medium
 
  -- Pino Toscano <pino at debian.org>  Sun, 18 Jun 2017 07:31:23 +0200
 
-kronometer (2.1.5-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 17 Jun 2017 19:36:32 +0000
-
 kronometer (2.1.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6265ead..a676f73 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,17 @@
 Source: kronometer
 Section: utils
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>
 Build-Depends: debhelper-compat (= 13),
  cmake (>= 3.1),
  gettext,
  pkg-kde-tools (>= 0.15.16),
- qtbase5-dev (>= 5.9.0),
+ qtbase5-dev (>= 5.15.0~),
  extra-cmake-modules (>= 5.26.0),
  libkf5config-dev (>= 5.26.0),
+ libkf5coreaddons-dev (>= 5.26.0),
  libkf5crash-dev (>= 5.26.0),
  libkf5doctools-dev (>= 5.26.0),
  libkf5i18n-dev (>= 5.26.0),
@@ -17,7 +19,7 @@ Build-Depends: debhelper-compat (= 13),
  libkf5xmlgui-dev (>= 5.26.0),
  xvfb <!nocheck>,
  xauth <!nocheck>,
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kronometer
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/kronometer.git