Git commit 3b81398302950e8b04595a3890497196b77e6ee9 by Dmitry Shachnev.
Committed on 10/05/2024 at 11:54.
Pushed by jriddell into branch 'Neon/release_jammy'.
Merge branch 'master' into experimental
M +27 -11 debian/changelog
M +5 -4 debian/rules
https://invent.kde.org/neon/qt/qtwebengine/-/commit/3b81398302950e8b04595a3890497196b77e6ee9
diff --cc debian/changelog
index f6277e7,b7b94a4..df8955c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,29 +1,66 @@@
+qtwebengine-opensource-src (5.15.16+dfsg-4) UNRELEASED; urgency=medium
+
+ [ Soren Stoutner ]
- * Drop the build depend on libre2-dev, which forces building with the bundled
- RE2 (closes: #1053409).
- * Bump standards version to 4.7.0 (no changes needed).
- * Change my email address from soren at stoutner.com to soren at debian.org in the
- following locations:
- - debian/changelog
- - debian/control
- - debian/copyright
- - debian/patches/fix-example-pro-files.patch
- - debian/patches/system-openjpeg2.patch
- * Add 2024 to my debian/copyright entry.
++ * Merge 5.15.15+dfsg2-1 upload from unstable.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 09 Apr 2024 16:41:57 -0700
+
+qtwebengine-opensource-src (5.15.16+dfsg-3) experimental; urgency=medium
+
+ * Merge 5.15.15+dfsg-3 upload from unstable.
+ * Add upstream patches to stop using imp Python module (LP: #2058066).
+ Thanks Zixing Liu!
+ * Update bundled six module for Python 3.12 compatibility (LP: #2058117).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 29 Mar 2024 16:12:37 +0300
+
+qtwebengine-opensource-src (5.15.16+dfsg-2) experimental; urgency=medium
+
+ * Replace pkg-config build-dependency with pkgconf.
+ * Build against Qt 5.15.13.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 12 Mar 2024 18:00:47 +0300
+
+qtwebengine-opensource-src (5.15.16+dfsg-1) experimental; urgency=medium
+
+ [ Soren Stoutner ]
+ * New upstream release.
+ * Bump ABI version to qtwebengine-abi-5-15-16.
+ * Refresh python3.patch and system-openjpeg2.patch.
+ * Update symbols files.
+
+ [ Dmitry Shachnev ]
+ * Build against Qt 5.15.12.
+ * Add a patch from Gentoo to fix build with ICU 74.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 25 Dec 2023 00:14:27 +0300
+
+ qtwebengine-opensource-src (5.15.15+dfsg2-1) unstable; urgency=medium
+
+ [ Soren Stoutner ]
+ * Drop the build depend on libre2-dev, which forces building with the bundled
+ RE2 (closes: #1053409).
+ * Bump standards version to 4.7.0 (no changes needed).
+ * Fix debian/rules to handle dfsg repack counts.
+ * Change my email address from soren at stoutner.com to soren at debian.org in the
+ following locations:
+ - debian/changelog
+ - debian/control
+ - debian/copyright
+ - debian/patches/fix-example-pro-files.patch
+ - debian/patches/system-openjpeg2.patch
+ * Add 2024 to debian/copyright entries.
+ * Update debian/libqt5webenginecore5.symbols from local build log.
+
+ [ Dmitry Shachnev ]
+ * Add a patch from Gentoo to fix build with ICU 74.
+ * Replace pkg-config build-dependency with pkgconf.
+ * Add upstream patches to stop using imp Python module (LP: #2058066).
+ Thanks Zixing Liu!
+ * Update bundled six module for Python 3.12 compatibility (LP: #2058117).
+
+ -- Soren Stoutner <soren at debian.org> Thu, 09 May 2024 10:01:42 -0700
+
qtwebengine-opensource-src (5.15.15+dfsg-3) unstable; urgency=medium
[ Soren Stoutner ]
diff --cc debian/rules
index 515c578,a6a3eae..0116a2a
--- a/debian/rules
+++ b/debian/rules
@@@ -158,8 -158,9 +158,9 @@@ ende
get-orig-source:
@set -eux && \
TEMPDIR=$$(mktemp -d) && \
- VERSION=${DEB_VERSION_UPSTREAM:+dfsg=} && \
+ VERSION=$(word 1,$(subst +, ,$(DEB_VERSION_UPSTREAM))) && \
+ DFSG=$(word 2,$(subst +, ,$(DEB_VERSION_UPSTREAM))) && \
- SUBMODULE_COMMIT=8df91f886e7fffb61408e2426f8a90d763a3b6ea && \
+ SUBMODULE_COMMIT=207c2ac45ca3386d153770c6b0d2ea2ec21ca880 && \
echo "$${GET_FILES_EXCLUDED}" >$${TEMPDIR}/get_files_excluded.py && \
cd $${TEMPDIR} && \
wget https://github.com/qt/qtwebengine/archive/v$${VERSION}-lts.tar.gz && \