diff -pruN 25.04.0-1/.gitlab-ci.yml 25.08.1-0ubuntu1/.gitlab-ci.yml
--- 25.04.0-1/.gitlab-ci.yml	2025-02-12 15:38:22.000000000 +0000
+++ 25.08.1-0ubuntu1/.gitlab-ci.yml	2025-07-21 10:19:47.000000000 +0000
@@ -5,8 +5,6 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/linux.yml
-      - /gitlab-templates/freebsd.yml
-      - /gitlab-templates/windows.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/linux-qt6-next.yml
       - /gitlab-templates/freebsd-qt6.yml
diff -pruN 25.04.0-1/debian/changelog 25.08.1-0ubuntu1/debian/changelog
--- 25.04.0-1/debian/changelog	2025-04-17 20:02:14.000000000 +0000
+++ 25.08.1-0ubuntu1/debian/changelog	2025-09-11 05:58:33.000000000 +0000
@@ -1,9 +1,59 @@
-libkexiv2 (25.04.0-1) unstable; urgency=medium
+libkexiv2 (25.08.1-0ubuntu1) questing; urgency=medium
 
-  [ Aurélien COUDERC ]
-  * New upstream release (25.04.0).
+  * New upstream release (25.08.1)
 
- -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Apr 2025 22:02:14 +0200
+ -- Rik Mills <rikmills@kde.org>  Thu, 11 Sep 2025 06:58:33 +0100
+
+libkexiv2 (25.08.0-0ubuntu1) questing; urgency=medium
+
+  * New upstream release (25.08.0)
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 14 Aug 2025 11:33:47 +0100
+
+libkexiv2 (25.07.90-0ubuntu1) questing; urgency=medium
+
+  * New upstream (RC) release (25.07.90)
+
+ -- Rik Mills <rikmills@kde.org>  Fri, 25 Jul 2025 17:59:35 +0100
+
+libkexiv2 (25.07.80-0ubuntu1) questing; urgency=medium
+
+  * New upstream (beta) release (25.07.80)
+
+ -- Rik Mills <rikmills@kde.org>  Sat, 12 Jul 2025 18:24:47 +0100
+
+libkexiv2 (25.04.3-0ubuntu1) questing; urgency=medium
+
+  * New upstream release (25.04.3)
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 03 Jul 2025 07:54:48 +0100
+
+libkexiv2 (25.04.2-0ubuntu1) questing; urgency=medium
+
+  * New upstream release (25.04.2)
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 05 Jun 2025 11:59:40 +0100
+
+libkexiv2 (25.04.1-0ubuntu1) questing; urgency=medium
+
+  * New upstream release (25.04.1)
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 07 May 2025 22:16:58 +0100
+
+libkexiv2 (25.04.0-0ubuntu1) questing; urgency=medium
+
+  * New upstream release (25.04.0)
+  * Update symbols from build logs.
+
+ -- Rik Mills <rikmills@kde.org>  Wed, 30 Apr 2025 20:01:57 +0100
+
+libkexiv2 (24.12.3-1ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Kubuntu Vcs and maintainer fields.
+    - Keep our symbols file.
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 18 Mar 2025 13:38:13 +0000
 
 libkexiv2 (24.12.3-1) unstable; urgency=medium
 
diff -pruN 25.04.0-1/debian/control 25.08.1-0ubuntu1/debian/control
--- 25.04.0-1/debian/control	2025-04-17 20:02:14.000000000 +0000
+++ 25.08.1-0ubuntu1/debian/control	2025-09-11 05:58:33.000000000 +0000
@@ -1,13 +1,14 @@
 Source: libkexiv2
 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>,
            Pino Toscano <pino@debian.org>,
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: cmake (>= 3.16.0~),
+               debhelper-compat (= 13),
                dh-sequence-kf6,
                dh-sequence-pkgkde-symbolshelper,
-               cmake (>= 3.16.0~),
                extra-cmake-modules (>= 5.91.0~),
                libexiv2-dev (>= 0.25~),
                libxkbcommon-dev,
@@ -16,8 +17,8 @@ Build-Depends: debhelper-compat (= 13),
 Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Homepage: https://invent.kde.org/graphics/libkexiv2
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkexiv2
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkexiv2.git
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkexiv2
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkexiv2
 
 Package: libkexiv2qt6-0
 Section: libs
@@ -33,7 +34,8 @@ Description: Qt like interface for the l
 Package: libkexiv2qt6-dev
 Section: libdevel
 Architecture: any
-Depends: libkexiv2qt6-0 (= ${binary:Version}), ${misc:Depends},
+Depends: libkexiv2qt6-0 (= ${binary:Version}),
+         ${misc:Depends},
 Multi-Arch: same
 Description: Qt-like interface for the libexiv2 library -- development files
  Libkexiv2 is a Qt wrapper around the Exiv2 library, used to manipulate
diff -pruN 25.04.0-1/debian/libkexiv2qt6-0.symbols 25.08.1-0ubuntu1/debian/libkexiv2qt6-0.symbols
--- 25.04.0-1/debian/libkexiv2qt6-0.symbols	2025-04-12 21:20:44.000000000 +0000
+++ 25.08.1-0ubuntu1/debian/libkexiv2qt6-0.symbols	2025-09-11 05:58:33.000000000 +0000
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 24.12.3 i386
+# SymbolsHelper-Confirmed: 25.04.0 amd64 arm64 armhf ppc64el riscv64 s390x
 libKExiv2Qt6.so.0 libkexiv2qt6-0 #MINVER#
 * Build-Depends-Package: libkexiv2qt6-dev
  _ZN11KExiv2Iface10KExiv2DataC1ERKS0_@Base 24.05.1
@@ -96,15 +96,15 @@ libKExiv2Qt6.so.0 libkexiv2qt6-0 #MINVER
  _ZN11KExiv2Iface6KExiv2D1Ev@Base 24.05.1
  _ZN11KExiv2Iface6KExiv2D2Ev@Base 24.05.1
  _ZN11KExiv2Iface6KExiv2aSERKS0_@Base 24.05.1
- (optional=templinst|arch=alpha amd64 arm64 hurd-amd64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN5Exiv213toBasicStringIcA59_cEENSt7__cxx1112basic_stringIT_St11char_traitsIS4_ESaIS4_EEERKT0_@Base 24.05.1
- (optional=templinst|subst)_ZN5Exiv29ValueTypeIjE11setDataAreaEPKh{size_t}@Base 24.08.2
- (optional=templinst|subst)_ZN5Exiv29ValueTypeIjE4readEPKh{size_t}NS_9ByteOrderE@Base 24.08.2
- (optional=templinst)_ZN5Exiv29ValueTypeIjE4readERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 24.05.1
- (optional=templinst)_ZN5Exiv29ValueTypeIjEC1ERKS1_@Base 24.05.1
- (optional=templinst)_ZN5Exiv29ValueTypeIjEC2ERKS1_@Base 24.05.1
- (optional=templinst)_ZN5Exiv29ValueTypeIjED0Ev@Base 24.05.1
- (optional=templinst)_ZN5Exiv29ValueTypeIjED1Ev@Base 24.05.1
- (optional=templinst)_ZN5Exiv29ValueTypeIjED2Ev@Base 24.05.1
+ (optional=templinst|arch=ppc64 riscv64)_ZN5Exiv213toBasicStringIcA59_cEENSt7__cxx1112basic_stringIT_St11char_traitsIS4_ESaIS4_EEERKT0_@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64|subst)_ZN5Exiv29ValueTypeIjE11setDataAreaEPKh{size_t}@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64|subst)_ZN5Exiv29ValueTypeIjE4readEPKh{size_t}NS_9ByteOrderE@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64)_ZN5Exiv29ValueTypeIjE4readERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZN5Exiv29ValueTypeIjEC1ERKS1_@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZN5Exiv29ValueTypeIjEC2ERKS1_@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZN5Exiv29ValueTypeIjED0Ev@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZN5Exiv29ValueTypeIjED1Ev@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZN5Exiv29ValueTypeIjED2Ev@Base 24.05.1
  _ZNK11KExiv2Iface14KExiv2Previews12originalSizeEv@Base 24.05.1
  _ZNK11KExiv2Iface14KExiv2Previews16originalMimeTypeEv@Base 24.05.1
  _ZNK11KExiv2Iface14RotationMatrix11toTransformEv@Base 24.05.1
