[neon/qt/qtwebengine/Neon/release_jammy] debian: Fix debian/rules to handle dfsg repack counts.

[Soren Stoutner]

Git commit 56d9dc7171e2e298fc94fab9b05d670c851b3ea5 by Soren Stoutner.
Committed on 09/05/2024 at 20:10.
Pushed by jriddell into branch 'Neon/release_jammy'.

Fix debian/rules to handle dfsg repack counts.

M  +3    -2    debian/changelog
M  +5    -4    debian/rules

https://invent.kde.org/neon/qt/qtwebengine/-/commit/56d9dc7171e2e298fc94fab9b05d670c851b3ea5

diff --git a/debian/changelog b/debian/changelog
index 08fc89b..da6bcff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-qtwebengine-opensource-src (5.15.15+dfsg-4) UNRELEASED; urgency=medium
+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
@@ -20,7 +21,7 @@ qtwebengine-opensource-src (5.15.15+dfsg-4) UNRELEASED; urgency=medium
     Thanks Zixing Liu!
   * Update bundled six module for Python 3.12 compatibility (LP: #2058117).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 07 May 2024 16:40:19 -0700
+ -- 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
 
diff --git a/debian/rules b/debian/rules
index a5319d8..a6a3eae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,7 @@ override_dh_auto_configure:
 		touch $(CURDIR)/$${fname}; \
 	done
 
-	/usr/lib/qt5/bin/syncqt.pl Source -version ${DEB_VERSION_UPSTREAM:+dfsg=}
+	/usr/lib/qt5/bin/syncqt.pl Source -version $(word 1,$(subst +, ,$(DEB_VERSION_UPSTREAM)))
 
 	# Link against the system version of dagre-layout.  The bundled version was removed by debian/copyright.
 	mkdir -p src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout
@@ -120,7 +120,7 @@ override_dh_auto_install-arch:
 
 	# Do not require matching versions of Qt dependencies
 	set -eu && \
-	VERSION=${DEB_VERSION_UPSTREAM:+dfsg=} && \
+	VERSION=$(word 1,$(subst +, ,$(DEB_VERSION_UPSTREAM))) && \
 	QT_VERSION=$$(qmake -query QT_VERSION) && \
 	sed -i "s/$$VERSION /$$QT_VERSION /" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/*/*Config.cmake
 
@@ -158,7 +158,8 @@ endef
 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 && \
 	echo "$${GET_FILES_EXCLUDED}" >$${TEMPDIR}/get_files_excluded.py && \
 	cd $${TEMPDIR} && \
@@ -173,5 +174,5 @@ get-orig-source:
 	cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules && \
 	ls -A | grep -Ev '^(@types|rollup|typescript)$$' | xargs rm -rf && \
 	cd $${TEMPDIR} && \
-	tar cJ --owner=root --group=root --sort=name -f $(CURDIR)/../qtwebengine-opensource-src_$${VERSION}+dfsg.orig.tar.xz qtwebengine-$${VERSION}-lts && \
+	tar cJ --owner=root --group=root --sort=name -f $(CURDIR)/../qtwebengine-opensource-src_$${VERSION}+$${DFSG}.orig.tar.xz qtwebengine-$${VERSION}-lts && \
 	rm -rf $${TEMPDIR}