1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
|
From: mirabilos <tg@debian.org>
Date: Mon, 28 Nov 2022 11:27:14 +0800
Subject: Add Debian-specific version information
Forwarded: not applicable
---
Jamulus.pro | 2 ++
src/util.cpp | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Jamulus.pro b/Jamulus.pro
index 44fc0d1..58a647f 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -355,6 +355,8 @@ win32 {
}
}
+DEFINES += "PACKAGED_VERSION=\"\\\"$$system(dpkg-parsechangelog -SVersion) ($$system(dpkg-vendor --query Vendor)/$$system(dpkg-architecture -qDEB_HOST_ARCH))\\\"\""
+
RCC_DIR = src/res
RESOURCES += src/resources.qrc
diff --git a/src/util.cpp b/src/util.cpp
index b4ec0a3..d52b52b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1605,7 +1605,10 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui )
strVersionText += " *** ";
}
- strVersionText += QCoreApplication::tr ( "%1, Version %2", "%1 is app name, %2 is version number" ).arg ( APP_NAME ).arg ( VERSION );
+#ifndef PACKAGED_VERSION
+#define PACKAGED_VERSION VERSION
+#endif
+ strVersionText += APP_NAME + QCoreApplication::tr ( ", Version " ) + PACKAGED_VERSION;
if ( bDisplayInGui )
{
|