UBUNTU: [Debian] fix SRCPKGNAME-udebs-FLAVOUR handling for complex flavours

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules.d/5-udebs.mk b/debian/rules.d/5-udebs.mk
index aaf74abfc05bcb7369fe6b888642b0b3c2b4ccee..27322bd3f39b20b4e40d5e3b6595c6371b068115 100644 (file)
--- a/debian/rules.d/5-udebs.mk
+++ b/debian/rules.d/5-udebs.mk
@@ -47,8 +47,8 @@ do-binary-udebs: debian/control
        @awk '                                                          \
                /Package: /             { package=$$2 }                 \
                (/Package-Type: udeb/ && package !~ /^'$(src_pkg_name)'-udebs-/) {      \
-                       n = split(package, bits, "-");                  \
-                       flavour = bits[n - 1];                          \
+                       match(package, "'$(release)'-'$(abinum)'-(.*)-di", bits);       \
+                       flavour = bits[1];                              \
                        udebs[flavour] = udebs[flavour] package ", ";   \
                }                                                       \
                END {                                                   \