From 5844588a3a6acc261e480bcbeb2edda99e8232d7 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 19 Jan 2021 13:59:17 -0600 Subject: [PATCH] Add 02_add_debian_pkg_version.patch to provide better version ID to upstream --- .../patches/02_add_debian_pkg_version.patch | 21 +++++++++++++++++++ debian/patches/series | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 debian/patches/02_add_debian_pkg_version.patch diff --git a/debian/patches/02_add_debian_pkg_version.patch b/debian/patches/02_add_debian_pkg_version.patch new file mode 100644 index 0000000..7cbe581 --- /dev/null +++ b/debian/patches/02_add_debian_pkg_version.patch @@ -0,0 +1,21 @@ +From: Ryan Pavlik +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 7cde63c..5990c3e 100644 --- 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 -- 2.30.2