[Build-common-hackers] Bug#586616: cdbs: Wrong comparison for debhelper compat level

[Nelson A. de Oliveira]

Package: cdbs
Version: 0.4.84
Severity: normal
Tags: patch

Hi!

While building a package with compat level set to 7 and using CDBS, I saw this:

(...)
dh_clean -k 
dh_clean: dh_clean -k is deprecated; use dh_prep instead
(...)

Comparison in line 110 of 1/rules/buildcore.mk.in is wrong.
Patch:

diff -urN cdbs-0.4.84/1/rules/debhelper.mk.in cdbs-0.4.84/1/rules/debhelper.mk.in
--- cdbs-0.4.84/1/rules/debhelper.mk.in	2010-06-20 22:24:28.000000000 -0300
+++ cdbs-0.4.84/1/rules/debhelper.mk.in	2010-06-20 22:26:29.000000000 -0300
@@ -107,7 +107,7 @@
 
 is_debug_package=$(if $(patsubst %-dbg,,$(cdbs_curpkg)),,yes)
 
-DEB_DH_PREP ?= $(shell if [ "$(DH_COMPAT)" -gt 7 ]; then echo "dh_prep"; else echo "dh_clean -k"; fi)
+DEB_DH_PREP ?= $(shell if [ "$(DH_COMPAT)" -ge 7 ]; then echo "dh_prep"; else echo "dh_clean -k"; fi)
 
 #DEB_INSTALL_DIRS_ALL =
 DEB_INSTALL_CHANGELOGS_ALL ?= $(if $(DEB_ISNATIVE),,$(shell for f in ChangeLog Changelog Changes CHANGES changelog CHANGELOG; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; break; fi; done))


Thank you!

Best regards,
Nelson

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.34.naoliv1 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages cdbs depends on:
ii  debhelper                     7.9.1      helper programs for debian/rules

Versions of packages cdbs recommends:
ii  autotools-dev                 20100122.1 Update infrastructure for config.{

Versions of packages cdbs suggests:
ii  devscripts                    2.10.64    scripts to make the life of a Debi
pn  doc-base                      <none>     (no description available)

-- no debconf information