From d23b0b82c44cf59b8b34d402cbfe24a6faec0719 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 12 Mar 2021 09:55:04 -0800
Subject: [PATCH] GitLab CI: Fix our debian-stable version.

Run tools/make-version.pl in the build:debian-stable job.

Make sure make-version.pl updates debian/control correctly.
---
 .gitlab-ci.yml        |  1 +
 tools/make-version.pl | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b7c13efbb..3d26c16a2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -191,6 +191,7 @@ build:debian-stable:
   extends: .build
   image: wireshark/wireshark-debian-stable-dev
   script:
+    - perl tools/make-version.pl --set-release
     # Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
     # https://gitlab.com/gitlab-com/support-forum/issues/2790
     - export DH_QUIET=1
diff --git a/tools/make-version.pl b/tools/make-version.pl
index c1e0ef01b4..fcccc8cb69 100755
--- a/tools/make-version.pl
+++ b/tools/make-version.pl
@@ -516,12 +516,13 @@ sub update_debian_changelog
 
 	open(CHANGELOG, "< $filepath") || die "Can't read $filepath!";
 	while ($line = <CHANGELOG>) {
-		if ($set_version && CHANGELOG->input_line_number() == 1) {
+		if (CHANGELOG->input_line_number() == 1) {
 			$line =~ /^.*?([\r\n]+)$/;
-			$line = sprintf("wireshark (%d.%d.%d) unstable; urgency=low$1",
+			$line = sprintf("wireshark (%d.%d.%d%s) unstable; urgency=low$1",
 					$version_major,
 					$version_minor,
 					$version_micro,
+					$package_string,
 					);
 		}
 		$contents .= $line
@@ -571,10 +572,10 @@ sub update_versioned_files
 		$version_minor, $version_micro,
 		$package_string;
 	&update_cmakelists_txt;
+	&update_debian_changelog;
 	if ($set_version) {
 		&update_attributes_asciidoc;
 		&update_docinfo_asciidoc;
-		&update_debian_changelog;
 		&update_cmake_lib_releases;
 	}
 }
@@ -723,7 +724,9 @@ sub get_config {
 
 &get_config();
 
-&read_repo_info();
+if (! $set_version) {
+	&read_repo_info();
+}
 
 &print_VCS_REVISION;