@@ -222,30 +222,29 @@ libKExiv2Qt6.so.0 libkexiv2qt6-0 #MINVER
  _ZNK11KExiv2Iface6KExiv28clearXmpEv@Base 24.05.1
  _ZNK11KExiv2Iface6KExiv29clearExifEv@Base 24.05.1
  _ZNK11KExiv2Iface6KExiv29clearIptcEv@Base 24.05.1
- (optional=templinst|subst)_ZNK5Exiv29ValueTypeIjE10toRationalE{size_t}@Base 24.08.2
- (optional=templinst)_ZNK5Exiv29ValueTypeIjE12sizeDataAreaEv@Base 24.05.1
- (optional=templinst)_ZNK5Exiv29ValueTypeIjE4copyEPhNS_9ByteOrderE@Base 24.05.1
- (optional=templinst)_ZNK5Exiv29ValueTypeIjE4sizeEv@Base 24.05.1
- (optional=templinst)_ZNK5Exiv29ValueTypeIjE5countEv@Base 24.05.1
- (optional=templinst)_ZNK5Exiv29ValueTypeIjE5writeERSo@Base 24.05.1
- (optional=templinst)_ZNK5Exiv29ValueTypeIjE6clone_Ev@Base 24.05.1
- (optional=templinst|subst)_ZNK5Exiv29ValueTypeIjE7toFloatE{size_t}@Base 24.08.2
- (optional=templinst|subst)_ZNK5Exiv29ValueTypeIjE7toInt64E{size_t}@Base 24.08.2
- (optional=templinst)_ZNK5Exiv29ValueTypeIjE8dataAreaEv@Base 24.05.1
- (optional=templinst|subst)_ZNK5Exiv29ValueTypeIjE8toStringB5cxx11E{size_t}@Base 24.08.2
- (optional=templinst|subst)_ZNK5Exiv29ValueTypeIjE8toUint32E{size_t}@Base 24.08.2
- (optional=templinst|arch=!m68k)_ZNSt6vectorIjSaIjEE17_M_realloc_appendIJjEEEvDpOT_@Base 24.08.2
- (optional=templinst|arch=m68k)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 24.12.0
- (optional=templinst|arch=m68k)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 24.12.0
- (optional=templinst)_ZNSt7__cxx1110_List_baseIN5Exiv29ExifdatumESaIS2_EE8_M_clearEv@Base 24.05.1
- (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE16_M_insert_uniqueIS4_EES1_ISt17_Rb_tree_iteratorIS4_EbEOT_@Base 24.05.1
- (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE24_M_get_insert_unique_posERS2_@Base 24.05.1
- (optional=templinst|arch=amd64 arm64 hppa hurd-amd64 i386 loong64 m68k mips64el ppc64el riscv64 sh4 sparc64 x32)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS2_@Base 24.05.1
- (optional=templinst)_ZSt16__do_uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN5Exiv28XmpdatumESt6vectorIS3_SaIS3_EEEEPS3_ET0_T_SC_SB_@Base 24.05.1
- (optional=templinst)_ZSt16__do_uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN5Exiv29IptcdatumESt6vectorIS3_SaIS3_EEEEPS3_ET0_T_SC_SB_@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64|subst)_ZNK5Exiv29ValueTypeIjE10toRationalE{size_t}@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64)_ZNK5Exiv29ValueTypeIjE12sizeDataAreaEv@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZNK5Exiv29ValueTypeIjE4copyEPhNS_9ByteOrderE@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZNK5Exiv29ValueTypeIjE4sizeEv@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZNK5Exiv29ValueTypeIjE5countEv@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZNK5Exiv29ValueTypeIjE5writeERSo@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZNK5Exiv29ValueTypeIjE6clone_Ev@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64|subst)_ZNK5Exiv29ValueTypeIjE7toFloatE{size_t}@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64|subst)_ZNK5Exiv29ValueTypeIjE7toInt64E{size_t}@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64)_ZNK5Exiv29ValueTypeIjE8dataAreaEv@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64|subst)_ZNK5Exiv29ValueTypeIjE8toStringB5cxx11E{size_t}@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64|subst)_ZNK5Exiv29ValueTypeIjE8toUint32E{size_t}@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64)_ZNSt6vectorIjSaIjEE17_M_realloc_appendIJjEEEvDpOT_@Base 24.08.2
+ (optional=templinst|arch=armhf riscv64)_ZNSt7__cxx1110_List_baseIN5Exiv29ExifdatumESaIS2_EE8_M_clearEv@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE16_M_insert_uniqueIS4_EES1_ISt17_Rb_tree_iteratorIS4_EbEOT_@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE24_M_get_insert_unique_posERS2_@Base 24.05.1
+ (optional=templinst|arch=armhf hppa riscv64 sh4)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_S0_ESt10_Select1stIS3_ESt4lessIS0_ESaIS3_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS3_ERS2_@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZSt16__do_uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN5Exiv28XmpdatumESt6vectorIS3_SaIS3_EEEEPS3_ET0_T_SC_SB_@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZSt16__do_uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN5Exiv29IptcdatumESt6vectorIS3_SaIS3_EEEEPS3_ET0_T_SC_SB_@Base 24.05.1
+ (arch=amd64 arm64 ppc64el)_ZSt19piecewise_construct@Base 24.12.0
  _ZTIN11KExiv2Iface6KExiv2E@Base 24.05.1
