Merge branch 'ci/pipeline' into 'debian/sid'

Gitlab CI: Use the pipeline from salsa-ci-team

See merge request auth-team/libfido2!1

3 files changed, 7 insertions, 14 deletions

diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
index 76ce17f..33c3a64 100644
--- a/debian/.gitlab-ci.yml
+++ b/debian/.gitlab-ci.yml
@@ -1,12 +1,4 @@
-image: registry.gitlab.com/eighthave/ci-image-git-buildpackage:latest
-
-build:
-  artifacts:
-    paths:
-    - "*.deb"
-    expire_in: 1 day
-  script:
-    - gitlab-ci-git-buildpackage-all
-  except:
-    variables:
-      - $CI_COMMIT_TAG != null
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff --git a/debian/control b/debian/control
index 686f0dd..9a5dcaa 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 4.5.0
 Build-Depends:
         debhelper-compat (= 12),
         pkg-config,
-        cmake,
+        cmake (>= 3.14),
         mandoc,
         libcbor-dev,
         libssl-dev,
diff --git a/debian/rules b/debian/rules
index 9e9bf6a..234840d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
         dh $@
 
 override_dh_auto_configure:
-        dh_auto_configure -- -DUDEV_RULES_DIR=/lib/udev/rules.d
+        dh_auto_configure -- -DUDEV_RULES_DIR=/lib/udev/rules.d \
+                             -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON
 
 override_dh_missing:
         dh_missing --fail-missing