From b90fa6221fe82c166f256676842ece173f409188 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Thu, 6 Jul 2023 10:36:35 +0300 Subject: [PATCH] Create gzip compressed packages IB-7782 Signed-off-by: Raul Metsma --- .github/workflows/cmake-linux-ubuntu.yml | 4 ++-- debian/compat | 1 - debian/control | 6 +++--- debian/rules | 9 +++++++-- lib/libelectronic-id | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 debian/compat diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml index 8da3d5ea..4b305de0 100644 --- a/.github/workflows/cmake-linux-ubuntu.yml +++ b/.github/workflows/cmake-linux-ubuntu.yml @@ -26,11 +26,11 @@ jobs: steps: - name: Install dependencies if: matrix.container == 'ubuntu:20.04' - run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev + run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev - name: Install dependencies if: matrix.container != 'ubuntu:20.04' - run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev + run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev - uses: actions/checkout@v3 with: diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 9e0937fe..f5126285 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,15 @@ Section: web Priority: optional Maintainer: RIA Build-Depends: - cdbs, - debhelper (>= 10), + cmake, + debhelper-compat (= 12), libpcsclite-dev, libssl-dev, libgtest-dev, qt6-tools-dev | qttools5-dev, qt6-l10n-tools | qttools5-dev-tools, libqt6svg6-dev | libqt5svg5-dev -Standards-Version: 3.9.8 +Standards-Version: 4.5.1 Homepage: https://github.com/web-eid/web-eid-app Package: web-eid diff --git a/debian/rules b/debian/rules index 9415b886..3d823c9f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,11 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk DEB_CMAKE_EXTRA_FLAGS = \ -DBUNDLE_XPI=ON DEB_MAKE_CHECK_TARGET = test + + +%: + dh $@ + +override_dh_builddeb: + dh_builddeb -- -Zgzip diff --git a/lib/libelectronic-id b/lib/libelectronic-id index fb84aa8c..80a81b4a 160000 --- a/lib/libelectronic-id +++ b/lib/libelectronic-id @@ -1 +1 @@ -Subproject commit fb84aa8cf7ae1073f5472b7093d4df2ed95dc718 +Subproject commit 80a81b4a62666e5542cb20beb29ad2078fb4377f