diff -pruN 4:5.25.4-1/debian/changelog 4:5.25.4-1ubuntu1/debian/changelog
--- 4:5.25.4-1/debian/changelog	2022-08-02 15:35:32.000000000 +0000
+++ 4:5.25.4-1ubuntu1/debian/changelog	2022-08-04 10:20:56.000000000 +0000
@@ -1,3 +1,11 @@
+powerdevil (4:5.25.4-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Kubuntu Vcs and maintainer fields.
+    - Recommend power-profiles-daemon
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 04 Aug 2022 11:20:56 +0100
+
 powerdevil (4:5.25.4-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
@@ -5,6 +13,12 @@ powerdevil (4:5.25.4-1) unstable; urgenc
 
  -- Aurélien COUDERC <coucouf@debian.org>  Tue, 02 Aug 2022 17:35:32 +0200
 
+powerdevil (4:5.25.4-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (5.25.4)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 02 Aug 2022 18:01:15 +0100
+
 powerdevil (4:5.25.3-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
@@ -15,6 +29,18 @@ powerdevil (4:5.25.3-1) unstable; urgenc
 
  -- Aurélien COUDERC <coucouf@debian.org>  Sun, 17 Jul 2022 15:29:57 +0200
 
+powerdevil (4:5.25.3-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (5.25.3)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 12 Jul 2022 14:45:46 +0100
+
+powerdevil (4:5.25.2-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (5.25.2)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 28 Jun 2022 14:18:49 +0100
+
 powerdevil (4:5.25.1-1) experimental; urgency=medium
 
   [ Patrick Franz ]
@@ -25,6 +51,13 @@ powerdevil (4:5.25.1-1) experimental; ur
 
  -- Patrick Franz <deltaone@debian.org>  Tue, 21 Jun 2022 21:48:08 +0200
 
+powerdevil (4:5.25.1-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (5.25.1)
+  * Drop included upstream_fix-backlight-bug-454161.patch
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 21 Jun 2022 16:29:07 +0100
+
 powerdevil (4:5.25.0-2) experimental; urgency=medium
 
   * Drop Revert-upstream-Write-brightness-to-all-raw-devices.patch.
@@ -42,6 +75,18 @@ powerdevil (4:5.25.0-1) experimental; ur
 
  -- Aurélien COUDERC <coucouf@debian.org>  Tue, 14 Jun 2022 21:27:14 +0200
 
+powerdevil (4:5.25.0-0ubuntu2) kinetic; urgency=medium
+
+  * Add upstream_fix-backlight-bug-454161.patch
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 16 Jun 2022 10:11:43 +0100
+
+powerdevil (4:5.25.0-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (5.25.0)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 14 Jun 2022 08:07:37 +0100
+
 powerdevil (4:5.24.90-1) experimental; urgency=medium
 
   [ Aurélien COUDERC ]
@@ -51,6 +96,12 @@ powerdevil (4:5.24.90-1) experimental; u
 
  -- Aurélien COUDERC <coucouf@debian.org>  Fri, 20 May 2022 11:49:01 +0200
 
+powerdevil (4:5.24.90-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (5.24.90)
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 19 May 2022 18:43:17 +0100
+
 powerdevil (4:5.24.5-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
@@ -58,6 +109,12 @@ powerdevil (4:5.24.5-1) unstable; urgenc
 
  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 12 May 2022 21:40:57 +0200
 
+powerdevil (4:5.24.5-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (5.24.5)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 03 May 2022 15:50:31 +0100
+
 powerdevil (4:5.24.4-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
@@ -65,6 +122,12 @@ powerdevil (4:5.24.4-1) unstable; urgenc
 
  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 30 Mar 2022 14:09:19 +0200
 
+powerdevil (4:5.24.4-0ubuntu1) jammy; urgency=medium
+
+  * New upstream bugfix release (5.24.4)
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 30 Mar 2022 10:22:18 +0100
+
 powerdevil (4:5.24.3-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
@@ -73,6 +136,13 @@ powerdevil (4:5.24.3-1) unstable; urgenc
 
  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 10 Mar 2022 08:07:48 +0100
 
+powerdevil (4:5.24.3-0ubuntu1) jammy; urgency=medium
+
+  * Update maintainer to Kubuntu Developers.
+  * New upstream release (5.24.3)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 08 Mar 2022 12:16:43 +0000
+
 powerdevil (4:5.24.2-1) unstable; urgency=medium
 
   [ Patrick Franz ]
@@ -83,6 +153,31 @@ powerdevil (4:5.24.2-1) unstable; urgenc
 
  -- Patrick Franz <deltaone@debian.org>  Sat, 26 Feb 2022 22:00:02 +0100
 
+powerdevil (4:5.24.2-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.24.2)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 22 Feb 2022 15:03:48 +0000
+
+powerdevil (4:5.24.1-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.24.1)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 15 Feb 2022 14:23:11 +0000
+
+powerdevil (4:5.24.0-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.24.0)
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 07 Feb 2022 21:29:28 +0000
+
+powerdevil (4:5.23.90-0ubuntu1) jammy; urgency=medium
+
+  * New upstream beta release (5.23.90)
+  * Build depend on kirigami2-dev
+
+ -- Rik Mills <rikmills@kde.org>  Fri, 14 Jan 2022 10:20:55 +0000
+
 powerdevil (4:5.23.5-1) unstable; urgency=medium
 
   [ Patrick Franz ]
@@ -91,6 +186,12 @@ powerdevil (4:5.23.5-1) unstable; urgenc
 
  -- Patrick Franz <deltaone@debian.org>  Fri, 07 Jan 2022 18:37:20 +0100
 
+powerdevil (4:5.23.5-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.23.5)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 04 Jan 2022 10:42:38 +0000
+
 powerdevil (4:5.23.4-1) unstable; urgency=medium
 
   [ Norbert Preining ]
@@ -98,6 +199,35 @@ powerdevil (4:5.23.4-1) unstable; urgenc
 
  -- Patrick Franz <deltaone@debian.org>  Thu, 02 Dec 2021 22:59:09 +0100
 
+powerdevil (4:5.23.4-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.23.4)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 30 Nov 2021 21:58:48 +0000
+
+powerdevil (4:5.23.3-1ubuntu3) jammy; urgency=medium
+
+  * Add Kubuntu Vcs fields.
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 29 Nov 2021 17:19:24 +0000
+
+powerdevil (4:5.23.3-1ubuntu2) jammy; urgency=medium
+
+  * Re-apply delta from José Manuel Santamaría Lema:
+    - Remove powerdevil from powerdevil-dev Depends. This is to avoid
+      a multiarch lintian warning, the powerdevil-dev package shouldn't
+      exist anyway (it only provides useless *.so symlinks) but I'm
+      keeping it to reduce the delta with debian.
+
+ -- Rik Mills <rikmills@kde.org>  Sat, 27 Nov 2021 08:23:43 +0000
+
+powerdevil (4:5.23.3-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Recommends: power-profiles-daemon.
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 17 Nov 2021 08:42:02 +0000
+
 powerdevil (4:5.23.3-1) unstable; urgency=medium
 
   [ Norbert Preining ]
@@ -105,6 +235,12 @@ powerdevil (4:5.23.3-1) unstable; urgenc
 
  -- Norbert Preining <norbert@preining.info>  Wed, 10 Nov 2021 08:43:24 +0900
 
+powerdevil (4:5.23.3-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.23.3)
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 10 Nov 2021 11:19:48 +0000
+
 powerdevil (4:5.23.2-1) unstable; urgency=medium
 
   [ Norbert Preining ]
@@ -113,6 +249,15 @@ powerdevil (4:5.23.2-1) unstable; urgenc
 
  -- Norbert Preining <norbert@preining.info>  Wed, 03 Nov 2021 22:21:04 +0900
 
+powerdevil (4:5.23.2-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.23.1)
+  * New upstream release (5.23.2)
+  * Recommends: power-profiles-daemon, now that these are supported in
+    Plasma 5.23
+
+ -- Rik Mills <rikmills@kde.org>  Fri, 05 Nov 2021 07:52:16 +0000
+
 powerdevil (4:5.23.0-2) unstable; urgency=medium
 
   [ Patrick Franz ]
@@ -132,6 +277,60 @@ powerdevil (4:5.23.0-1) unstable; urgenc
 
  -- Norbert Preining <norbert@preining.info>  Thu, 14 Oct 2021 20:13:16 +0900
 
+powerdevil (4:5.23.0-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (5.23.0)
+  * Update build deps from cmake.
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 18 Oct 2021 17:54:44 +0100
+
+powerdevil (4:5.22.5-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.22.5)
+  * Remove powerdevil from powerdevil-dev Depends. This is to avoid a
+    multiarch lintian warning, the powerdevil-dev package shouldn't
+    exist anyway (it only provides useless *.so symlinks) but I'm
+    keeping it to reduce the delta with debian.
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Thu, 09 Sep 2021 00:51:39 +0200
+
+powerdevil (4:5.22.4-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.22.4)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 27 Jul 2021 13:44:49 +0100
+
+powerdevil (4:5.22.3-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.22.3)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 06 Jul 2021 14:08:24 +0100
+
+powerdevil (4:5.22.2.1-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.22.2.1)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 22 Jun 2021 21:57:20 +0100
+
+powerdevil (4:5.22.2-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.22.2)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 22 Jun 2021 18:59:53 +0100
+
+powerdevil (4:5.22.1-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.22.1)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 15 Jun 2021 14:12:34 +0100
+
+powerdevil (4:5.22.0-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.22.0)
+  * Update install files.
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 10 Jun 2021 11:54:54 +0100
+
 powerdevil (4:5.21.5-2) unstable; urgency=medium
 
   [ Patrick Franz ]
@@ -147,6 +346,13 @@ powerdevil (4:5.21.5-1) experimental; ur
 
  -- Patrick Franz <patfra71@gmail.com>  Fri, 07 May 2021 19:32:51 +0200
 
+powerdevil (4:5.21.5-0ubuntu1) impish; urgency=medium
+
+  * New upstream release (5.21.5)
+  * debian/control: For now do not use arch: linux-any
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 04 May 2021 17:04:22 +0100
+
 powerdevil (4:5.21.4-1) experimental; urgency=medium
 
   [ Patrick Franz ]
@@ -155,6 +361,12 @@ powerdevil (4:5.21.4-1) experimental; ur
 
  -- Patrick Franz <patfra71@gmail.com>  Tue, 06 Apr 2021 20:53:17 +0200
 
+powerdevil (4:5.21.4-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream bugfix and translation release (5.21.4)
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 07 Apr 2021 11:11:28 +0100
+
 powerdevil (4:5.21.3-1) experimental; urgency=medium
 
   [ Norbert Preining ]
@@ -163,6 +375,12 @@ powerdevil (4:5.21.3-1) experimental; ur
 
  -- Norbert Preining <norbert@preining.info>  Wed, 17 Mar 2021 05:49:43 +0900
 
+powerdevil (4:5.21.3-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream release (5.21.3)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 16 Mar 2021 20:36:51 +0000
+
 powerdevil (4:5.21.2-1) experimental; urgency=medium
 
   [ Patrick Franz ]
@@ -171,6 +389,12 @@ powerdevil (4:5.21.2-1) experimental; ur
 
  -- Norbert Preining <norbert@preining.info>  Wed, 03 Mar 2021 05:33:51 +0900
 
+powerdevil (4:5.21.2-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream release (5.21.2)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 02 Mar 2021 14:14:23 +0000
+
 powerdevil (4:5.21.1-2) experimental; urgency=medium
 
   [ Norbert Preining ]
@@ -185,6 +409,12 @@ powerdevil (4:5.21.1-1) experimental; ur
 
  -- Norbert Preining <norbert@preining.info>  Wed, 24 Feb 2021 14:36:41 +0900
 
+powerdevil (4:5.21.1-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream release (5.21.1)
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 23 Feb 2021 15:07:57 +0000
+
 powerdevil (4:5.21.0-1) experimental; urgency=medium
 
   [ Norbert Preining ]
@@ -195,6 +425,19 @@ powerdevil (4:5.21.0-1) experimental; ur
 
  -- Norbert Preining <norbert@preining.info>  Wed, 17 Feb 2021 05:42:28 +0900
 
+powerdevil (4:5.21.0-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream release (5.21.0)
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 17 Feb 2021 14:23:35 +0000
+
+powerdevil (4:5.20.90-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream (beta) release (5.20.90)
+  * Update install files.
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 21 Jan 2021 23:46:39 +0000
+
 powerdevil (4:5.20.5-2) unstable; urgency=medium
 
   * Team upload.
diff -pruN 4:5.25.4-1/debian/control 4:5.25.4-1ubuntu1/debian/control
--- 4:5.25.4-1/debian/control	2022-08-02 15:35:32.000000000 +0000
+++ 4:5.25.4-1ubuntu1/debian/control	2022-08-04 10:20:56.000000000 +0000
@@ -1,7 +1,8 @@
 Source: powerdevil
 Section: kde
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Aurélien COUDERC <coucouf@debian.org>,
            Norbert Preining <norbert@preining.info>,
            Patrick Franz <deltaone@debian.org>,
@@ -49,8 +50,8 @@ Build-Depends: cmake (>= 3.16~),
                qtbase5-dev (>= 5.15.2~),
 Standards-Version: 4.6.1
 Homepage: https://invent.kde.org/plasma/powerdevil
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/powerdevil
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/powerdevil.git
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/powerdevil
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/powerdevil
 Rules-Requires-Root: no
 
 Package: libpowerdevilcore2
@@ -79,6 +80,7 @@ Depends: libcap2-bin [linux-any],
          powerdevil-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
+Recommends: power-profiles-daemon,
 Description: Global power saver settings.
  Power Devil allows you to define your all power settings.
 
