diff --git a/.gitignore b/.gitignore index 894b69e..74ada3d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ build /src/version.h # for package files -lpac-*.deb +lpac_*.deb lpac-*.zip # for clion ignores diff --git a/CMakeLists.txt b/CMakeLists.txt index 568bad9..8c26512 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,8 @@ if(CPACK_GENERATOR) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "eSTK.me Group") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6") set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libcurl, libpcsclite, pcscd") + + set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) set(CPACK_RPM_PACKAGE_LICENSE "AGPL-3.0-only AND LGPL-2.0-only") set(CPACK_RPM_PACKAGE_AUTOREQ "yes") diff --git a/scripts/build.sh b/scripts/build.sh index 9cdea24..1c1f504 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -59,7 +59,7 @@ make) debian) cmake "$WORKSPACE" -DCPACK_GENERATOR=DEB make -j package - cp lpac-*.deb "$WORKSPACE" + cp lpac_*.deb "$WORKSPACE" ;; mingw) cmake "$WORKSPACE" -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64.cmake diff --git a/scripts/setup-debian.sh b/scripts/setup-debian.sh index 305051a..c29f1c4 100755 --- a/scripts/setup-debian.sh +++ b/scripts/setup-debian.sh @@ -1,4 +1,4 @@ #!/bin/bash set -xeuo pipefail sudo apt-get update -sudo apt-get install -y build-essential libpcsclite-dev libcurl4-openssl-dev gcc-mingw-w64 g++-mingw-w64 +sudo apt-get install -y build-essential libpcsclite-dev libcurl4-openssl-dev gcc-mingw-w64 g++-mingw-w64 zip