Hi,

CDBS is still full of _others_ deprecated rules to test for.

I'd suggest to test for one of these 5 ones instead of simple-patchsys.mk:

   /usr/share/cdbs/1/class/ant.mk
   /usr/share/cdbs/1/class/cmake.mk
   /usr/share/cdbs/1/class/gnome.mk
   /usr/share/cdbs/1/class/qmake.mk
   /usr/share/cdbs/1/class/python-distutils.mk

But then when "klog" the very last one user of "qmake.mk" is fixed,
CDBS & Lintian should be updated in lockstep:
   https://sources.debian.org/src/klog/2.3.4-1/debian/rules/?hl=10#L10

I guess the other .mk will linger longuer, at least after Trixie.

So here's a proposition of patch

Greetings

Alexandre

----

diff --git a/data/rules/deprecated-makefiles b/data/rules/deprecated-makefiles
index 0d8d2f9c5..45737f052 100644
--- a/data/rules/deprecated-makefiles
+++ b/data/rules/deprecated-makefiles
@@ -3,10 +3,8 @@
#
# Please keep it sorted by file name.

-/usr/share/cdbs/1/class/perlmodule-vars.mk
-/usr/share/cdbs/1/class/perlmodule.mk
-/usr/share/cdbs/1/rules/dpatch.mk
-/usr/share/cdbs/1/rules/simple-patchsys.mk
-/usr/share/cdbs/1/rules/tarball.mk
-/usr/share/dbs/dbs-build.mk
-/usr/share/dbs/dpkg-arch.mk
+/usr/share/cdbs/1/class/ant.mk
+/usr/share/cdbs/1/class/cmake.mk
+/usr/share/cdbs/1/class/gnome.mk
+/usr/share/cdbs/1/class/python-distutils.mk
+/usr/share/cdbs/1/class/qmake.mk
diff --git 
a/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/build-spec/debian/rules
b/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/build-spec/debian/rules
index 3f989540e..1c0258f9c 100755
--- 
a/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/build-spec/debian/rules
+++ 
b/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/build-spec/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f

include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/cmake.mk

diff --git 
a/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/eval/hints
b/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/eval/hints
index c3f7ceb67..1b217a462 100644
--- 
a/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/eval/hints
+++ 
b/t/recipes/checks/debian/rules/rules-including-deprecated-makefiles/eval/hints
@@ -1 +1 @@
-rules-including-deprecated-makefiles (source):
debian-rules-uses-deprecated-makefile
/usr/share/cdbs/1/rules/simple-patchsys.mk [debian/rules:4]
+rules-including-deprecated-makefiles (source):
debian-rules-uses-deprecated-makefile /usr/share/cdbs/1/class/cmake.mk
[debian/rules:4]

Reply via email to