diff -pruN 6.20.0-1/debian/changelog 6.20.0-0ubuntu1/debian/changelog
--- 6.20.0-1/debian/changelog	2025-11-15 18:24:09.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/changelog	2025-11-13 16:17:23.000000000 +0000
@@ -1,72 +1,82 @@
-kf6-syntax-highlighting (6.20.0-1) unstable; urgency=medium
+kf6-syntax-highlighting (6.20.0-0ubuntu1) resolute; urgency=medium
 
-  [ Aurélien COUDERC ]
-  * New upstream release (6.20.0).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (6.20.0)
 
- -- Aurélien COUDERC <coucouf@debian.org>  Sat, 15 Nov 2025 19:24:09 +0100
+ -- Rik Mills <rikmills@kde.org>  Thu, 13 Nov 2025 16:17:23 +0000
 
-kf6-syntax-highlighting (6.18.0-1) unstable; urgency=medium
+kf6-syntax-highlighting (6.19.0-0ubuntu1) resolute; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (6.18.0).
-  * Update build-deps and deps with the info from cmake.
-  * Update list of installed files.
+  * New upstream release (6.18.0)
+  * New upstream release (6.19.0)
 
- -- Patrick Franz <deltaone@debian.org>  Tue, 30 Sep 2025 19:15:54 +0200
+ -- Rik Mills <rikmills@kde.org>  Sun, 12 Oct 2025 15:09:10 +0100
 
-kf6-syntax-highlighting (6.13.0-1) unstable; urgency=medium
+kf6-syntax-highlighting (6.17.0-0ubuntu1) questing; urgency=medium
 
-  [ Patrick Franz ]
-  * New upstream release (6.13.0).
-  * Bump Standards-Version to 4.7.2 (No changes needed).
-  * Update build-deps and deps with the info from cmake.
-  * Update d/copyright.
+  * New upstream release (6.17.0)
 
- -- Patrick Franz <deltaone@debian.org>  Sat, 12 Apr 2025 19:34:07 +0200
+ -- Rik Mills <rikmills@kde.org>  Fri, 08 Aug 2025 18:19:52 +0100
 
-kf6-syntax-highlighting (6.11.0-1) unstable; urgency=medium
+kf6-syntax-highlighting (6.16.0-0ubuntu1) questing; urgency=medium
 
-  [ Aurélien COUDERC ]
-  * New upstream release (6.11.0).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (6.16.0)
 
- -- Aurélien COUDERC <coucouf@debian.org>  Sat, 15 Feb 2025 17:00:05 +0100
+ -- Rik Mills <rikmills@kde.org>  Fri, 11 Jul 2025 16:50:01 +0100
 
-kf6-syntax-highlighting (6.10.0-2) unstable; urgency=medium
+kf6-syntax-highlighting (6.15.0-0ubuntu1) questing; urgency=medium
 