- (optional=templinst)_ZTIN5Exiv29ValueTypeIjEE@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZTIN5Exiv29ValueTypeIjEE@Base 24.05.1
  _ZTSN11KExiv2Iface6KExiv2E@Base 24.05.1
  (optional=templinst)_ZTSN5Exiv29ValueTypeIjEE@Base 24.05.1
  _ZTVN11KExiv2Iface6KExiv2E@Base 24.05.1
- (optional=templinst)_ZTVN5Exiv29ValueTypeIjEE@Base 24.05.1
+ (optional=templinst|arch=armhf riscv64)_ZTVN5Exiv29ValueTypeIjEE@Base 24.05.1
diff -pruN 25.04.0-1/src/CMakeLists.txt 25.08.1-0ubuntu1/src/CMakeLists.txt
--- 25.04.0-1/src/CMakeLists.txt	2025-02-12 15:38:22.000000000 +0000
+++ 25.08.1-0ubuntu1/src/CMakeLists.txt	2025-07-21 10:19:47.000000000 +0000
@@ -27,7 +27,7 @@ ecm_setup_version(${libkexiv2_VERSION}
 
 kde_enable_exceptions()
 
-add_library(KExiv2 SHARED)
+add_library(KExiv2)
 
 set_target_properties(KExiv2  PROPERTIES
     OUTPUT_NAME KF${QT_MAJOR_VERSION}KExiv2
