From f20adfce38351ffd7fac76fb1011b6c09da2449e Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 22 Sep 2023 13:48:34 +0300
Subject: [PATCH] Create gzip compressed packages (#544)

IB-7782

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml |  2 +-
 debian/compat               |  1 -
 debian/control              |  8 ++++----
 debian/rules                | 14 +++++++++-----
 src/xml/SecureDOMParser.cpp |  2 ++
 src/xml/URIResolver.cpp     |  1 +
 6 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 debian/compat

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b9431780b..70ca57d18 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28b8..000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 246111202..7e6244c7d 100644
--- a/debian/control
+++ b/debian/control
@@ -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
@@ -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.
diff --git a/debian/rules b/debian/rules
index 7d0dc8ac2..b35fe67a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/src/xml/SecureDOMParser.cpp b/src/xml/SecureDOMParser.cpp
index dcc8ccec2..900309ca3 100644
--- a/src/xml/SecureDOMParser.cpp
+++ b/src/xml/SecureDOMParser.cpp
@@ -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")
diff --git a/src/xml/URIResolver.cpp b/src/xml/URIResolver.cpp
index 514acef02..f67343e66 100644
--- a/src/xml/URIResolver.cpp
+++ b/src/xml/URIResolver.cpp
@@ -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>