Re: [PATCH v2 3/7] debian/rules: fix for newer debhelper

[Eric Wong <e@80x24.org>]

Stefan Metzmacher <metze@samba.org> wrote:
> I have this:
> 
> $ lsb_release -a
> No LSB modules are available.
> Distributor ID: Ubuntu
> Description:    Ubuntu 20.04.3 LTS
> Release:        20.04
> Codename:       focal
> $ perl -MDebian::Debhelper::Dh_Version -e 'print "$Debian::Debhelper::Dh_Version::version\n";'
> 12.10ubuntu1
> 
> and it needs the --add-udeb argument.
> 
> So this still fails for me.

Ah, so the "ubuntu1" is causing the Perl version-string comparison to fail.
It should only be checking "v12.10"...

Does squashing this in help?

diff --git a/debian/rules b/debian/rules
index cd41bb8..73f53fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,8 @@ binary-arch: install-arch
 # --add-udeb is needed for < 12.3, and breaks with auto-detection
 #  on debhelper 13.3.4, at least
 	if perl -MDebian::Debhelper::Dh_Version -e \
-	'exit(eval("v$$Debian::Debhelper::Dh_Version::version") lt v12.3)'; \
+	'($$v) = ($$Debian::Debhelper::Dh_Version::version =~ /\A([\d\.]+)/)' \
+	-e 'exit(eval("v$$v") lt v12.3)'; \
 		then dh_makeshlibs -a; else \
 		dh_makeshlibs -a --add-udeb '$(libudeb)'; fi
 

Also, just to confirm, does your dh_makeshlibs(1) manpage have this?:

       Since debhelper 12.3, dh_makeshlibs will by default add an additional
       udeb line for udebs in the shlibs file, when the udeb has the same name
       as the deb followed by a "-udeb" suffix (e.g. if the deb is called
       "libfoo1", then debhelper will auto-detect the udeb if it is named
       "libfoo1-udeb"). Please use the --add-udeb and --no-add-udeb options
       below when this auto-detection is insufficient.