From a9d178ea0be2b690ce3c50d30dfb812d0e00f1ad Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Fri, 19 Jun 2020 12:17:14 +0100 Subject: [PATCH] another attempt to solve dpkg-deb invalid characters in version problem --- buildScripts/createDebianPackage | 2 +- buildScripts/versionEnvs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buildScripts/createDebianPackage b/buildScripts/createDebianPackage index 499d7aa..1dbff39 100755 --- a/buildScripts/createDebianPackage +++ b/buildScripts/createDebianPackage @@ -67,7 +67,7 @@ find $DEBDIR -type f | xargs md5sum > $md5sumsFile # Accumulate the control file information # -versionValue=$PDF2HTMLEX_VERSION-$PDF2HTMLEX_BRANCH-$BUILD_DIST-$BUILD_TIME +versionValue=$PDF2HTMLEX_VERSION.$PDF2HTMLEX_BRANCH.$BUILD_DIST.$BUILD_DATE architectureValue=$(dpkg-architecture -q DEB_BUILD_ARCH_CPU) maintainerValue="$(git config --get user.name) <$(git config --get user.email)>" diff --git a/buildScripts/versionEnvs b/buildScripts/versionEnvs index f5ad0fa..d8c1da6 100755 --- a/buildScripts/versionEnvs +++ b/buildScripts/versionEnvs @@ -6,7 +6,7 @@ # see: https://poppler.freedesktop.org/releases.html # current working: 0.83.0 -export PDF2HTMLEX_VERSION=v0.18.8-alpha +export PDF2HTMLEX_VERSION=0.18.8.alpha export POPPLER_VERSION=poppler-0.89.0 #export POPPLER_VERSION=poppler-0.88.0 @@ -48,6 +48,8 @@ source /etc/lsb-release export BUILD_DIST=$DISTRIB_CODENAME +export BUILD_DATE="$(date +%Y%m%d)" + export BUILD_TIME="$(date +%Y_%m_%d-%H_%M_%S)" export MACHINE_ARCH="$(uname -m)" @@ -58,5 +60,6 @@ echo "export FONTFORGE_VERSION=\"$FONTFORGE_VERSION\"" >> buildScripts/reSourc echo "export PDF2HTMLEX_BRANCH=\"$PDF2HTMLEX_BRANCH\"" >> buildScripts/reSourceVersionEnvs echo "export MACHINE_ARCH=\"$MACHINE_ARCH\"" >> buildScripts/reSourceVersionEnvs echo "export BUILD_DIST=\"$BUILD_DIST\"" >> buildScripts/reSourceVersionEnvs +echo "export BUILD_DATE=\"$BUILD_DATE\"" >> buildScripts/reSourceVersionEnvs echo "export BUILD_TIME=\"$BUILD_TIME\"" >> buildScripts/reSourceVersionEnvs echo "export PDF2HTMLEX_PREFIX=\"$PDF2HTMLEX_PREFIX\"" >> buildScripts/reSourceVersionEnvs