Add 02_add_debian_pkg_version.patch to provide better version ID to upstream

diff --git a/debian/patches/02_add_debian_pkg_version.patch b/debian/patches/02_add_debian_pkg_version.patch
new file mode 100644 (file)
index 0000000..7cbe581
--- /dev/null
+++ b/debian/patches/02_add_debian_pkg_version.patch
@@ -0,0 +1,21 @@
+From: Ryan Pavlik <ryan.pavlik@collabora.com>
+Date: Tue, 19 Jan 2021 13:51:09 -0600
+Subject: Add debian package version to ver string
+
+---
+ src/config.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config.h.in b/src/config.h.in
+index 144c46d..b129808 100644
+--- a/src/config.h.in
++++ b/src/config.h.in
+@@ -1,7 +1,7 @@
+ #ifndef SOLVESPACE_CONFIG_H
+ #define SOLVESPACE_CONFIG_H
+ 
+-#define PACKAGE_VERSION "@solvespace_VERSION_MAJOR@.@solvespace_VERSION_MINOR@~@solvespace_GIT_HASH@"
++#define PACKAGE_VERSION "@solvespace_VERSION_MAJOR@.@solvespace_VERSION_MINOR@ (Debian package version @DEBVERSION@)"
+ 
+ /* Non-OS X *nix only */
+ #define UNIX_DATADIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/solvespace"

diff --git a/debian/patches/series b/debian/patches/series
index 7cde63c3605f4ecefc110394ada357522e86ad59..5990c3edda1a53144a30fb2f43edd0bce52f24b9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 01_RemoveGitHash.patch
+02_add_debian_pkg_version.patch
+
 10_mimalloc_restrict_cpu_yield.patch