[neon/extras/clazy/Neon/release] debian: clazy-tests: depend on exact clang-tools-N

Pino Toscano null at kde.org
Wed Sep 7 22:14:01 BST 2022


Git commit 9bba64a06f42da4933573133d313d8762f470588 by Pino Toscano.
Committed on 01/11/2020 at 16:28.
Pushed by jriddell into branch 'Neon/release'.

clazy-tests: depend on exact clang-tools-N

M  +2    -0    debian/changelog
M  +2    -1    debian/control
M  +4    -1    debian/rules

https://invent.kde.org/neon/extras/clazy/commit/9bba64a06f42da4933573133d313d8762f470588

diff --git a/debian/changelog b/debian/changelog
index 9418838..164412a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ clazy (1.7-4) UNRELEASED; urgency=medium
   * Add a new package clazy-tests, mostly for autopkgtest purposes:
     - use --destdir=debian/clazy to install everything directly in clazy
     - make clazy-tests depend on the exact clazy version
+    - make clazy-tests depend on the package (clang-tools-N) that provides
+      the default version of clang-apply-replacements
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Oct 2020 05:48:39 -0700
 
diff --git a/debian/control b/debian/control
index ebb74b3..490d734 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,8 @@ Description: Clang plugin for additional warnings
 
 Package: clazy-tests
 Architecture: any
-Depends: ${misc:Depends}, clazy (= ${binary:Version})
+Depends: ${misc:Depends}, clazy (= ${binary:Version}),
+         ${clazy:clang-tools},
 Description: test files for Clazy
  This package contains all the test files needed for running the autopkgtest
  of Clazy. This is hardly useful to install in any other context than this.
diff --git a/debian/rules b/debian/rules
index 08a3fb6..98659e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ endif
 
 # keep the "++" at the end, to make sure the tool used is the C++ frontend
 CLANGPP=$(shell realpath $$(env PATH=$$(echo "$$PATH" | sed -r -e 's|/usr/lib/ccache/?:||') which clang++))++
+CLANG_APPLY_REPLACEMENTS=$(shell realpath $$(which clang-apply-replacements))
 
 %:
 	dh $@
@@ -40,4 +41,6 @@ override_dh_compress:
 	dh_compress -X.md -X.json
 
 override_dh_gencontrol:
-	dh_gencontrol -- -V'clazy:clang=$(shell dpkg -S "$(CLANGPP)" | cut -d: -f1)'
+	dh_gencontrol -- \
+	  -V'clazy:clang=$(shell dpkg -S "$(CLANGPP)" | cut -d: -f1)' \
+	  -V'clazy:clang-tools=$(shell dpkg -S "$(CLANG_APPLY_REPLACEMENTS)" | cut -d: -f1)'



More information about the Neon-commits mailing list