Skip to content

Commit f20adfc

Browse files
authored
Create gzip compressed packages (#544)
IB-7782 Signed-off-by: Raul Metsma <[email protected]>
1 parent 0507016 commit f20adfc

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
113113
steps:
114114
- name: Install dependencies
115-
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
115+
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
116116
- name: Checkout
117117
uses: actions/checkout@v3
118118
with:

debian/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/control

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ Section: libs
33
Priority: optional
44
Maintainer: RIA <[email protected]>
55
Build-Depends:
6-
cdbs,
6+
debhelper-compat (= 12),
77
cmake,
88
libxml-security-c-dev,
99
xsdcxx (>= 4.0) | xsd (>= 4.0),
1010
xxd,
1111
doxygen,
1212
swig,
13+
java8-sdk-headless,
1314
libpython3-dev,
1415
python3-distutils
15-
Standards-Version: 3.9.8
16+
Standards-Version: 4.5.1
1617
Homepage: https://github.com/open-eid/libdigidocpp
1718

1819
Package: libdigidocpp-common
@@ -67,8 +68,7 @@ Architecture: any
6768
Section: libdevel
6869
Depends:
6970
libdigidocpp1 (= ${binary:Version}),
70-
${misc:Depends},
71-
${shlibs:Depends}
71+
${misc:Depends}
7272
Description: DigiDoc digital signature library development files
7373
This package contains files necessary for developing applications with the
7474
DigiDoc digital signature library.

debian/rules

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#!/usr/bin/make -f
2-
include /usr/share/cdbs/1/rules/debhelper.mk
3-
include /usr/share/cdbs/1/class/cmake.mk
4-
DEB_CMAKE_EXTRA_FLAGS = \
5-
-DCMAKE_INSTALL_SYSCONFDIR="/etc" \
6-
-DCMAKE_INSTALL_LIBDIR="lib/$(DEB_HOST_MULTIARCH)"
72
DEB_MAKE_CHECK_TARGET = test
3+
4+
%:
5+
dh $@
6+
7+
override_dh_builddeb:
8+
dh_builddeb -- -Zgzip
9+
10+
override_dh_auto_test:
11+
DEB_BUILD_OPTIONS=parallel=1 dh_auto_test

src/xml/SecureDOMParser.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include "crypto/Digest.h"
2323
#include "util/log.h"
2424

25+
#define XSD_CXX11
26+
2527
DIGIDOCPP_WARNING_PUSH
2628
DIGIDOCPP_WARNING_DISABLE_CLANG("-Wnull-conversion")
2729
DIGIDOCPP_WARNING_DISABLE_GCC("-Wunused-parameter")

src/xml/URIResolver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ DIGIDOCPP_WARNING_DISABLE_MSVC(4005)
2929
#include <xsec/framework/XSECException.hpp>
3030
DIGIDOCPP_WARNING_POP
3131

32+
#define XSD_CXX11
3233
#include <xsd/cxx/xml/string.hxx>
3334

3435
#include <istream>

0 commit comments

Comments
 (0)