From 37b9386b0c235375ea7c1035090331c0493a8ca2 Mon Sep 17 00:00:00 2001
From: Slávek Banko <slavek.banko@axis.cz>
Date: Sun, 28 Sep 2025 11:48:21 +0200
Subject: DEB tde-cmake: Allow unusual CMake package version prefix.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This solves the situation where Debian was forced to return
to the older CMake version, but due to the continuity of the
versions it was necessary to use an unusual prefix.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 .../dependencies/tde-cmake/debian/cdbs/cmake-versions.pl     | 12 ++++++++----
 dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl   | 12 ++++++++----
 .../dependencies/tde-cmake/debian/cdbs/cmake-versions.pl     | 12 ++++++++----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
index 6bbbec325..ded0cfa99 100644
--- a/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
+++ b/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
@@ -3,17 +3,21 @@
 use strict;
 use warnings;
 
+# Get real cmake version and package version prefix
 my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`;
+my $packageversion = `dpkg-query -W -f='\${Version}' cmake`;
+my ($prefix);
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
+($prefix = $packageversion) =~ s/$version.*//;
 ($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "CMake-Version3=$version3\n";
-print "CMake-Version2=$version2\n";
-print "CMake-Next-Version3=$version3_next\n";
-print "CMake-Next-Version2=$version2_next\n";
+print "CMake-Version3=$prefix$version3\n";
+print "CMake-Version2=$prefix$version2\n";
+print "CMake-Next-Version3=$prefix$version3_next\n";
+print "CMake-Next-Version2=$prefix$version2_next\n";
diff --git a/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
index 6bbbec325..ded0cfa99 100644
--- a/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
+++ b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
@@ -3,17 +3,21 @@
 use strict;
 use warnings;
 
+# Get real cmake version and package version prefix
 my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`;
+my $packageversion = `dpkg-query -W -f='\${Version}' cmake`;
+my ($prefix);
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
+($prefix = $packageversion) =~ s/$version.*//;
 ($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "CMake-Version3=$version3\n";
-print "CMake-Version2=$version2\n";
-print "CMake-Next-Version3=$version3_next\n";
-print "CMake-Next-Version2=$version2_next\n";
+print "CMake-Version3=$prefix$version3\n";
+print "CMake-Version2=$prefix$version2\n";
+print "CMake-Next-Version3=$prefix$version3_next\n";
+print "CMake-Next-Version2=$prefix$version2_next\n";
diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
index 6bbbec325..ded0cfa99 100644
--- a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
+++ b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl
@@ -3,17 +3,21 @@
 use strict;
 use warnings;
 
+# Get real cmake version and package version prefix
 my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`;
+my $packageversion = `dpkg-query -W -f='\${Version}' cmake`;
+my ($prefix);
 my ($version3, $version3_next);
 my ($version2, $version2_next);
 
+($prefix = $packageversion) =~ s/$version.*//;
 ($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
 ($version2 = $version3) =~ s/\.[^.]+$//;
 
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "CMake-Version3=$version3\n";
-print "CMake-Version2=$version2\n";
-print "CMake-Next-Version3=$version3_next\n";
-print "CMake-Next-Version2=$version2_next\n";
+print "CMake-Version3=$prefix$version3\n";
+print "CMake-Version2=$prefix$version2\n";
+print "CMake-Next-Version3=$prefix$version3_next\n";
+print "CMake-Next-Version2=$prefix$version2_next\n";
-- 
cgit v1.2.3