-  [ Patrick Franz ]
-  * Fix FTCBFS: Missing B-D on native libraries used by
-    native_katehighlightingindexer, thx to Helmut Grohne (Closes:
-    #1095181).
+  * New upstream release (6.15.0)
+  * Comment out .install for docs packages for now, as the qch docs are
+    currently not buildable in Ubuntu.
 
- -- Patrick Franz <deltaone@debian.org>  Sat, 08 Feb 2025 19:13:28 +0100
+ -- Rik Mills <rikmills@kde.org>  Fri, 13 Jun 2025 16:37:07 +0100
 
-kf6-syntax-highlighting (6.10.0-1) unstable; urgency=medium
+kf6-syntax-highlighting (6.14.0-0ubuntu1) questing; urgency=medium
 
-  [ Aurélien COUDERC ]
-  * New upstream release (6.9.0).
-  * Update build-deps and deps with the info from cmake.
-  * New upstream release (6.10.0).
-  * Update build-deps and deps with the info from cmake.
+  * New upstream release (6.14.0)
 
- -- Aurélien COUDERC <coucouf@debian.org>  Fri, 10 Jan 2025 23:23:56 +0100
+ -- Rik Mills <rikmills@kde.org>  Sat, 10 May 2025 07:02:22 +0100
 
-kf6-syntax-highlighting (6.8.0-1) unstable; urgency=medium
+kf6-syntax-highlighting (6.12.0-0ubuntu1) plucky; urgency=medium
 
-  [ Aurélien COUDERC ]
-  * New upstream release (6.8.0).
-  * Update build-deps and deps with the info from cmake.
-  * Release to unstable.
+  * New upstream release (6.12.0)
 
- -- Aurélien COUDERC <coucouf@debian.org>  Wed, 04 Dec 2024 12:01:26 +0100
+ -- Rik Mills <rikmills@kde.org>  Tue, 18 Mar 2025 10:56:40 +0000
 
-kf6-syntax-highlighting (6.7.0-1) experimental; urgency=medium
+kf6-syntax-highlighting (6.11.0-0ubuntu1) plucky; urgency=medium
 
-  * Team upload.
-  * New upstream release.
+  * New upstream release (6.11.0)
+
+ -- Rik Mills <rikmills@kde.org>  Fri, 14 Feb 2025 16:51:40 +0000
+
+kf6-syntax-highlighting (6.10.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release (6.10.0)
+  * Disable acc test for now.
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 09 Jan 2025 12:22:57 +0000
+
+kf6-syntax-highlighting (6.9.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release (6.9.0)
 
- -- Simon Quigley <tsimonq2@debian.org>  Sun, 03 Nov 2024 19:29:29 -0600
+ -- Rik Mills <rikmills@kde.org>  Fri, 13 Dec 2024 14:50:51 +0000
+
+kf6-syntax-highlighting (6.8.0-0ubuntu2) plucky; urgency=medium
+
+  * Merge changes from 6.6.0-2 in Debian unstable.
+    - Use dh_qmldeps to detect QML dependencies.
+    - Add qml6-module packages to -dev package for QML dependency
+      detection.
+
+ -- Rik Mills <rikmills@kde.org>  Sun, 01 Dec 2024 13:57:41 +0000
+
+kf6-syntax-highlighting (6.8.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release (6.7.0)
+  * New upstream release (6.8.0)
+
+ -- Rik Mills <rikmills@kde.org>  Fri, 08 Nov 2024 16:40:17 +0000
 
 kf6-syntax-highlighting (6.6.0-2) unstable; urgency=medium
 
@@ -85,6 +95,19 @@ kf6-syntax-highlighting (6.6.0-1) unstab
 
  -- Aurélien COUDERC <coucouf@debian.org>  Fri, 06 Sep 2024 23:09:21 +0200
 
+kf6-syntax-highlighting (6.6.0-0ubuntu2) oracular; urgency=medium
+
+  * Fix last upload with updates lost in git my merge.
+    - Refresh symbols all arches.
+
+ -- Rik Mills <rikmills@kde.org>  Sat, 21 Sep 2024 17:58:28 +0100
+
+kf6-syntax-highlighting (6.6.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release (6.6.0)
+
+ -- Scarlett Moore <sgmoore@debian.org>  Fri, 20 Sep 2024 19:09:54 +0100
+
 kf6-syntax-highlighting (6.5.0-2) unstable; urgency=medium
 
   * Team upload.
@@ -106,6 +129,13 @@ kf6-syntax-highlighting (6.5.0-1) unstab
 
  -- Aurélien COUDERC <coucouf@debian.org>  Sat, 10 Aug 2024 23:22:02 +0200
 
+kf6-syntax-highlighting (6.5.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release (6.5.0)
+  * Mark a symbol optional.
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 13 Aug 2024 19:25:48 +0100
+
 kf6-syntax-highlighting (6.4.0-1) experimental; urgency=medium
 
   [ Aurélien COUDERC ]
@@ -114,6 +144,14 @@ kf6-syntax-highlighting (6.4.0-1) experi
 
  -- Aurélien COUDERC <coucouf@debian.org>  Fri, 19 Jul 2024 09:24:21 +0200
 
+kf6-syntax-highlighting (6.4.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release (6.4.0)
+  * Pass gcc option -std=c++17 to acc autopkgtests
+  * Update symbols
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Sat, 13 Jul 2024 16:37:08 +0100
+
 kf6-syntax-highlighting (6.3.0-1) experimental; urgency=medium
 
   [ Patrick Franz ]
diff -pruN 6.20.0-1/debian/control 6.20.0-0ubuntu1/debian/control
--- 6.20.0-1/debian/control	2025-11-15 18:24:08.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/control	2025-11-13 16:17:23.000000000 +0000
@@ -1,29 +1,28 @@
 Source: kf6-syntax-highlighting
 Section: libs
 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>,
            Patrick Franz <deltaone@debian.org>,
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: cmake (>= 3.16~),
+               debhelper-compat (= 13),
                dh-sequence-kf6,
                dh-sequence-pkgkde-symbolshelper,
                dh-sequence-qmldeps,
-               cmake (>= 3.16~),
                doxygen,
                extra-cmake-modules (>= 6.20.0~),
                libxerces-c-dev,
                libxkbcommon-dev,
                perl:any,
                pkgconf,
-               qt6-base-dev (>= 6.8.0~),
-               qt6-base-dev:native (>= 6.8.0~),
-               qt6-declarative-dev (>= 6.8.0~),
-               qt6-tools-dev (>= 6.5.0~),
-               qt6-tools-dev:native,
-Standards-Version: 4.7.2
+               qt6-base-dev (>= 6.8.0+dfsg~),
+               qt6-declarative-dev (>= 6.8.0+dfsg~),
+               qt6-tools-dev (>= 6.8.0~),
+Standards-Version: 4.7.0
 Homepage: https://invent.kde.org/frameworks/syntax-highlighting
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kf6-syntax-highlighting
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kf6-syntax-highlighting.git
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kf6-syntax-highlighting
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kf6-syntax-highlighting
 Rules-Requires-Root: no
 
 Package: libkf6syntaxhighlighting-data
@@ -45,8 +44,8 @@ Section: libdevel
 Architecture: any
 Depends: libkf6syntaxhighlighting6 (= ${binary:Version}),
          qml6-module-org-kde-syntaxhighlighting (= ${binary:Version}),
-         qt6-base-dev (>= 6.8.0~),
-         qt6-declarative-dev (>= 6.8.0~),
+         qt6-base-dev (>= 6.8.0+dfsg~),
+         qt6-declarative-dev (>= 6.8.0+dfsg~),
          ${misc:Depends},
 Recommends: libkf6syntaxhighlighting-doc (= ${source:Version}),
 Multi-Arch: same
diff -pruN 6.20.0-1/debian/copyright 6.20.0-0ubuntu1/debian/copyright
--- 6.20.0-1/debian/copyright	2025-08-27 20:59:24.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/copyright	2025-11-13 16:17:23.000000000 +0000
@@ -850,7 +850,10 @@ License: GPL-2.0-only
  General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. Also add information on how to contact you by
+ electronic and paper mail.
  .
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in
@@ -868,7 +871,10 @@ License: GPL-2.0-or-later
  General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. Also add information on how to contact you by
+ electronic and paper mail.
  .
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in
@@ -921,7 +927,9 @@ License: LGPL-2.0-only
  Library General Public License for more details.
  .
  You should have received a copy of the GNU Library General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
  .
  On Debian systems, the complete text of the GNU Library General
  Public License version 2 can be found in
@@ -939,7 +947,9 @@ License: LGPL-2.0-or-later
  Library General Public License for more details.
  .
  You should have received a copy of the GNU Library General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
  .
  On Debian systems, the complete text of the GNU Library General
  Public License version 2 can be found in
@@ -981,7 +991,10 @@ License: LGPL-2.1-or-later
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301  USA Also add information on how to contact you by
+ electronic and paper mail.
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 2.1 can be found in
diff -pruN 6.20.0-1/debian/libkf6syntaxhighlighting-dev.acc.in 6.20.0-0ubuntu1/debian/libkf6syntaxhighlighting-dev.acc.in
--- 6.20.0-1/debian/libkf6syntaxhighlighting-dev.acc.in	2024-12-04 09:26:34.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/libkf6syntaxhighlighting-dev.acc.in	2025-11-13 16:17:23.000000000 +0000
@@ -16,6 +16,7 @@
 <gcc_options>
     -fPIC
     -std=c++17
+    -I/usr/lib/@@DEB_HOST_MULTIARCH@@/qt6/mkspecs/linux-lsb-g++
 </gcc_options>
 
 </descriptor>
diff -pruN 6.20.0-1/debian/libkf6syntaxhighlighting6.symbols 6.20.0-0ubuntu1/debian/libkf6syntaxhighlighting6.symbols
--- 6.20.0-1/debian/libkf6syntaxhighlighting6.symbols	2024-12-04 09:26:34.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/libkf6syntaxhighlighting6.symbols	2025-11-13 16:17:23.000000000 +0000
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 6.6.0 amd64
+# SymbolsHelper-Confirmed: 6.6.0 amd64 arm64 armhf ppc64el riscv64 s390x
 libKF6SyntaxHighlighting.so.6 libkf6syntaxhighlighting6 #MINVER#
 * Build-Depends-Package: libkf6syntaxhighlighting-dev
  _ZGVZN9QMetaType21registerConverterImplI5QListIN19KSyntaxHighlighting10DefinitionEE9QIterableI13QMetaSequenceEEEbSt8functionIFbPKvPvEES_S_E10unregister@Base 6.0.0
@@ -212,8 +212,8 @@ libKF6SyntaxHighlighting.so.6 libkf6synt
  _ZNK19KSyntaxHighlighting6Format8isItalicERKNS_5ThemeE@Base 6.0.0
  _ZNK19KSyntaxHighlighting6Format9textColorERKNS_5ThemeE@Base 6.0.0
  _ZNK19KSyntaxHighlighting6Format9textStyleEv@Base 6.0.0
- (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_N19KSyntaxHighlighting10DefinitionEESt10_Select1stIS5_ESt4lessIS0_ESaIS5_EE24_M_get_insert_unique_posERS2_@Base 6.0.0
- (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_N19KSyntaxHighlighting10DefinitionEESt10_Select1stIS5_ESt4lessIS0_ESaIS5_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS5_ERS2_@Base 6.0.0
+ (optional=templinst|arch=armhf riscv64)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_N19KSyntaxHighlighting10DefinitionEESt10_Select1stIS5_ESt4lessIS0_ESaIS5_EE24_M_get_insert_unique_posERS2_@Base 6.0.0
+ (optional=templinst|arch=armhf riscv64)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_N19KSyntaxHighlighting10DefinitionEESt10_Select1stIS5_ESt4lessIS0_ESaIS5_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS5_ERS2_@Base 6.0.0
  _ZTIN19KSyntaxHighlighting10RepositoryE@Base 6.0.0
  _ZTIN19KSyntaxHighlighting15AnsiHighlighterE@Base 6.0.0
  _ZTIN19KSyntaxHighlighting15HtmlHighlighterE@Base 6.0.0
@@ -225,7 +225,7 @@ libKF6SyntaxHighlighting.so.6 libkf6synt
  (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.0
  (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.0.0
  (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.0.0
- (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 6.0.0
+ (optional|arch=amd64 armhf)_ZTISt19_Sp_make_shared_tag@Base 6.4.0
  _ZTIZN9QMetaType17registerConverterI5QListIN19KSyntaxHighlighting10DefinitionEE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS4_EEEEbT1_EUlPKvPvE_@Base 6.0.0
  _ZTIZN9QMetaType17registerConverterI5QListIN19KSyntaxHighlighting5ThemeEE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS4_EEEEbT1_EUlPKvPvE_@Base 6.0.0
  _ZTIZN9QMetaType19registerMutableViewI5QListIN19KSyntaxHighlighting10DefinitionEE9QIterableI13QMetaSequenceEN9QtPrivate37QSequentialIterableMutableViewFunctorIS4_EEEEbT1_EUlPvSC_E_@Base 6.0.0
diff -pruN 6.20.0-1/debian/rules 6.20.0-0ubuntu1/debian/rules
--- 6.20.0-1/debian/rules	2024-12-04 09:26:34.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/rules	2025-11-13 16:17:23.000000000 +0000
@@ -3,7 +3,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-archs_that_need_atomic = armel m68k powerpc sh4
+archs_that_need_atomic = armel m68k mipsel powerpc sh4
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic)))
 	export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
@@ -13,3 +13,5 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DBUILD_QCH=ON
+
+override_dh_auto_test:
diff -pruN 6.20.0-1/debian/tests/control 6.20.0-0ubuntu1/debian/tests/control
--- 6.20.0-1/debian/tests/control	2024-04-13 15:27:44.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-Tests: acc
-Depends: dh-acc, exuberant-ctags, @
-Restrictions: allow-stderr
diff -pruN 6.20.0-1/debian/tests/control.disable 6.20.0-0ubuntu1/debian/tests/control.disable
--- 6.20.0-1/debian/tests/control.disable	1970-01-01 00:00:00.000000000 +0000
+++ 6.20.0-0ubuntu1/debian/tests/control.disable	2025-11-13 16:17:23.000000000 +0000
@@ -0,0 +1,3 @@
+Tests: acc
+Depends: dh-acc, exuberant-ctags, @
+Restrictions: allow-stderr
