Skip to content

Commit

Permalink
Create gzip compressed packages (#544)
Browse files Browse the repository at this point in the history
IB-7782

Signed-off-by: Raul Metsma <raul@metsma.ee>
  • Loading branch information
metsma authored Sep 22, 2023
1 parent 0507016 commit f20adfc
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
DEBEMAIL: github-actions@github.com
steps:
- name: Install dependencies
run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs debhelper cmake xxd xsdcxx libxml-security-c-dev zlib1g-dev doxygen swig openjdk-8-jdk-headless libpython3-dev python3-distutils libboost-test-dev lintian
run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper cmake xxd xsdcxx libxml-security-c-dev zlib1g-dev doxygen swig openjdk-8-jdk-headless libpython3-dev python3-distutils libboost-test-dev lintian
- name: Checkout
uses: actions/checkout@v3
with:
Expand Down
1 change: 0 additions & 1 deletion debian/compat

This file was deleted.

8 changes: 4 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ Section: libs
Priority: optional
Maintainer: RIA <info@ria.ee>
Build-Depends:
cdbs,
debhelper-compat (= 12),
cmake,
libxml-security-c-dev,
xsdcxx (>= 4.0) | xsd (>= 4.0),
xxd,
doxygen,
swig,
java8-sdk-headless,
libpython3-dev,
python3-distutils
Standards-Version: 3.9.8
Standards-Version: 4.5.1
Homepage: https://github.com/open-eid/libdigidocpp

Package: libdigidocpp-common
Expand Down Expand Up @@ -67,8 +68,7 @@ Architecture: any
Section: libdevel
Depends:
libdigidocpp1 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
${misc:Depends}
Description: DigiDoc digital signature library development files
This package contains files necessary for developing applications with the
DigiDoc digital signature library.
Expand Down
14 changes: 9 additions & 5 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -1,7 +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 = \
-DCMAKE_INSTALL_SYSCONFDIR="/etc" \
-DCMAKE_INSTALL_LIBDIR="lib/$(DEB_HOST_MULTIARCH)"
DEB_MAKE_CHECK_TARGET = test

%:
dh $@

override_dh_builddeb:
dh_builddeb -- -Zgzip

override_dh_auto_test:
DEB_BUILD_OPTIONS=parallel=1 dh_auto_test
2 changes: 2 additions & 0 deletions src/xml/SecureDOMParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "crypto/Digest.h"
#include "util/log.h"

#define XSD_CXX11

DIGIDOCPP_WARNING_PUSH
DIGIDOCPP_WARNING_DISABLE_CLANG("-Wnull-conversion")
DIGIDOCPP_WARNING_DISABLE_GCC("-Wunused-parameter")
Expand Down
1 change: 1 addition & 0 deletions src/xml/URIResolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ DIGIDOCPP_WARNING_DISABLE_MSVC(4005)
#include <xsec/framework/XSECException.hpp>
DIGIDOCPP_WARNING_POP

#define XSD_CXX11
#include <xsd/cxx/xml/string.hxx>

#include <istream>
Expand Down

0 comments on commit f20adfc

Please sign in to comment.