Bug#1077069: openqa: Use the Changelog from Debian

[Roland Clobus]

Package: openqa
Version: 4.6.1712926289.b0d689b52-2
Severity: minor
Tags: patch

Hello Phil,



It will break one test: 'get current version' in t/16-utils.t



With kind regards,
Roland

diff --git a/debian/openqa.install b/debian/openqa.install
index 331690f02..12f2a465d 100755
--- a/debian/openqa.install
+++ b/debian/openqa.install
@@ -38,6 +38,7 @@ usr/share/openqa/lib/OpenQA/WebAPI/
 usr/share/openqa/lib/OpenQA/WebSockets/
 usr/share/openqa/templates
 usr/share/openqa/public
+debian/changelog => usr/share/openqa/public/Changelog
 usr/share/openqa/assets
 usr/share/openqa/dbicdh
 usr/share/openqa/node_modules/anser/lib/index.js
diff --git a/lib/OpenQA/Utils.pm b/lib/OpenQA/Utils.pm
index 401e9ffa9..23aa29010 100644
--- a/lib/OpenQA/Utils.pm
+++ b/lib/OpenQA/Utils.pm
@@ -725,7 +725,7 @@ sub detect_current_version {
 
     if (-e $changelog_file) {
         my $changelog = $changelog_file->slurp;
-        if ($changelog && $changelog =~ /Update to version (\d+\.\d+\.\d+\.(\b[0-9a-f]{5,40}\b))\:/mi) {
+        if ($changelog && $changelog =~ /^openqa \(([^)]+)/mi) {
             $current_version = $1;
         }
     }

with this patch, openQA shows the Debian version and the Debian changelog in the footer, and on the page 'Changelog' in the Administrators menu. I could not write a patch file for debian/patches, even the first patch did not apply cleanly.

OpenPGP_signature.asc
Description: OpenPGP digital signature