diff --git a/buildScripts/buildInstallLocallyApt b/buildScripts/buildInstallLocallyApt index 7aa5e70..6f023f7 100755 --- a/buildScripts/buildInstallLocallyApt +++ b/buildScripts/buildInstallLocallyApt @@ -10,8 +10,8 @@ export MAKE_PARALLEL="-j $(nproc)" # choose one of the following... # -export PDF2HTMLEX_BRANCH=update-poppler -# export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" +# export PDF2HTMLEX_BRANCH=<> +export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # The following environment variable determines where the poppler, # poppler-data, fontforge and pdf2htmlEX packages are installed. diff --git a/buildScripts/createDebianPackage b/buildScripts/createDebianPackage index 13546d3..47f72a3 100755 --- a/buildScripts/createDebianPackage +++ b/buildScripts/createDebianPackage @@ -10,7 +10,9 @@ echo "CREATING pdf2htmlEX (binary) Debian package" echo "-------------------------------------------------------------------" echo "" -export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$MACHINE_ARCH-$(lsb_release -cs).deb" +source /etc/lsb-release + +export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$MACHINE_ARCH-$DISTRIB_CODENAME.deb" echo "export DPKG_NAME=\"$DPKG_NAME\"" >> buildScripts/reSourceVersionEnvs @@ -66,7 +68,6 @@ find $DEBDIR -type f | xargs md5sum > $md5sumsFile # Accumulate the control file information # versionValue=$(git describe --abbrev=0) -releaseValue=$(lsb_release -cs) architectureValue=$(dpkg-architecture -q DEB_BUILD_ARCH_CPU) maintainerValue="$(git config --get user.name) <$(git config --get user.email)>" @@ -74,7 +75,7 @@ maintainerValue="$(git config --get user.name) <$(git config --get user.email)>" # echo "Package: pdf2htmlEX" > $controlFile echo "Version: 0:0.$versionValue-0" >> $controlFile -echo "Distribution: $releaseValue" >> $controlFile +echo "Distribution: $DISTRIB_CODENAME" >> $controlFile echo "Architecture: $architectureValue" >> $controlFile echo "Section: universe/web" >> $controlFile echo "Priority: optional" >> $controlFile diff --git a/buildScripts/getBuildToolsApt b/buildScripts/getBuildToolsApt index 6d14b84..5295f60 100755 --- a/buildScripts/getBuildToolsApt +++ b/buildScripts/getBuildToolsApt @@ -25,6 +25,7 @@ sudo apt-get $UNATTENDED install \ gcc \ g++ \ dpkg \ + dpkg-dev \ gettext \ openjdk-8-jre-headless \ jq \